Fix Noisy tests

Author: OnePatchGuy

CMakeLists.txt

@@ -75,7 +75,7 @@ add_executable(unittesting include/traits.h
                            tests/filters_generic_move_only_stream.cpp
                            tests/noisy.h
                            tests/filters_noisy_finite_stream.cpp
-                           tests/filters_generic_noisy_stream.cpp)
+                           tests/filters_generic_noisy_stream.cpp tests/noisy.cpp)
 target_link_libraries(unittesting gtest gmock_main Threads::Threads)
 
 add_test(NAME do_unittests COMMAND unittesting)

tests/filters_generic_noisy_stream.cpp

@@ -16,6 +16,8 @@ using namespace stream::filters;
 
 TEST(FILTERS_GENERIC_NOISY_STREAM, REF_CONTAINER)
 {
+    Noisy::copyCount = 0;
+
     std::list<Noisy> list;
 
     for (int i = 1; i < 11; ++i)
@@ -30,29 +32,21 @@ TEST(FILTERS_GENERIC_NOISY_STREAM, REF_CONTAINER)
                   | filter([](auto &&v) { return v.value > 25; })
                   | to_vector();
 
+    ASSERT_EQ(Noisy::copyCount, 0);
     ASSERT_EQ(result.size(), 6U);
 
-    ASSERT_EQ(result[0].copyCount, 1);
     ASSERT_EQ(result[0].value, 26);
-
-    ASSERT_EQ(result[1].copyCount, 1);
     ASSERT_EQ(result[1].value, 37);
-
-    ASSERT_EQ(result[2].copyCount, 1);
     ASSERT_EQ(result[2].value, 50);
-
-    ASSERT_EQ(result[3].copyCount, 1);
     ASSERT_EQ(result[3].value, 65);
-
-    ASSERT_EQ(result[4].copyCount, 1);
     ASSERT_EQ(result[4].value, 82);
-
-    ASSERT_EQ(result[5].copyCount, 1);
     ASSERT_EQ(result[5].value, 101);
 }
 
 TEST(FILTERS_GENERIC_NOISY_STREAM, CONTAINER)
 {
+    Noisy::copyCount = 0;
+
     std::list<Noisy> list;
 
     for (int i = 1; i < 11; ++i)
@@ -67,24 +61,14 @@ TEST(FILTERS_GENERIC_NOISY_STREAM, CONTAINER)
                   | filter([](auto &&v) { return v.value > 25; })
                   | to_vector();
 
-    ASSERT_EQ(result.size(), 6U);
+    ASSERT_EQ(Noisy::copyCount, 0);
 
-    ASSERT_EQ(result[0].copyCount, 0);
+    ASSERT_EQ(result.size(), 6U);
     ASSERT_EQ(result[0].value, 26);
-
-    ASSERT_EQ(result[1].copyCount, 0);
     ASSERT_EQ(result[1].value, 37);
-
-    ASSERT_EQ(result[2].copyCount, 0);
     ASSERT_EQ(result[2].value, 50);
-
-    ASSERT_EQ(result[3].copyCount, 0);
     ASSERT_EQ(result[3].value, 65);
-
-    ASSERT_EQ(result[4].copyCount, 0);
     ASSERT_EQ(result[4].value, 82);
-
-    ASSERT_EQ(result[5].copyCount, 0);
     ASSERT_EQ(result[5].value, 101);
 
     auto s = Stream(std::move(list))
@@ -94,7 +78,7 @@ TEST(FILTERS_GENERIC_NOISY_STREAM, CONTAINER)
                | filter([](auto &&v) { return v.value > 25; })
                | sum();
 
-    ASSERT_EQ(s.copyCount, 0);
+    ASSERT_EQ(Noisy::copyCount, 0);
     ASSERT_EQ(s.value, 0);
 
     result = Stream(std::move(list))
@@ -103,27 +87,33 @@ TEST(FILTERS_GENERIC_NOISY_STREAM, CONTAINER)
              | map([](auto &&v){ ++v.value; return std::move(v); })
              | filter([](auto &&v) { return v.value > 25; })
              | to_vector();
+
+    ASSERT_EQ(Noisy::copyCount, 0);
     ASSERT_TRUE(result.empty());
 }
 
 TEST(FILTERS_GENERIC_NOISY_STREAM, GENERATOR)
 {
+    Noisy::copyCount = 0;
+
     auto result = Stream([i = int{}]() mutable { return Noisy(++i); })
                   | skip(20)
                   | filter([](auto &&v){ return (v.value % 2 != 0); })
                   | get(20)
                   | to_vector();
 
+    ASSERT_EQ(Noisy::copyCount, 0);
     ASSERT_EQ(result.size(), 20U);
     for (int i = 0; i < 20; ++i)
     {
-        ASSERT_THAT(result[i].copyCount, 0);
         ASSERT_THAT(result[i].value, 2 * i + 21);
     }
 }
 
 TEST(FILTERS_GENERIC_NOISY_STREAM, RANGE)
 {
+    Noisy::copyCount = 0;
+
     std::list<Noisy> list;
 
     for (int i = 1; i < 11; ++i)
@@ -138,29 +128,21 @@ TEST(FILTERS_GENERIC_NOISY_STREAM, RANGE)
                   | filter([](auto &&v) { return v.value > 25; })
                   | to_vector();
 
-    ASSERT_EQ(result.size(), 6U);
+    ASSERT_EQ(Noisy::copyCount, 0);
 
-    ASSERT_EQ(result[0].copyCount, 1);
+    ASSERT_EQ(result.size(), 6U);
     ASSERT_EQ(result[0].value, 26);
-
-    ASSERT_EQ(result[1].copyCount, 1);
     ASSERT_EQ(result[1].value, 37);
-
-    ASSERT_EQ(result[2].copyCount, 1);
     ASSERT_EQ(result[2].value, 50);
-
-    ASSERT_EQ(result[3].copyCount, 1);
     ASSERT_EQ(result[3].value, 65);
-
-    ASSERT_EQ(result[4].copyCount, 1);
     ASSERT_EQ(result[4].value, 82);
-
-    ASSERT_EQ(result[5].copyCount, 1);
     ASSERT_EQ(result[5].value, 101);
 }
 
 TEST(FILTERS_GENERIC_NOISY_STREAM, STREAM_FROM_STREAM)
 {
+    Noisy::copyCount = 0;
+
     std::ostringstream out;
 
     Stream a = Stream([i = int{}]() mutable { return Noisy(++i); })
@@ -179,35 +161,17 @@ TEST(FILTERS_GENERIC_NOISY_STREAM, STREAM_FROM_STREAM)
 
     auto result = c | to_vector();
 
-    ASSERT_EQ(result.size(), 10U);
+    ASSERT_EQ(Noisy::copyCount, 0);
 
-    ASSERT_EQ(result[0].copyCount, 0);
+    ASSERT_EQ(result.size(), 10U);
     ASSERT_EQ(result[0].value, 15);
-
-    ASSERT_EQ(result[1].copyCount, 0);
     ASSERT_EQ(result[1].value, 65);
-
-    ASSERT_EQ(result[2].copyCount, 0);
     ASSERT_EQ(result[2].value, 90);
-
-    ASSERT_EQ(result[3].copyCount, 0);
     ASSERT_EQ(result[3].value, 115);
-
-    ASSERT_EQ(result[4].copyCount, 0);
     ASSERT_EQ(result[4].value, 165);
-
-    ASSERT_EQ(result[5].copyCount, 0);
     ASSERT_EQ(result[5].value, 190);
-
-    ASSERT_EQ(result[6].copyCount, 0);
     ASSERT_EQ(result[6].value, 215);
-
-    ASSERT_EQ(result[7].copyCount, 0);
     ASSERT_EQ(result[7].value, 265);
-
-    ASSERT_EQ(result[8].copyCount, 0);
     ASSERT_EQ(result[8].value, 290);
-
-    ASSERT_EQ(result[9].copyCount, 0);
     ASSERT_EQ(result[9].value, 315);
 }