removed test_misc warnings

tukl-msd · Aug 15, 2024 · 3adf09e · 3adf09e
1 parent 9d742de
commit 3adf09e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 39 deletions.
diff --git a/tests/tests_misc/test_bus.cpp b/tests/tests_misc/test_bus.cpp
@@ -658,14 +658,14 @@ TEST_F(BusTest, Load_Data)
 
 TEST_F(BusTest, Test_001)
 {
-	constexpr uint8_t data[] = {
-		0b1010'0000,
-		0b0000'0100,
-		0b0010'0110,
-		0b0001'0000,
-		0b0000'0000,
-		0b1000'0010,
-	};
+	// constexpr uint8_t data[] = {
+	// 	0b1010'0000,
+	// 	0b0000'0100,
+	// 	0b0010'0110,
+	// 	0b0001'0000,
+	// 	0b0000'0000,
+	// 	0b1000'0010,
+	// };
 
 	std::bitset<6 * 4> cmd_1("100000100000000000010000");
 	std::bitset<6 * 4> cmd_2("001001100000010010100000");

diff --git a/tests/tests_misc/test_bus_extended.cpp b/tests/tests_misc/test_bus_extended.cpp
@@ -3,6 +3,7 @@
 #include <DRAMPower/util/bus.h>
 #include <array>
 #include <optional>
+#include <algorithm>
 
 using namespace DRAMPower;
 
@@ -17,7 +18,7 @@ class ExtendedBusIdlePatternTest : public ::testing::Test {
 
 	virtual void SetUp()
 	{
-		for(int i = 0; i < buswidth; i++)
+		for(size_t i = 0; i < buswidth; i++)
 		{
 			burst_ones.push_back(true);
 			burst_zeroes.push_back(false);
@@ -194,7 +195,7 @@ class ExtendedBusStatsTest : public ::testing::Test {
 
 	virtual void SetUp()
 	{
-		for(int i = 0; i < buswidth; i++)
+		for(size_t i = 0; i < buswidth; i++)
 		{
 			burst_ones.push_back(true);
 			burst_zeroes.push_back(false);
@@ -212,14 +213,6 @@ TEST_F(ExtendedBusStatsTest, Stats_Pattern_Datarate_1)
 	uint_fast8_t datarate = 2;
 	timestamp_t timestamp = 3;
 	util::Bus bus(buswidth, datarate, util::Bus::BusIdlePatternSpec::L, util::Bus::BusInitPatternSpec::L);
-	std::size_t custom_ones = burst_custom.count();
-	std::size_t custom_zeroes = buswidth - custom_ones;
-	uint8_t burst_ones_data[bus_array_size] = { 0xFF };
-	uint8_t burst_zeroes_data[bus_array_size] = { 0 };
-
-	for(auto i = 0; i < bus_array_size; i++) {
-		burst_ones_data[i] = 0xFF;
-	}
 
 	ASSERT_EQ(buswidth, 128);
 
@@ -236,14 +229,6 @@ TEST_F(ExtendedBusStatsTest, Stats_Pattern_Datarate_2)
 	uint_fast8_t datarate = 13;
 	timestamp_t timestamp = 47;
 	util::Bus bus(buswidth, datarate, util::Bus::BusIdlePatternSpec::L, util::Bus::BusInitPatternSpec::L);
-	std::size_t custom_ones = burst_custom.count();
-	std::size_t custom_zeroes = buswidth - custom_ones;
-	uint8_t burst_ones_data[bus_array_size] = { 0xFF };
-	uint8_t burst_zeroes_data[bus_array_size] = { 0 };
-
-	for(auto i = 0; i < bus_array_size; i++) {
-		burst_ones_data[i] = 0xFF;
-	}
 
 	ASSERT_EQ(buswidth, 128);
 
@@ -260,12 +245,8 @@ TEST_F(ExtendedBusStatsTest, Stats_Pattern_1)
 	util::Bus bus(buswidth, 1, util::Bus::BusIdlePatternSpec::L, burst_custom);
 	std::size_t custom_ones = burst_custom.count();
 	std::size_t custom_zeroes = buswidth - custom_ones;
-	uint8_t burst_ones_data[bus_array_size] = { 0xFF };
-	uint8_t burst_zeroes_data[bus_array_size] = { 0 };
-
-	for(auto i = 0; i < bus_array_size; i++) {
-		burst_ones_data[i] = 0xFF;
-	}
+	uint8_t burst_ones_data[bus_array_size];
+	std::fill_n(burst_ones_data, bus_array_size, 0xFF);
 
 	ASSERT_EQ(buswidth, 128);
 	ASSERT_EQ(custom_ones, 85);
@@ -323,12 +304,8 @@ TEST_F(ExtendedBusStatsTest, Stats_Pattern_2)
 	util::Bus bus(buswidth, 1, util::Bus::BusIdlePatternSpec::LAST_PATTERN, burst_custom);
 	std::size_t custom_ones = burst_custom.count();
 	std::size_t custom_zeroes = buswidth - custom_ones;
-	uint8_t burst_ones_data[bus_array_size] = { 0xFF };
-	uint8_t burst_zeroes_data[bus_array_size] = { 0 };
-
-	for(auto i = 0; i < bus_array_size; i++) {
-		burst_ones_data[i] = 0xFF;
-	}
+	uint8_t burst_ones_data[bus_array_size];
+	std::fill_n(burst_ones_data, bus_array_size, 0xFF);
 
 	ASSERT_EQ(buswidth, 128);
 	ASSERT_EQ(custom_ones, 85);

diff --git a/tests/tests_misc/test_misc.cpp b/tests/tests_misc/test_misc.cpp
@@ -81,7 +81,6 @@ TEST_F(MiscTest, TestChunking)
 	};
 
 	// Test setup
-	constexpr std::size_t width = 6;
 	util::burst_storage burst_storage(6);
 
 	burst_storage.insert_data(data.data(), data.size() * 8);