From 53c674405289aeda957f387ccc4ace2c8b329979 Mon Sep 17 00:00:00 2001
From: Howard Butler <howard@hobu.co>
Date: Mon, 8 Sep 2014 16:00:53 -0500
Subject: [PATCH] more reorganization #441

---
 .../text-writer-csv.xml}                      |  0
 .../text-writer-geojson.xml}                  |  0
 .../text-writer-space-delimited.xml}          |  0
 test/data/{pipeline => filters}/merge.xml     |  0
 test/data/pipeline/mosaic.xml                 | 49 -------------------
 test/unit/filters/MergeTest.cpp               |  2 +-
 6 files changed, 1 insertion(+), 50 deletions(-)
 rename test/data/{pipeline/pipeline_csv.xml => drivers/text-writer-csv.xml} (100%)
 rename test/data/{pipeline/pipeline_geojson.xml => drivers/text-writer-geojson.xml} (100%)
 rename test/data/{pipeline/pipeline_asc.xml => drivers/text-writer-space-delimited.xml} (100%)
 rename test/data/{pipeline => filters}/merge.xml (100%)
 delete mode 100644 test/data/pipeline/mosaic.xml

diff --git a/test/data/pipeline/pipeline_csv.xml b/test/data/drivers/text-writer-csv.xml
similarity index 100%
rename from test/data/pipeline/pipeline_csv.xml
rename to test/data/drivers/text-writer-csv.xml
diff --git a/test/data/pipeline/pipeline_geojson.xml b/test/data/drivers/text-writer-geojson.xml
similarity index 100%
rename from test/data/pipeline/pipeline_geojson.xml
rename to test/data/drivers/text-writer-geojson.xml
diff --git a/test/data/pipeline/pipeline_asc.xml b/test/data/drivers/text-writer-space-delimited.xml
similarity index 100%
rename from test/data/pipeline/pipeline_asc.xml
rename to test/data/drivers/text-writer-space-delimited.xml
diff --git a/test/data/pipeline/merge.xml b/test/data/filters/merge.xml
similarity index 100%
rename from test/data/pipeline/merge.xml
rename to test/data/filters/merge.xml
diff --git a/test/data/pipeline/mosaic.xml b/test/data/pipeline/mosaic.xml
deleted file mode 100644
index 2728971957..0000000000
--- a/test/data/pipeline/mosaic.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<Pipeline version="1.0">
-        <MultiFilter type="filters.mosaic">
-                <Filter type="filters.programmable">
-                    <Option name="function">myfunc</Option>
-                    <Option name="module">derive</Option>
-                    <Option name="source">
-import numpy as np
-def myfunc(ins,outs):
-    X = ins['X']
-    X1 = ins['X1']
-  #  X1 = X
-    X1 = np.zeros(X1.size, dtype=np.int32) + 314
-    outs['X1'] = X1
-#    print X1
- #   print outs['X']
-    return True
-</Option>
-                <Filter type="filters.selector">
-                <Option name="create">
-                    <Options>
-                        <Option name="dimension">X1
-                        <Options>
-                            <Option name="parent_uuid">2ee118d1-119e-4906-99c3-42934203f872</Option>
-                            <Option name="interpretation">int32_t</Option>
-                            <Option name="description">Derived X dimension</Option>
-                            <Option name="size">4</Option>
-                            <Option name="scale">0.01</Option>
-                            <Option name="offset">0.0</Option>
-                        </Options>
-                        </Option>
-                    </Options>
-                </Option>    
-      
-                <Reader type="drivers.las.reader">
-                    <Option name="filename">
-                        ../autzen-utm.las
-                    </Option>
-                </Reader>
-        </Filter>
-    </Filter>
-        
-            <Reader type="drivers.las.reader">
-                <Option name="filename">
-                    ../autzen-utm.las
-                </Option>
-            </Reader>
-        </MultiFilter>
-</Pipeline>
\ No newline at end of file
diff --git a/test/unit/filters/MergeTest.cpp b/test/unit/filters/MergeTest.cpp
index c6da13cd92..6feb0b3e4f 100644
--- a/test/unit/filters/MergeTest.cpp
+++ b/test/unit/filters/MergeTest.cpp
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(test1)
 
     PipelineManager mgr;
     PipelineReader specReader(mgr);
-    specReader.readPipeline(Support::datapath("pipeline/merge.xml"));
+    specReader.readPipeline(Support::datapath("filters/merge.xml"));
     Stage *stage = mgr.getStage();
     mgr.execute();