diff gwt-client/src/test/java/test/RunnerCreatorHelper.java @ 9228:dba14da43f23

JUnit-Tests finish
author gernotbelger
date Thu, 05 Jul 2018 13:46:36 +0200
parents 83aee0942eae
children 46e3e23cca0b
line wrap: on
line diff
--- a/gwt-client/src/test/java/test/RunnerCreatorHelper.java	Wed Jul 04 18:28:08 2018 +0200
+++ b/gwt-client/src/test/java/test/RunnerCreatorHelper.java	Thu Jul 05 13:46:36 2018 +0200
@@ -32,17 +32,24 @@
 
     // HELPER-Methods:
 
-    public final static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final FilenameMapper helloWorldFile, final double from, final double to,
-            final River beispielfluss) throws ConnectionException, ServerException {
+    public final static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final FilenameMapper file, final double from, final double to,
+            final River beispielfluss, final SimpleRecommendation rec0, final SimpleRecommendation rec1) throws ConnectionException, ServerException {
         // TODO: make recommendationPair to method parameter if needed
-        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"));
+        final SinfoFlowdepthMinMaxRunner proof = new SinfoFlowdepthMinMaxRunner(user, pw, CalcMode.sinfo_calc_flow_depth_minmax, file, from, to, beispielfluss);
+        proof.addRecommendationPair(rec0, rec1);
 
         return proof;
     }
 
+    public static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final FilenameMapper file, final int from, final int to, final River river,
+            final SimpleRecommendation simpleRecommendation0, final SimpleRecommendation simpleRecommendation1,
+            final SimpleRecommendation simpleRecommendation2, final SimpleRecommendation simpleRecommendation3) throws ConnectionException, ServerException {
+        final SinfoFlowdepthMinMaxRunner proof = (SinfoFlowdepthMinMaxRunner) createSinfoFlowdepthMinMaxTest(file, from, to, river, simpleRecommendation0,
+                simpleRecommendation1);
+        proof.addRecommendationPair(simpleRecommendation2, simpleRecommendation3);
+        return proof;
+    }
+
     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 SinfoFlowdepthRunner proof = new SinfoFlowdepthRunner(user, pw, CalcMode.sinfo_calc_flow_depth, file, from, to, river, useTkh);

http://dive4elements.wald.intevation.org