Author: chatellier Date: 2009-09-09 15:35:02 +0000 (Wed, 09 Sep 2009) New Revision: 2590 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java Log: Ajout d'un test sur la compilation des equations (ne fonctionne pas) Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-09-04 17:43:44 UTC (rev 2589) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-09-09 15:35:02 UTC (rev 2590) @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; - +import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; @@ -75,7 +75,7 @@ args.put("context", null); args.put("age", 2.0); args.put("group", null); - Object result = EvaluatorHelper.evaluate("org.codelutin.equation", + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestEvaluate", PopulationGrowth.class, equationContent, args); Assert.assertNotNull(result); @@ -95,17 +95,37 @@ args.put("group", null); String equationContent = "return length * 2.0;"; - Object result = EvaluatorHelper.evaluate("org.codelutin.equation", + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestDoubleContentEvaluate", PopulationGrowthReverse.class, equationContent, args); Assert.assertNotNull(result); Assert.assertEquals("4.0", result.toString()); equationContent = "return length * 3.0;"; - result = EvaluatorHelper.evaluate("org.codelutin.equation", + result = EvaluatorHelper.evaluate("fr.isisfish.equation", "TestDoubleContentEvaluate", PopulationGrowthReverse.class, equationContent, args); Assert.assertNotNull(result); Assert.assertEquals("6.0", result.toString()); } + + /** + * Test que le repertoire des scripts en bien présent + * dans le classpath de compilation. + */ + @Ignore + 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); + Assert.assertNotNull(result); + Assert.assertEquals("4.0", result.toString()); + } }