diff gwt-client/src/test/java/test/RunnerCreatorHelper.java @ 9148:48d87af1243e

Unit testing flowdepthdevelopment added
author gernotbelger
date Tue, 12 Jun 2018 15:04:40 +0200
parents af73fdd96920
children 83aee0942eae
line wrap: on
line diff
--- a/gwt-client/src/test/java/test/RunnerCreatorHelper.java	Tue Jun 12 10:40:33 2018 +0200
+++ b/gwt-client/src/test/java/test/RunnerCreatorHelper.java	Tue Jun 12 15:04:40 2018 +0200
@@ -32,21 +32,32 @@
 
     // HELPER-Methods:
 
-    public final static ModuleRunner createSinfoFlowdepthMinMaxTest(final FilenameMapper helloWorldFile, final double from, final double to,
+    public final static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final FilenameMapper helloWorldFile, final double from, final double to,
             final River beispielfluss) throws ConnectionException, ServerException {
         // TODO: make recommendationPair to method parameter if needed
-        final ModuleRunner proof = new SinfoFlowdepthMinMaxRunner(user, pw, CalcMode.sinfo_calc_flow_depth_minmax, helloWorldFile, from, to, beispielfluss);
+        final SinfoFlowdepthMinMaxRunner proof = new SinfoFlowdepthMinMaxRunner(user, pw, CalcMode.sinfo_calc_flow_depth_minmax, helloWorldFile, from, to,
+                beispielfluss);
         proof.addRecommendationPair(new SimpleRecommendation("staticwqkms", "additionals-wstv-0-103", "sinfo_flowdepth_waterlevels"),
                 new SimpleRecommendation("bedheight", "bedheight-single-36-2015-FP-2015_0-502", "sinfo_flowdepthminmax_heights"));
 
         return proof;
     }
 
-    public final static ModuleRunner createSinfoFlowdepthTest(final FilenameMapper file, final double from, final double to, final River river,
+    public final static AbstractModuleRunner createSinfoFlowdepthTest(final FilenameMapper file, final double from, final double to, final River river,
             final boolean useTkh, final SimpleRecommendation rec0, final SimpleRecommendation rec1) throws ConnectionException, ServerException {
-        final ModuleRunner proof = new SinfoFlowdepthRunner(user, pw, CalcMode.sinfo_calc_flow_depth, file, from, to, river, useTkh);
+        final SinfoFlowdepthRunner proof = new SinfoFlowdepthRunner(user, pw, CalcMode.sinfo_calc_flow_depth, file, from, to, river, useTkh);
         proof.addRecommendationPair(rec0, rec1);
 
         return proof;
     }
+
+    public final static AbstractModuleRunner createSinfoFlowdepthDevelopmentTest(final FilenameMapper file, final double from, final double to,
+            final River river, final SimpleRecommendation rec0_curr, final SimpleRecommendation rec1_curr, final SimpleRecommendation rec0_hist,
+            final SimpleRecommendation rec1_hist) throws ConnectionException, ServerException {
+        final SinfoFlowdepthDevelopmentRunner proof = new SinfoFlowdepthDevelopmentRunner(user, pw, CalcMode.sinfo_calc_flow_depth_development, file, from, to,
+                river);
+        proof.addCurrentRecommendationPair(rec0_curr, rec1_curr);
+        proof.addHistoricalRecommendationPair(rec0_hist, rec1_hist);
+        return proof;
+    }
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org