Cleanups

nv-morpheus · May 10, 2023 · 027ee50 · 027ee50
1 parent 3e8dd53
commit 027ee50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/cpp/mrc/tests/test_edges.cpp b/cpp/mrc/tests/test_edges.cpp
@@ -37,6 +37,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 #include <gtest/internal/gtest-internal.h>
+#include <rxcpp/rx.hpp>  // for observable_member
 
 #include <functional>
 #include <map>
@@ -290,18 +291,12 @@ class TestRxNodeComponent : public RxNodeComponent<T, T>
     void make_stream(stream_fn_t fn)
     {
         return base_t::make_stream([this, fn](auto&&... args) {
-            m_stream_fn_called = true;
+            stream_fn_called = true;
             return fn(std::forward<decltype(args)>(args)...);
         });
     }
 
-    ~TestRxNodeComponent() override
-    {
-        // Debug print
-        VLOG(10) << "Destroying TestRxNodeComponent";
-    }
-
-    bool m_stream_fn_called = false;
+    bool stream_fn_called = false;
 };
 
 template <typename T>
@@ -560,7 +555,7 @@ TEST_F(TestEdges, SourceToRxNodeComponentToSinkComponent)
 
     source->run();
 
-    EXPECT_TRUE(node->m_stream_fn_called);
+    EXPECT_TRUE(node->stream_fn_called);
 }
 
 TEST_F(TestEdges, SourceComponentToNodeToSinkComponent)
@@ -999,6 +994,6 @@ TEST_F(TestEdges, EdgeTapWithSpliceRxComponent)
     source->run();
     sink->run();
 
-    EXPECT_TRUE(node->m_stream_fn_called);
+    EXPECT_TRUE(node->stream_fn_called);
 }
 }  // namespace mrc
diff --git a/cpp/mrc/tests/test_node.cpp b/cpp/mrc/tests/test_node.cpp
@@ -17,6 +17,7 @@
 
 #include "test_mrc.hpp"
 
+#include "mrc/channel/status.hpp"  // for Status
 #include "mrc/core/executor.hpp"
 #include "mrc/engine/pipeline/ipipeline.hpp"
 #include "mrc/node/rx_node.hpp"
@@ -45,6 +46,7 @@
 #include <mutex>
 #include <set>
 #include <sstream>
+#include <stdexcept>  // for runtime_error
 #include <string>
 #include <thread>
 #include <utility>
@@ -510,11 +512,9 @@ TEST_F(TestNode, RxNodeComponentThrows)
             "sinkInt",
             [&](const int& x) {
                 ++sink_call_count;
-                DVLOG(1) << "Sink got value: '" << x << "'" << std::endl;
             },
             [&]() {
                 ++complete_count;
-                DVLOG(1) << "Sink on_completed" << std::endl;
             });
 
         seg.make_edge(source, node_comp);