Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java @ 240:76897b73db4e
Added ODV-Export-Support to TimeSeries Mesh
gnv-artifacts/trunk@308 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Tim Englich <tim.englich@intevation.de> |
---|---|
date | Mon, 09 Nov 2009 14:20:27 +0000 |
parents | 3d6d89bcbf42 |
children | 8500529d82af |
line wrap: on
line diff
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Mon Nov 09 14:11:09 2009 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Mon Nov 09 14:20:27 2009 +0000 @@ -97,7 +97,7 @@ for (int i = 1; i <= steps; i++){ - this.doNextStep( + this.doNextStep( artifact, cc, "src/test/ressources/timeseries/" + @@ -105,7 +105,6 @@ "src/test/ressources/timeseries/" + "timeseries_step_0"+i+"_advance.xml", describeDocument); - } Document outputData = artifact.describe(describeDocument,cc); @@ -205,67 +204,25 @@ CallContext cc = createCallContext(); Document describeDocument = this.readDocument("src/test/ressources/timeseries_mesh/timeseries_describe.xml"); - // Erster Schritt - this - .doNextStep( - artifact, - cc, - "src/test/ressources/timeseries_mesh/timeseries_step_01_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_step_01_advance.xml", describeDocument); - - // Zweiter Schritt - this - .doNextStep( - artifact, - cc, - "src/test/ressources/timeseries_mesh/timeseries_step_02_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_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/timeseries_mesh/timeseries_step_03_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_step_03_advance.xml", describeDocument); - - // Vierter Schritt - this - .doNextStep( - artifact, - cc, - "src/test/ressources/timeseries_mesh/timeseries_step_04_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_step_04_advance.xml", describeDocument); - - // Fünfter Schritt - this - .doNextStep( - artifact, - cc, - "src/test/ressources/timeseries_mesh/timeseries_step_05_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_step_05_advance.xml", describeDocument); - - // Sechster Schritt - this - .doNextStep( - artifact, - cc, - "src/test/ressources/timeseries_mesh/timeseries_step_06_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_step_06_advance.xml", describeDocument); - - // Siebter Schritt - this - .doNextStep( - artifact, - cc, - "src/test/ressources/timeseries_mesh/timeseries_step_07_feed.xml", - "src/test/ressources/timeseries_mesh/timeseries_step_07_advance.xml", describeDocument); - + "src/test/ressources/timeseries_mesh/" + + "timeseries_step_0"+i+"_feed.xml", + "src/test/ressources/timeseries_mesh/" + + "timeseries_step_0"+i+"_advance.xml", + describeDocument); + } // Achter 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/timeseries_mesh" + System.currentTimeMillis() @@ -276,6 +233,9 @@ fos3 = new FileOutputStream("src/test/results/timeseries_mesh" + System.currentTimeMillis() + ".csv"); + fos4 = new FileOutputStream("src/test/results/timeseries_mesh" + + System.currentTimeMillis() + + ".odv"); artifact .feed( this @@ -296,6 +256,11 @@ this .readDocument("src/test/ressources/timeseries_mesh/timeseries_step_08_out_csv.xml"), fos3, cc); + artifact + .out( + this + .readDocument("src/test/ressources/timeseries_mesh/timeseries_step_08_out_odv.xml"), + fos4, cc); } catch (Exception e) { log.error(e, e); fail();