diff gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java @ 241:8500529d82af

Added ODV-Export to VerticalProfiles gnv-artifacts/trunk@309 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Mon, 09 Nov 2009 15:24:41 +0000
parents 76897b73db4e
children 5925739d25ac
line wrap: on
line diff
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Mon Nov 09 14:20:27 2009 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Mon Nov 09 15:24:41 2009 +0000
@@ -298,52 +298,25 @@
             CallContext cc = createCallContext();
 
             Document describeDocument = this.readDocument("src/test/ressources/verticalprofile/verticalprofile_describe.xml");
-            // Erster Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile/verticalprofile_step_01_feed.xml",
-                            "src/test/ressources/verticalprofile/verticalprofile_step_02_advance.xml", describeDocument);
-
-            // Zweiter Schritt
-            this
-                    .doNextStep(
+            int steps = 5;
+            
+            for (int i = 1; i <= steps; i++){
+                this.doNextStep(
                             artifact,
                             cc,
-                            "src/test/ressources/verticalprofile/verticalprofile_step_02_feed.xml",
-                            "src/test/ressources/verticalprofile/verticalprofile_step_02_advance.xml", describeDocument);
-
-            // Dritter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile/verticalprofile_step_03_feed.xml",
-                            "src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml", describeDocument);
-            
-            // Vierter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile/verticalprofile_step_04_feed.xml",
-                            "src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml", describeDocument);
-            
-         // Fünfter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml",
-                            "src/test/ressources/verticalprofile/verticalprofile_step_05_advance.xml", describeDocument);
-
+                            "src/test/ressources/verticalprofile/" +
+                            "verticalprofile_step_0"+i+"_feed.xml",
+                            "src/test/ressources/verticalprofile/" +
+                            "verticalprofile_step_0"+i+"_advance.xml", 
+                            describeDocument);
+            }
 
             // Vierter Schritt
             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/verticalprofile"
                                            + System.currentTimeMillis()
@@ -354,26 +327,29 @@
                 fos3 = new FileOutputStream("src/test/results/verticalprofile"
                                             + System.currentTimeMillis()
                                             + ".csv");
-                artifact
-                        .feed(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_06_feed.xml"),
-                                cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_06_out_statistics.xml"),
-                                fos2, cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_06_out_chart.xml"),
-                                fos, cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_06_out_csv.xml"),
-                                fos3, cc);
+                fos4 = new FileOutputStream("src/test/results/verticalprofile"
+                        + System.currentTimeMillis()
+                        + ".odv");
+                artifact.feed(this.readDocument("src/test/ressources/" +
+                                                "verticalprofile/" +
+                                                "verticalprofile_step_06_feed.xml"),
+                              cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile/" +
+                                               "verticalprofile_step_06_out_statistics.xml"),
+                             fos2, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile/" +
+                                               "verticalprofile_step_06_out_chart.xml"),
+                             fos, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile/" +
+                                               "verticalprofile_step_06_out_csv.xml"),
+                             fos3, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile/" +
+                                               "verticalprofile_step_06_out_odv.xml"),
+                            fos4, cc);
             } catch (Exception e) {
                 log.error(e, e);
                 fail();
@@ -385,6 +361,8 @@
                     fos2.close();
                     fos3.flush();
                     fos3.close();
+                    fos4.flush();
+                    fos4.close();
                 } catch (Exception e) {
                     log.error(e, e);
                 }
@@ -409,86 +387,28 @@
             log.debug("VerticalProfile-Artifact is available");
 
             CallContext cc = createCallContext();
-            Document describeDocument = this.readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_describe.xml");
-            // Erster Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_feed.xml",
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_advance.xml", describeDocument);
-
-            // Zweiter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml",
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_advance.xml", describeDocument);
-
-            // Dritter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml",
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_advance.xml", describeDocument);
-
-            // Vierter Schritt
-            this
-                    .doNextStep(
+            Document describeDocument = this.readDocument("src/test/ressources/" +
+                                                          "verticalprofile_mesh/" +
+                                                          "verticalprofile_describe.xml");
+            
+            int steps = 9;
+            
+            for (int i = 1; i <= steps; i++){
+                this.doNextStep(
                             artifact,
                             cc,
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml",
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_advance.xml", describeDocument);
-
-            // Fünfter Schritt
-            this
-                    .doNextStep(
-                            artifact,
-                            cc,
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_feed.xml",
-                            "src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_advance.xml", describeDocument);
-            
-            // Sechster Schritt
-            this
-            .doNextStep(
-                    artifact,
-                    cc,
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml",
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_advance.xml", describeDocument);
-            
-            // Siebter Schritt
-            this
-            .doNextStep(
-                    artifact,
-                    cc,
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_feed.xml",
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_advance.xml", describeDocument);
-            
-           // Achter Schritt
-            this
-            .doNextStep(
-                    artifact,
-                    cc,
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_feed.xml",
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_advance.xml", describeDocument);
-
-            
-           // Neunter Schritt
-            this
-            .doNextStep(
-                    artifact,
-                    cc,
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_09_feed.xml",
-                    "src/test/ressources/verticalprofile_mesh/verticalprofile_step_09_advance.xml", describeDocument);
-
-
+                            "src/test/ressources/verticalprofile_mesh/" +
+                            "verticalprofile_step_0"+i+"_feed.xml",
+                            "src/test/ressources/verticalprofile_mesh/" +
+                            "verticalprofile_step_0"+i+"_advance.xml", 
+                            describeDocument);
+            }
             // 10. Schritt
             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/verticalprofile_mesh"
@@ -499,26 +419,29 @@
                 fos3 = new FileOutputStream(
                         "src/test/results/verticalprofile_mesh"
                                 + System.currentTimeMillis() + ".csv");
-                artifact
-                        .feed(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_10_feed.xml"),
+                fos4 = new FileOutputStream(
+                        "src/test/results/verticalprofile_mesh"
+                                + System.currentTimeMillis() + ".odv");
+                artifact.feed(this.readDocument("src/test/ressources/" +
+                                                "verticalprofile_mesh/" +
+                                                "verticalprofile_step_10_feed.xml"),
                                 cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_10_out_statistics.xml"),
-                                fos2, cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_10_out_chart.xml"),
-                                fos, cc);
-                artifact
-                        .out(
-                                this
-                                        .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_10_out_csv.xml"),
-                                fos3, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile_mesh/" +
+                                               "verticalprofile_step_10_out_statistics.xml"),
+                             fos2, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile_mesh/" +
+                                               "verticalprofile_step_10_out_chart.xml"),
+                             fos, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                              "verticalprofile_mesh/" +
+                                              "verticalprofile_step_10_out_csv.xml"),
+                             fos3, cc);
+                artifact.out(this.readDocument("src/test/ressources/" +
+                                               "verticalprofile_mesh/" +
+                                               "verticalprofile_step_10_out_odv.xml"),
+                             fos4, cc);
             } catch (Exception e) {
                 log.error(e, e);
                 fail();
@@ -530,6 +453,8 @@
                     fos2.close();
                     fos3.flush();
                     fos3.close();
+                    fos4.flush();
+                    fos4.close();
                 } catch (Exception e) {
                     log.error(e, e);
                 }

http://dive4elements.wald.intevation.org