Mercurial > dive4elements > gnv-client

diff gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java @ 326:37847d724fc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added one more Transitionstep to each Testcase according to the refactored Transitionmodel. gnv-artifacts/trunk@392 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 01 Dec 2009 16:27:56 +0000
parents 251f16a083f8
children
line wrap: on
line diff
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Tue Dec 01 15:58:02 2009 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Tue Dec 01 16:27:56 2009 +0000
@@ -93,7 +93,7 @@
 
             Document describeDocument = this.readDocument("src/test/ressources/timeseries/timeseries_describe.xml");
             
-            int steps = 5;
+            int steps = 6;
             
             for (int i = 1; i <= steps; i++){
             
@@ -126,9 +126,6 @@
                         + System.currentTimeMillis()
                         + ".odv");
             
-                artifact.feed(this
-                              .readDocument("src/test/ressources/timeseries/timeseries_step_06_feed.xml"),
-                                            cc);
                 artifact.out(this
                              .readDocument("src/test/ressources/timeseries/timeseries_step_06_out_chart.xml"),
                                            fos, cc);
@@ -205,7 +202,7 @@
 
             Document describeDocument = this.readDocument("src/test/ressources/timeseries_mesh/timeseries_describe.xml");
             
-            int steps = 7;
+            int steps = 8;
             
             for (int i = 1; i <= steps; i++){
                 this.doNextStep(
@@ -237,11 +234,6 @@
                         + System.currentTimeMillis()
                         + ".odv");
                 artifact
-                        .feed(
-                                this
-                                        .readDocument("src/test/ressources/timeseries_mesh/timeseries_step_08_feed.xml"),
-                                cc);
-                artifact
                         .out(
                                 this
                                         .readDocument("src/test/ressources/timeseries_mesh/timeseries_step_08_out_statistics.xml"),
@@ -298,7 +290,7 @@
             CallContext cc = createCallContext();
 
             Document describeDocument = this.readDocument("src/test/ressources/verticalprofile/verticalprofile_describe.xml");
-            int steps = 5;
+            int steps = 6;
             
             for (int i = 1; i <= steps; i++){
                 this.doNextStep(
@@ -330,10 +322,6 @@
                 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"),
@@ -391,16 +379,20 @@
                                                           "verticalprofile_mesh/" +
                                                           "verticalprofile_describe.xml");
             
-            int steps = 9;
+            int steps = 10;
             
             for (int i = 1; i <= steps; i++){
+                String number = ""+i;
+                if (i < 10){
+                    number = "0"+number;
+                }
                 this.doNextStep(
                             artifact,
                             cc,
                             "src/test/ressources/verticalprofile_mesh/" +
-                            "verticalprofile_step_0"+i+"_feed.xml",
+                            "verticalprofile_step_"+number+"_feed.xml",
                             "src/test/ressources/verticalprofile_mesh/" +
-                            "verticalprofile_step_0"+i+"_advance.xml", 
+                            "verticalprofile_step_"+number+"_advance.xml", 
                             describeDocument);
             }
             // 10. Schritt
@@ -422,10 +414,6 @@
                 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"),
@@ -481,7 +469,7 @@
             CallContext cc = createCallContext();
             Document describeDocument = this.readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_describe.xml");
             
-           int steps = 4;
+           int steps = 5;
             
             for (int i = 1; i <= steps; i++){
                 this.doNextStep(
@@ -513,10 +501,6 @@
                 fos4 = new FileOutputStream(
                         "src/test/results/verticalprofile_instantaneouspoint"
                                 + System.currentTimeMillis() + ".odv");
-                artifact.feed(this.readDocument("src/test/ressources/" +
-                                                "verticalprofile_instantaneouspoint/" +
-                                                "verticalprofile_step_05_feed.xml"),
-                              cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalprofile_instantaneouspoint/" +
                                                "verticalprofile_step_05_out_statistics.xml"),
@@ -571,7 +555,7 @@
             CallContext cc = createCallContext();
             Document describeDocument = this.readDocument("src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_describe.xml");
             
-            int steps = 8;
+            int steps = 9;
             
             for (int i = 0; i < steps; i++){
             
@@ -603,10 +587,6 @@
                 fos4 = new FileOutputStream(
                         "src/test/results/horizontalprofile_instantaneouspoint"
                                 + System.currentTimeMillis() + ".odv");
-                artifact.feed(this.readDocument("src/test/ressources/" +
-                                                "horizontalProfile_instantaneouspoint/" +
-                                                "horizontalprofile_step_08_feed.xml"),
-                              cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "horizontalProfile_instantaneouspoint/" +
                                                "horizontalprofile_step_08_out_statistics.xml"),
@@ -661,17 +641,20 @@
             CallContext cc = createCallContext();
             Document describeDocument = this.readDocument("src/test/ressources/horizontalProfile_mesh/horizontalprofile_describe.xml");
             
-            int steps = 9;
+            int steps = 10;
             
             for (int i = 1; i <= steps; i++){
-            
+                String number = ""+i;
+                if (i < 10){
+                    number = "0"+number;
+                }
                 this.doNextStep(
                             artifact,
                             cc,
                             "src/test/ressources/horizontalProfile_mesh/" +
-                            "horizontalprofile_step_0"+i+"_feed.xml",
+                            "horizontalprofile_step_"+number+"_feed.xml",
                             "src/test/ressources/horizontalProfile_mesh/" +
-                            "horizontalprofile_step_0"+i+"_advance.xml", 
+                            "horizontalprofile_step_"+number+"_advance.xml", 
                             describeDocument);
             }
             
@@ -693,10 +676,6 @@
                 fos4 = new FileOutputStream(
                         "src/test/results/horizontalProfile_mesh"
                                 + System.currentTimeMillis() + ".odv");
-                artifact.feed(this.readDocument("src/test/ressources/" +
-                                                "horizontalProfile_mesh/" +
-                                                "horizontalprofile_step_10_feed.xml"),
-                              cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "horizontalProfile_mesh/" +
                                                "horizontalprofile_step_10_out_statistics.xml"),
@@ -751,7 +730,7 @@
 
             CallContext cc = createCallContext();
             Document describeDocument = this.readDocument("src/test/ressources/horizontalcrosssection_mesh/horizontalcrosssection_describe.xml");
-            int steps = 5;
+            int steps = 6;
             
             for (int i = 1; i <= steps; i++){
                 this.doNextStep(
@@ -779,10 +758,6 @@
                 fos3 = new FileOutputStream(
                         "src/test/results/horizontalcrosssection_mesh"
                                 + System.currentTimeMillis() + ".odv");
-                artifact.feed(this.readDocument("src/test/ressources/" +
-                                                "horizontalcrosssection_mesh/" +
-                                                "horizontalcrosssection_step_06_feed.xml"),
-                              cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "horizontalcrosssection_mesh/" +
                                                "horizontalcrosssection_step_06_out_chart.xml"),
@@ -833,7 +808,7 @@
             CallContext cc = createCallContext();
             Document describeDocument = this.readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_describe.xml");
             
-            int steps = 7;
+            int steps = 8;
             
             for (int i = 1; i <= steps; i++){
             
@@ -862,10 +837,6 @@
                 fos3 = 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_chart.xml"),
http://dive4elements.wald.intevation.org