Refactor how listening reporter updates its preferences

catchorg · Dec 19, 2021 · b981b9e · b981b9e
1 parent d20087b
commit b981b9e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/catch2/reporters/catch_reporter_listening.cpp b/src/catch2/reporters/catch_reporter_listening.cpp
@@ -14,21 +14,27 @@
 #include <cassert>
 
 namespace Catch {
+    void ListeningReporter::updatePreferences(IStreamingReporter const& reporterish) {
+        m_preferences.shouldRedirectStdOut |=
+            reporterish.getPreferences().shouldRedirectStdOut;
+        m_preferences.shouldReportAllAssertions |=
+            reporterish.getPreferences().shouldReportAllAssertions;
+    }
 
     void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        updatePreferences(*listener);
         m_listeners.insert(m_listeners.begin() + m_insertedListeners, CATCH_MOVE(listener) );
         ++m_insertedListeners;
     }
 
     void ListeningReporter::addReporter( IStreamingReporterPtr&& reporter ) {
-        m_preferences.shouldRedirectStdOut |= reporter->getPreferences().shouldRedirectStdOut;
+        updatePreferences(*reporter);
+
         // We will need to output the captured stdout if there are reporters
         // that do not want it captured.
+        // TODO: Should this also apply to listeners?
         m_haveNoncapturingListeners |= !reporter->getPreferences().shouldRedirectStdOut;
 
-        m_preferences.shouldReportAllAssertions |=
-            reporter->getPreferences().shouldReportAllAssertions;
-
         // Reporters can always be placed to the back without breaking the
         // reporting order
         m_listeners.push_back( CATCH_MOVE( reporter ) );

diff --git a/src/catch2/reporters/catch_reporter_listening.hpp b/src/catch2/reporters/catch_reporter_listening.hpp
@@ -24,6 +24,9 @@ namespace Catch {
         // Keep track of how many listeners we have already inserted,
         // so that we can insert them into the main vector at the right place
         size_t m_insertedListeners = 0;
+
+        void updatePreferences(IStreamingReporter const& reporterish);
+
     public:
         ListeningReporter( IConfig const* config ):
             IStreamingReporter( config ) {