Mercurial > dive4elements > gnv-client

changeset 476:ffb38c6c928e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added new Step for querying the Years where measurements has been done into the TestCase. gnv-artifacts/trunk@543 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Fri, 15 Jan 2010 09:54:51 +0000
parents c0504976e606
children 40a058047854
files gnv-artifacts/ChangeLog gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_advance.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_advance.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_feed.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_chart.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_csv.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_odv.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_statistics.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_advance.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_feed.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_chart.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_csv.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_odv.xml gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_statistics.xml
diffstat 17 files changed, 90 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Jan 15 09:54:51 2010 +0000
@@ -1,3 +1,23 @@
+2010-01-15  Tim Englich  <tim.englich@intevation.de>
+
+	* src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java (testArtifact): 
+	  Added new Step for querying the Years where measurements has been done into the 
+	  Testcase.
+	
+	* src/test/ressources/verticalprofile/verticalprofile_step_07_out_statistics.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_07_out_odv.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_07_out_csv.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_07_out_chart.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_07_feed.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_07_advance.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_06_feed.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_06_advance.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml,
+	  src/test/ressources/verticalprofile/verticalprofile_step_05_advance.xml: 
+	  Added State-Ressource for the new step Year and modified the other Ressource-Files
+	  so that the new Step is queued in the right direction.
+
 2010-01-13  Ingo Weinzierl <ingo_weinzierl@web.de>
 
 	* src/main/java/de/intevation/gnv/artifacts/fis/FISSelectArtifact.java,
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java	Fri Jan 15 09:54:51 2010 +0000
@@ -55,7 +55,7 @@
             CallContext cc = createCallContext();
 
             Document describeDocument = this.readDocument("src/test/ressources/verticalprofile/verticalprofile_describe.xml");
-            int steps = 6;
+            int steps = 7;
             
             for (int i = 1; i <= steps; i++){
                 this.doNextStep(
@@ -89,19 +89,19 @@
                         + ".odv");
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalprofile/" +
-                                               "verticalprofile_step_06_out_statistics.xml"),
+                                               "verticalprofile_step_07_out_statistics.xml"),
                              fos2, cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalprofile/" +
-                                               "verticalprofile_step_06_out_chart.xml"),
+                                               "verticalprofile_step_07_out_chart.xml"),
                              fos, cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalprofile/" +
-                                               "verticalprofile_step_06_out_csv.xml"),
+                                               "verticalprofile_step_07_out_csv.xml"),
                              fos3, cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalprofile/" +
-                                               "verticalprofile_step_06_out_odv.xml"),
+                                               "verticalprofile_step_07_out_odv.xml"),
                             fos4, cc);
             } catch (Exception e) {
                 log.error(e, e);
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -3,5 +3,5 @@
 	<art:type name="advance" />
 	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
 	<art:hash value="18171662" />
-	<art:target name="verticalprofile_date" />
+	<art:target name="verticalprofile_year" />
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_advance.xml	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_advance.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -3,5 +3,5 @@
 	<art:type name="advance" />
 	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
 	<art:hash value="11096221" />
-	<art:target name="verticalprofile_minmaxdepth" />
+	<art:target name="verticalprofile_date" />
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
 	<art:hash value="11096221" />
 	<art:data>
-		<art:input name="dateid" value="2008.12.09 00:00:00" />
+		<art:input name="yearid" value="2008" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_advance.xml	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_advance.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -3,5 +3,5 @@
 	<art:type name="advance" />
 	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
 	<art:hash value="11096221" />
-	<art:target name="verticalprofile_calculate_results" />
+	<art:target name="verticalprofile_minmaxdepth" />
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_feed.xml	Thu Jan 14 11:07:27 2010 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_feed.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -4,7 +4,6 @@
 	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
 	<art:hash value="11096221" />
 	<art:data>
-		<art:input name="maxvalue" value="-7.0" />
-		<art:input name="minvalue" value="-40.0" />
+		<art:input name="dateid" value="2008.12.09 00:00:00" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_chart.xml	Thu Jan 14 11:07:27 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
-	<art:type name="out" />
-	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
-	<art:hash value="11096221" />
-	<art:out name="chart">
-		<art:mime-type value="image/png" />
-		<art:params>
-			<art:input name="width" value="600" />
-			<art:input name="height" value="400" />
-		</art:params>
-	</art:out>
-</art:action>
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_csv.xml	Thu Jan 14 11:07:27 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
-	<art:type name="out" />
-    <art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
-    <art:hash value="11096221" />
-	<art:out name="csv">
-		<art:out value="text/plain" />
-		<art:params />
-	</art:out>
-</art:action>
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_odv.xml	Thu Jan 14 11:07:27 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
-	<art:type name="out" />
-	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
-	<art:hash value="11096221" />
-	<art:out name="odv">
-		<art:out value="text/plain" />
-		<art:params />
-	</art:out>
-</art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_06_out_statistics.xml	Thu Jan 14 11:07:27 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
-	<art:type name="out" />
-	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
-	<art:hash value="11096221" />
-	<art:out name="statistics">
-		<art:out value="text/xml" />
-		<art:params />
-	</art:out>
-</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_advance.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
+	<art:hash value="11096221" />
+	<art:target name="verticalprofile_calculate_results" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_feed.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
+	<art:hash value="11096221" />
+	<art:data>
+		<art:input name="maxvalue" value="-7.0" />
+		<art:input name="minvalue" value="-40.0" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_chart.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
+	<art:hash value="11096221" />
+	<art:out name="chart">
+		<art:mime-type value="image/png" />
+		<art:params>
+			<art:input name="width" value="600" />
+			<art:input name="height" value="400" />
+		</art:params>
+	</art:out>
+</art:action>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_csv.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+    <art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
+    <art:hash value="11096221" />
+	<art:out name="csv">
+		<art:out value="text/plain" />
+		<art:params />
+	</art:out>
+</art:action>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_odv.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
+	<art:hash value="11096221" />
+	<art:out name="odv">
+		<art:out value="text/plain" />
+		<art:params />
+	</art:out>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_07_out_statistics.xml	Fri Jan 15 09:54:51 2010 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+	<art:uuid value="4319eb60-5419-4ce9-80b2-3ffac5b50146" />
+	<art:hash value="11096221" />
+	<art:out name="statistics">
+		<art:out value="text/xml" />
+		<art:params />
+	</art:out>
+</art:action>
\ No newline at end of file
http://dive4elements.wald.intevation.org