Make StdEater more general.

przemek83 · Aug 18, 2024 · fbd1809 · fbd1809
1 parent 0f65c3e
commit fbd1809
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 46 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -22,8 +22,8 @@ set(${PROJECT_TEST}_SOURCES
     ProgressBarSequentialTest.cpp
     ProgressBarOverallTest.cpp
     RunnerTest.cpp
-    CoutEater.h
-    CoutEater.cpp
+    StdStreamEater.h
+    StdStreamEater.cpp
     )
 
 add_executable(${PROJECT_TEST} ${${PROJECT_TEST}_SOURCES})

diff --git a/test/CoutEater.cpp b/test/CoutEater.cpp
diff --git a/test/CoutEater.h b/test/CoutEater.h
diff --git a/test/ProgressBarOverallTest.cpp b/test/ProgressBarOverallTest.cpp
@@ -1,11 +1,10 @@
-#include <iostream>
-#include <sstream>
-
 #include <catch2/catch_test_macros.hpp>
 
 #include <src/Config.h>
 #include <src/ProgressBarOverall.h>
 
+#include "StdStreamEater.h"
+
 TEST_CASE("Overall Progress Callback")
 {
     const int years{1000};
@@ -18,41 +17,36 @@ TEST_CASE("Overall Progress Callback")
     const int length{config::progressBarLength};
     const int firstYearWithMarker{(years / length) - 1};
 
-    std::streambuf* oldCoutBuffer{std::cout.rdbuf()};
-    std::ostringstream output;
-    std::cout.rdbuf(output.rdbuf());
-    output.str("");
+    StdStreamEater eater(std::cout);
 
     SECTION("start")
     {
         progressBar.update(0, simId);
-        REQUIRE(output.str() == "[");
+        REQUIRE(eater.getOutput() == "[");
     }
 
     SECTION("before progress")
     {
         progressBar.update(firstYearWithMarker - 1, simId);
-        REQUIRE(output.str() == "");
+        REQUIRE(eater.getOutput() == "");
     }
 
     SECTION("progress")
     {
         progressBar.update(firstYearWithMarker, simId);
-        REQUIRE(output.str() == "*");
+        REQUIRE(eater.getOutput() == "*");
     }
 
     SECTION("after progress")
     {
         progressBar.update(firstYearWithMarker + 1, simId);
-        REQUIRE(output.str() == "");
+        REQUIRE(eater.getOutput() == "");
     }
 
     SECTION("end")
     {
         const int lastYear{years - 1};
         progressBar.update(lastYear, simId);
-        REQUIRE(output.str() == "*]\n");
+        REQUIRE(eater.getOutput() == "*]\n");
     }
-
-    std::cout.rdbuf(oldCoutBuffer);
 }
diff --git a/test/ProgressBarSequentialTest.cpp b/test/ProgressBarSequentialTest.cpp
@@ -3,7 +3,7 @@
 #include <src/Config.h>
 #include <src/ProgressBarSequential.h>
 
-#include "CoutEater.h"
+#include "StdStreamEater.h"
 
 TEST_CASE("Sequential Progress Callback")
 {
@@ -16,38 +16,38 @@ TEST_CASE("Sequential Progress Callback")
     const int length{config::progressBarLength};
     const int firstYearWithMarker{(years / length) - 1};
 
-    CoutEater coutEater;
+    StdStreamEater eater(std::cout);
 
     SECTION("start")
     {
         progressBar.update(0, simId);
         const std::string expectedOutput{
             "1/" + std::to_string(params.simulationsCount_) + " ["};
-        REQUIRE(coutEater.getOutput() == expectedOutput);
+        REQUIRE(eater.getOutput() == expectedOutput);
     }
 
     SECTION("before progress")
     {
         progressBar.update(firstYearWithMarker - 1, simId);
-        REQUIRE(coutEater.getOutput() == "");
+        REQUIRE(eater.getOutput() == "");
     }
 
     SECTION("progress")
     {
         progressBar.update(firstYearWithMarker, simId);
-        REQUIRE(coutEater.getOutput() == "*");
+        REQUIRE(eater.getOutput() == "*");
     }
 
     SECTION("after progress")
     {
         progressBar.update(firstYearWithMarker + 1, simId);
-        REQUIRE(coutEater.getOutput() == "");
+        REQUIRE(eater.getOutput() == "");
     }
 
     SECTION("end")
     {
         const int lastYear{years - 1};
         progressBar.update(lastYear, simId);
-        REQUIRE(coutEater.getOutput() == "*]\n");
+        REQUIRE(eater.getOutput() == "*]\n");
     }
 }
diff --git a/test/StdStreamEater.cpp b/test/StdStreamEater.cpp
@@ -0,0 +1,10 @@
+#include "StdStreamEater.h"
+
+StdStreamEater::StdStreamEater(std::ostream& stream) : stream_(stream)
+{
+    stream_.rdbuf(fakeOutput_.rdbuf());
+}
+
+StdStreamEater::~StdStreamEater() { stream_.rdbuf(stdBuffer_); }
+
+std::string StdStreamEater::getOutput() const { return fakeOutput_.str(); }
diff --git a/test/StdStreamEater.h b/test/StdStreamEater.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <iostream>
+#include <sstream>
+
+class StdStreamEater
+{
+public:
+    explicit StdStreamEater(std::ostream& stream);
+    ~StdStreamEater();
+
+    std::string getOutput() const;
+
+private:
+    std::ostream& stream_;
+
+    std::streambuf* stdBuffer_{stream_.rdbuf()};
+    std::ostringstream fakeOutput_;
+};