Author: chatellier Date: 2009-12-14 15:51:06 +0000 (Mon, 14 Dec 2009) New Revision: 2829 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Log: Fix test, with JUnit timeout configuration. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-12-14 15:50:29 UTC (rev 2828) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-12-14 15:51:06 UTC (rev 2829) @@ -23,11 +23,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixND; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.entities.Population; @@ -51,11 +50,7 @@ * @version $Revision: 1.0 $ * * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ - * - * - * FIXME EC-20090713 ignored : test fail and loop infinitely */ - at Ignore public class SimulationServiceTest extends AbstractIsisFishTest { /** Commons logging log. */ @@ -83,8 +78,7 @@ domain1.setMaxBound(50.0); domain1.setCardinality(4); factor1.setDomain(domain1); - factor1 - .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); + factor1.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); // factor 2 /*Factor<Double> factor2 = new Factor<Double>("factor 2 (double)"); @@ -104,8 +98,7 @@ domain3.setMaxBound(99.0); domain3.setCardinality(4); factor3.setDomain(domain3); - factor3 - .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); + factor3.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); designPlan.getFactors().add(factor1); //designPlan.getFactors().add(factor2); @@ -148,8 +141,7 @@ domain1.getValues().put(0.0, matrix1); domain1.getValues().put(1.0, matrix2); factor1.setDomain(domain1); - factor1 - .setPath("fr.ifremer.isisfish.entities.StrategyMonthInfo#1156808754768#0.7282750856395208#proportionMetier"); + factor1.setPath("fr.ifremer.isisfish.entities.StrategyMonthInfo#1156808754768#0.7282750856395208#proportionMetier"); designPlan.getFactors().add(factor1); @@ -158,8 +150,10 @@ /** * Lance une simulation avec des facteurs de sensibilité. + * + * Test is wrong if it take more than 2 min. */ - @Test + @Test(timeout=120 * 1000) public void testRunSensivitySimulation() { SimulationParameter params = new SimulationParameter(); @@ -209,8 +203,10 @@ * Lance une simulation avec des facteurs de sensibilité. * * This test use factors with matrix. + * + * Fail after 2 min. */ - @Test + @Test(timeout=120 * 1000) public void testRunSensivitySimulationWithMatrix() { SimulationParameter params = new SimulationParameter();