Author: echatellier Date: 2014-04-17 17:05:25 +0200 (Thu, 17 Apr 2014) New Revision: 3967 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3967 Log: Fix test (args map remove, only varargs now) Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java 2014-04-17 14:57:34 UTC (rev 3966) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java 2014-04-17 15:05:25 UTC (rev 3967) @@ -81,12 +81,8 @@ public void testEvaluate() { String equationContent = "return age * 2.0;"; - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("age", 2.0); - args.put("group", null); Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", - "TestEvaluate", PopulationGrowth.class, equationContent, args); + "TestEvaluate", PopulationGrowth.class, equationContent, /*context*/null, /*length*/2.0, /*group*/null); Assert.assertNotNull(result); Assert.assertEquals("4.0", result.toString()); @@ -107,14 +103,14 @@ String equationContent = "return length * 2.0;"; Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestDoubleContentEvaluate", PopulationGrowthReverse.class, - equationContent, args); + equationContent, /*context*/null, /*length*/2.0, /*group*/null); Assert.assertNotNull(result); Assert.assertEquals("4.0", result.toString()); equationContent = "return length * 3.0;"; result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestDoubleContentEvaluate", PopulationGrowthReverse.class, - equationContent, args); + equationContent, /*context*/null, /*length*/2.0, /*group*/null); Assert.assertNotNull(result); Assert.assertEquals("6.0", result.toString()); } @@ -125,16 +121,12 @@ */ @Test public void testEquationWithDatabaseContent() { - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("length", 2.0); - args.put("group", null); String equationContent = "String name = scripts.ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP;"; equationContent += "return length * 2.0;"; Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, - equationContent, args); + equationContent, /*context*/null, /*length*/2.0, /*group*/null); Assert.assertNotNull(result); Assert.assertEquals("4.0", result.toString()); } @@ -144,16 +136,12 @@ */ @Test public void testEquationWithLogger() { - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("length", 2.0); - args.put("group", null); String equationContent = "log.info(\"Test logger\");"; equationContent += "return 1.0;"; Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, - equationContent, args); + equationContent, /*context*/null, /*length*/2.0, /*group*/null); Assert.assertNotNull(result); Assert.assertEquals("1.0", result.toString()); } @@ -183,9 +171,7 @@ String content = "if (context != null) {\n" + " // test\n" + "}\n"; - Map<String, Object> args = new HashMap<>(); - args.put("context", SimulationContext.get()); EvaluatorHelper.evaluate("fr.isisfish.prescript", - "TestPrescript", SimulationPreScript.class, content, args); + "TestPrescript", SimulationPreScript.class, content, /*context*/SimulationContext.get(), /*db*/null); } }