diff gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java @ 246:b7f69809239c

Added ODV-Export to VerticalCrossSection on Meshes gnv-artifacts/trunk@315 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 10 Nov 2009 14:37:42 +0000
parents 9697a6b8d2c9
children 008709f79611
line wrap: on
line diff
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Tue Nov 10 14:10:52 2009 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Tue Nov 10 14:37:42 2009 +0000
@@ -825,7 +825,8 @@
     
     public void testVerticalCrossSectionMeshArtifact() {
         try {
-            log.debug("GNVArtifactsTestCase.testHVerticalCrossSectionMeshArtifact");
+            log.debug("GNVArtifactsTestCase." +
+                      "testHVerticalCrossSectionMeshArtifact");
             String artefactName = "fis_modeldata";
             ArtifactFactory artifactFactory = this
                     .getArtifactFactory(artefactName);
@@ -838,62 +839,26 @@
 
             CallContext cc = createCallContext();
             Document describeDocument = this.readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_describe.xml");
-            // Erster Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_01_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_01_advance.xml", describeDocument);
-
-            // Zweiter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_02_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_02_advance.xml", describeDocument);
-            // Dritter Schritt
-            this
-                    .doNextStep(
+            
+            int steps = 7;
+            
+            for (int i = 1; i <= steps; i++){
+            
+                this.doNextStep(
                             artifact,
                             cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_03_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_03_advance.xml", describeDocument);
-            // Vierter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_04_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_04_advance.xml", describeDocument);
-            // Fünfter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_05_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_05_advance.xml", describeDocument);
-
-            // Sechster Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_06_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_06_advance.xml", describeDocument);
-            // Siebter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_07_feed.xml",
-                            "src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_07_advance.xml", describeDocument);
-           
+                            "src/test/ressources/verticalcrosssection_mesh/" +
+                            "verticalcrosssection_step_0"+i+"_feed.xml",
+                            "src/test/ressources/verticalcrosssection_mesh/" +
+                            "verticalcrosssection_step_0"+i+"_advance.xml", 
+                            describeDocument);
+            }
+            
             Document outputData = artifact.describe(describeDocument,cc);
             FileOutputStream fos = null;
             FileOutputStream fos2 = null;
             FileOutputStream fos3 = null;
+            FileOutputStream fos4 = null;
             try {
                 fos = new FileOutputStream(
                         "src/test/results/verticalcrosssection_mesh"
@@ -904,24 +869,30 @@
                 fos3 = new FileOutputStream(
                         "src/test/results/verticalcrosssection_mesh"
                                 + System.currentTimeMillis() + ".csv");
-                artifact
-                        .feed(
-                                this
-                                        .readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_feed.xml"),
-                                cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_out_statistics.xml"),
-                                fos2, cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_out_chart.xml"),
-                                fos, cc);
-                artifact.out(this.readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_out_csv.xml"),
-                             fos3,
-                             cc);
+                fos4 = new FileOutputStream(
+                        "src/test/results/verticalcrosssection_mesh"
+                                + System.currentTimeMillis() + ".odv");
+                artifact.feed(this.readDocument("src/test/ressources/" +
+                                                "verticalcrosssection_mesh/" +
+                                                "verticalcrosssection_step_08_feed.xml"),
+                              cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalcrosssection_mesh/" +
+                                               "verticalcrosssection_step_08_out_statistics.xml"),
+                             fos2, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalcrosssection_mesh/" +
+                                               "verticalcrosssection_step_08_out_chart.xml"),
+                             fos, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalcrosssection_mesh/" +
+                                               "verticalcrosssection_step_08_out_csv.xml"),
+                             fos3,cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalcrosssection_mesh/" +
+                                               "verticalcrosssection_step_08_out_odv.xml"),
+                             fos4,cc);
+                
             } catch (Exception e) {
                 log.error(e, e);
                 fail();

http://dive4elements.wald.intevation.org