Reenable pipeline manager test.

PDAL · Jul 15, 2014 · ed8c9ad · ed8c9ad
1 parent 906f633
commit ed8c9ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 23 deletions.
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(PDAL_UNITTEST_TEST_SRC
     MetadataTest.cpp
 #    filters/MosaicFilterTest.cpp
     OptionsTest.cpp
-#    PipelineManagerTest.cpp
+    PipelineManagerTest.cpp
 #    PointBufferTest.cpp
 #    drivers/qfit/QFITReaderTest.cpp
 #    RangeTest.cpp

diff --git a/test/unit/PipelineManagerTest.cpp b/test/unit/PipelineManagerTest.cpp
@@ -62,16 +62,17 @@ BOOST_AUTO_TEST_CASE(PipelineManagerTest_test1)
         Options optsW;
         optsW.add("filename", "temp.las", "file to write to");
         Writer* writer = mgr.addWriter("drivers.las.writer", *filter, optsW);
-        writer->prepare();
 
-        const boost::uint64_t np = writer->write(reader->getNumPoints());
+        point_count_t np = mgr.execute();
         BOOST_CHECK(np == 1065);
     }
 
     FileUtils::deleteFile("temp.las");
 }
 
 
+//ABELL - Mosaic
+/**
 BOOST_AUTO_TEST_CASE(PipelineManagerTest_test2)
 {
 #ifndef PDAL_SRS_ENABLED
@@ -105,11 +106,8 @@ BOOST_AUTO_TEST_CASE(PipelineManagerTest_test2)
         Options optsW;
         optsW.add("filename", "temp.las", "file to write to");
         Writer* writer = mgr.addWriter("drivers.las.writer", *filter, optsW);
-        writer->prepare();
+        point_count_t np = mgr.execute();
 
-        // check all the prev/next stage linkages
-
-        const boost::uint64_t np = writer->write(0);
         BOOST_CHECK(np == 1065 * 2);
 
         std::vector<Stage *> reader1_inputs = reader1->getInputs();
@@ -118,12 +116,6 @@ BOOST_AUTO_TEST_CASE(PipelineManagerTest_test2)
         std::vector<Stage *> filter_inputs = filter->getInputs();
         std::vector<Stage *> writer_inputs = writer->getInputs();
 
-        std::vector<Stage *> reader1_outputs = reader1->getOutputs();
-        std::vector<Stage *> reader2_outputs = reader2->getOutputs();
-        std::vector<Stage *> multifilter_outputs = multifilter->getOutputs();
-        std::vector<Stage *> filter_outputs = filter->getOutputs();
-        std::vector<Stage *> writer_outputs = writer->getOutputs();
-
         BOOST_CHECK(reader1_inputs.size() == 0);
         BOOST_CHECK(reader2_inputs.size() == 0);
         BOOST_CHECK(multifilter_inputs.size() == 2);
@@ -133,19 +125,10 @@ BOOST_AUTO_TEST_CASE(PipelineManagerTest_test2)
         BOOST_CHECK(filter_inputs[0] == multifilter);
         BOOST_CHECK(writer_inputs.size() == 1);
         BOOST_CHECK(writer_inputs[0] == filter);
-
-        BOOST_CHECK(reader1_outputs.size() == 1);
-        BOOST_CHECK(reader1_outputs[0] == multifilter);
-        BOOST_CHECK(reader2_outputs.size() == 1);
-        BOOST_CHECK(reader2_outputs[0] == multifilter);
-        BOOST_CHECK(multifilter_outputs.size() == 1);
-        BOOST_CHECK(multifilter_outputs[0] == filter);
-        BOOST_CHECK(filter_outputs.size() == 1);
-        BOOST_CHECK(filter_outputs[0] == writer);
-        BOOST_CHECK(writer_outputs.size() == 0);
     }
 
     FileUtils::deleteFile("temp.las");
 }
+**/
 
 BOOST_AUTO_TEST_SUITE_END()