Author: echatellier Date: 2014-07-29 16:48:26 +0200 (Tue, 29 Jul 2014) New Revision: 4079 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4079 Log: Fix tests Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-07-29 14:48:10 UTC (rev 4078) +++ trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-07-29 14:48:26 UTC (rev 4079) @@ -364,12 +364,12 @@ Assert.assertTrue(xml.indexOf("<feature name=\"grouptype\">continuous") != -1); Assert.assertTrue(xml.indexOf("<feature name=\"group\">discretegrp") != -1); Assert.assertTrue(xml.indexOf("<feature name=\"group\">discrete") != -1); - + // factor 6 Assert.assertTrue(xml.indexOf("<rule name=\"TACpoids\">") != -1); Assert.assertTrue(xml.indexOf("<rule name=\"TailleMin\">") != -1); Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.propSurvie\">42.0</param>") != -1); - Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378</param>") != -1); + Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378:EngEnc</param>") != -1); } /** Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-07-29 14:48:10 UTC (rev 4078) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-07-29 14:48:26 UTC (rev 4079) @@ -402,10 +402,10 @@ // generate prescript for that wonderfull scenario String preScriptContent = FactorHelper.generatePreScript(scenario1); - //log.info("Script = " + preScriptContent); + log.info("Script = " + preScriptContent); Assert.assertTrue(preScriptContent.contains("params.setProperty(\"population.xxx.number\"")); - Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378\");")); + Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378:EngEnc\");")); Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.1.parameter.propSurvie\",\"42.0\");")); Assert.assertTrue(preScriptContent.contains("rules\",\"TACpoids,TailleMin\")")); }