Author: jcouteau Date: 2009-03-16 11:29:26 +0000 (Mon, 16 Mar 2009) New Revision: 1972 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Log: Fixing test Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-16 11:27:28 UTC (rev 1971) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-16 11:29:26 UTC (rev 1972) @@ -44,12 +44,12 @@ /** * Test for MexicoHelper class. - * + * * @author chatellier * @version $Revision: 1526 $ - * - * Last update: $Date: 2008-10-07 18:46:13 +0200 (mar 07 oct 2008) $ - * by : $Author: tchemit $ + * + * Last update: $Date: 2008-10-07 18:46:13 +0200 (mar 07 oct 2008) $ by : + * $Author: tchemit $ */ public class MexicoHelperTest { @@ -58,7 +58,7 @@ protected DesignPlan getTestDesignPlan() { DesignPlan designPlan = new DesignPlan(); - + // matrix 1 MatrixND matrix1 = MatrixFactory.getInstance().create("test1", new int[] { 3, 2 }, new String[] { "col1", "col2" }); @@ -70,12 +70,14 @@ matrix1.setValue(new int[] { 2, 1 }, -1); // factor 1 - Factor<Double> factorContinuous = new Factor<Double>("factor 1 (double)"); + Factor<Double> factorContinuous = new Factor<Double>( + "factor 1 (double)"); ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); domain1.setMinBound(0.0); domain1.setMaxBound(50.0); factorContinuous.setDomain(domain1); - factorContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); + factorContinuous + .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); // factor 2 Factor<Double> factorDiscrete = new Factor<Double>("factor 2 (double)"); @@ -86,128 +88,149 @@ domain2.getValues().put(3.0, -12.1); domain2.getValues().put(4.0, -8.45); factorDiscrete.setDomain(domain2); - factorDiscrete.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); + factorDiscrete + .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); factorDiscrete.setValue(3.0); // factor 3 - Factor<MatrixND> factorContinuous2 = new Factor<MatrixND>("factor 3 (discrete matrix)"); + Factor<MatrixND> factorContinuous2 = new Factor<MatrixND>( + "factor 3 (discrete matrix)"); DiscreteDomain<MatrixND> domain3 = new DiscreteDomain<MatrixND>(); domain3.getValues().put(0.0, matrix1); factorContinuous2.setDomain(domain3); - factorContinuous2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); - + factorContinuous2 + .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); + // factor 4 - Factor<Double> factorMatrixContinuous = new Factor<Double>("factor 4 (MatrixContinuous)"); + Factor<Double> factorMatrixContinuous = new Factor<Double>( + "factor 4 (MatrixContinuous)"); MatrixContinuousDomain<Double> domain4 = new MatrixContinuousDomain<Double>(); domain4.setMinBound(1.0); domain4.setMaxBound(2.0); domain4.setMatrix(matrix1); domain4.setOperator("-"); factorMatrixContinuous.setDomain(domain4); - factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); - + factorMatrixContinuous + .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); + // factor 5 - Factor<Double> factorEquationContinuous = new Factor<Double>("factor 5 (EquationContinuous)"); + Factor<Double> factorEquationContinuous = new Factor<Double>( + "factor 5 (EquationContinuous)"); EquationContinuousDomain<Double> domain5 = new EquationContinuousDomain<Double>(); domain5.setMinBound(1.0); domain5.setMaxBound(2.0); domain5.setVariableName("L1"); domain5.setOperator("-"); factorEquationContinuous.setDomain(domain5); - factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); + factorEquationContinuous + .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); designPlan.getFactors().add(factorContinuous); designPlan.getFactors().add(factorDiscrete); designPlan.getFactors().add(factorContinuous2); designPlan.getFactors().add(factorMatrixContinuous); designPlan.getFactors().add(factorEquationContinuous); - + return designPlan; } - + /** * Test method {@link MexicoHelper#getDesignPlanAsXML(DesignPlan)}. * - * @throws IOException + * @throws IOException */ @Test public void testGetDesignPlanAsXML() throws IOException { DesignPlan testDesignPlan = getTestDesignPlan(); - + // test xml export String xml = MexicoHelper.getDesignPlanAsXML(testDesignPlan); - Assert.assertTrue(xml.indexOf("<factor name=\"factor 2 (double)\"") != -1); + Assert + .assertTrue(xml.indexOf("<factor name=\"factor 2 (double)\"") != -1); //Assert.assertTrue(xml.indexOf("<range min=\"12.0\" max=\"99.0\" />") != -1); Assert.assertTrue(xml.indexOf("<value>70.9</value>") != -1); - + if (log.isDebugEnabled()) { xml = xml.replaceAll(">", ">\n"); - FileUtil.writeString(new File(TestUtils.getTargetdir(),"mexicohelper_designplan.xml"), xml); + FileUtil.writeString(new File(TestUtils.getTargetdir(), + "mexicohelper_designplan.xml"), xml); log.info("Designplan xml = " + xml); } } - + /** - * Test method {@link MexicoHelper#getSensitivityScenarionsAsXML(SensitivityScenarios)}. + * Test method + * {@link MexicoHelper#getSensitivityScenarionsAsXML(SensitivityScenarios)}. * - * @throws IOException - * @throws SensitivityException + * @throws IOException + * @throws SensitivityException */ @Test - public void testGetSensitivityScenariosAsXML() throws IOException, SensitivityException { + public void testGetSensitivityScenariosAsXML() throws IOException, + SensitivityException { DesignPlan testDesignPlan = getTestDesignPlan(); SensitivityCalculator testCalculator = new SensitivityCalculatorRandomMock(); - SensitivityScenarios testScenario = testCalculator.compute(testDesignPlan); - + SensitivityScenarios testScenario = testCalculator.compute( + testDesignPlan, null); + // test xml export String xml = MexicoHelper.getSensitivityScenarionsAsXML(testScenario); //Assert.assertTrue(xml.indexOf("<factor name=\"factor 2 (double)\"") != -1); //Assert.assertTrue(xml.indexOf("<range min=\"12.0\" max=\"99.0\" />") != -1); //Assert.assertTrue(xml.indexOf("<value>70.9</value>") != -1); - + if (log.isDebugEnabled()) { xml = xml.replaceAll(">", ">\n"); - FileUtil.writeString(new File(TestUtils.getTargetdir(),"mexicohelper_scenarios.xml"), xml); + FileUtil.writeString(new File(TestUtils.getTargetdir(), + "mexicohelper_scenarios.xml"), xml); log.info("SensitivityScenarios xml = " + xml); } } - + /** * Test method {@link MexicoHelper#getDesignPlanFromXML(String)}. - * @throws IOException + * + * @throws IOException */ @Test public void getDesignPlanFromXML() throws IOException { - DesignPlan plan = MexicoHelper.getDesignPlanFromXML("src/test/resources/mexico/mexicohelper_designplan.xml"); + DesignPlan plan = MexicoHelper + .getDesignPlanFromXML("src/test/resources/mexico/mexicohelper_designplan.xml"); Assert.assertEquals(4, plan.getFactors().size()); // FIXME should be : Assert.assertEquals(5, plan.getFactors().size()); - + String xml = MexicoHelper.getDesignPlanAsXML(plan); xml = xml.replaceAll(">", ">\n"); log.info("getDesignPlanFromXML xml = " + xml); } - + /** * Test method {@link MexicoHelper#getSensitivityScenariosFromXML(String)}. - * @throws IOException + * + * @throws IOException */ @Test public void getSensitivityScenariosFromXML() throws IOException { - SensitivityScenarios scenario = MexicoHelper.getSensitivityScenariosFromXML("src/test/resources/mexico/mexicohelper_scenarios.xml"); + SensitivityScenarios scenario = MexicoHelper + .getSensitivityScenariosFromXML("src/test/resources/mexico/mexicohelper_scenarios.xml"); Assert.assertEquals(10, scenario.getScenarios().size()); - Assert.assertEquals(5, scenario.getScenarios().get(0).getFactors().size()); - Assert.assertEquals(2, scenario.getScenarios().get(1).getFactors().size()); - Assert.assertEquals(2, scenario.getScenarios().get(2).getFactors().size()); - Assert.assertEquals(2, scenario.getScenarios().get(3).getFactors().size()); - + Assert.assertEquals(5, scenario.getScenarios().get(0).getFactors() + .size()); + Assert.assertEquals(2, scenario.getScenarios().get(1).getFactors() + .size()); + Assert.assertEquals(2, scenario.getScenarios().get(2).getFactors() + .size()); + Assert.assertEquals(2, scenario.getScenarios().get(3).getFactors() + .size()); + String xml = MexicoHelper.getSensitivityScenarionsAsXML(scenario); xml = xml.replaceAll(">", ">\n"); log.info("getSensitivityScenariosFromXML xml = " + xml);