Test.

PDAL · Jul 1, 2019 · 2da79c9 · 2da79c9
1 parent 7a2229b
commit 2da79c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/filters/MergeFilter.hpp b/filters/MergeFilter.hpp
@@ -43,7 +43,7 @@ namespace pdal
 class PDAL_DLL MergeFilter : public Filter, public Streamable
 {
 public:
-    MergeFilter ()
+    MergeFilter()
     {}
 
     std::string getName() const;

diff --git a/test/unit/filters/MergeTest.cpp b/test/unit/filters/MergeTest.cpp
@@ -38,10 +38,11 @@
 
 #include "Support.hpp"
 
-TEST(MergeTest, test4)
+namespace pdal
 {
-    using namespace pdal;
 
+TEST(MergeTest, test4)
+{
     PipelineManager mgr;
     mgr.readPipeline(Support::configuredpath("filters/merge.json"));
     mgr.execute();
@@ -55,8 +56,6 @@ TEST(MergeTest, test4)
 
 TEST(MergeTest, test5)
 {
-    using namespace pdal;
-
     PipelineManager mgr;
     mgr.readPipeline(Support::configuredpath("filters/merge2.json"));
     mgr.execute();
@@ -70,14 +69,12 @@ TEST(MergeTest, test5)
 
 TEST(MergeTest, test6)
 {
-    using namespace pdal;
-
 //    LogPtr log(new Log("pdal merge", &std::clog));
-    LogPtr log(new Log("pdal merge", Support::temppath("log.tmp")));
-    log->setLevel((LogLevel)5);
+//    LogPtr log(new Log("pdal merge", Support::temppath("log.tmp")));
+//    log->setLevel((LogLevel)5);
 
     PipelineManager mgr;
-    mgr.setLog(log);
+//    mgr.setLog(log);
     mgr.readPipeline(Support::configuredpath("filters/merge3.json"));
 
 //Added redirect.
@@ -98,3 +95,5 @@ std::cerr << "After execute!\n";
     EXPECT_EQ(2130u, view->size());
 **/
 }
+
+} // namespace pdal