Author: echatellier Date: 2013-11-27 11:36:14 +0100 (Wed, 27 Nov 2013) New Revision: 3854 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3854 Log: Help maven with absolute file Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2013-11-27 09:33:13 UTC (rev 3853) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2013-11-27 10:36:14 UTC (rev 3854) @@ -53,6 +53,7 @@ @Test public void testCRLFOnBat() throws IOException { File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "isisfish.bat"); + batFile = batFile.getAbsoluteFile(); // for maven String content = FileUtils.readFileToString(batFile); System.out.println(content); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2013-11-27 09:33:13 UTC (rev 3853) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2013-11-27 10:36:14 UTC (rev 3854) @@ -289,6 +289,8 @@ public void testGetDesignPlanFromXML() throws IOException { File testFile = new File("src/test/resources/mexico/mexicohelper_designplan.xml"); + testFile = testFile.getAbsoluteFile(); // for maven + // topia context can be null in tests DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, null); List<Factor> factors = plan.getFactors(); @@ -326,6 +328,8 @@ // export File testFile = new File("src/test/resources/mexico/mexicohelper_designplan.xml"); + testFile = testFile.getAbsoluteFile(); // for maven + // topia context can be null in tests DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, regionContext); String xml2 = MexicoHelper.getDesignPlanAsXML(plan); @@ -389,6 +393,8 @@ // export File testFile = new File("src/test/resources/mexico/mexicohelper_factorgroupdp.xml"); + testFile = testFile.getAbsoluteFile(); // for maven + // topia context can be null in tests TopiaContext context = regionContext.beginTransaction(); DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, context); @@ -549,6 +555,8 @@ // export File testFile = new File("src/test/resources/mexico/mexicohelper_designplanV2.xml"); + testFile = testFile.getAbsoluteFile(); // for maven + // topia context can be null in tests DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, regionContext); String xml2 = MexicoHelper.getDesignPlanAsXML(plan, "date", date.toString()); @@ -639,6 +647,8 @@ // export File testFile = new File("src/test/resources/mexico/mexicohelper_designplanV3.xml"); + testFile = testFile.getAbsoluteFile(); // for maven + // topia context can be null in tests DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, context); String xml2 = MexicoHelper.getDesignPlanAsXML(plan, "date", date.toString()); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-27 09:33:13 UTC (rev 3853) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-27 10:36:14 UTC (rev 3854) @@ -256,6 +256,8 @@ /** * Test de génération des scenarios via la methode DOptimal. * + * This method accept discretes factors. + * * @throws IsisFishException * @throws SensitivityException */ @@ -272,6 +274,11 @@ Assert.assertTrue(value >= 0.0 && value <= 2.0); } } + + // test discretes + designPlan = getDesignPlan(getDiscreteIntFactor(), getDiscreteIntFactor()); + scenarii = script.compute(designPlan, simulationsDir); + displayScenarios(scenarii); } /** @@ -394,6 +401,8 @@ /** * Test de génération des scenarios via la methode RegularExpandGrid. * + * This method accept discretes factors. + * * @throws IsisFishException * @throws SensitivityException */ @@ -410,7 +419,11 @@ Assert.assertTrue(value >= 0.0 && value <= 2.0); } } - + + // test discretes + designPlan = getDesignPlan(getDiscreteIntFactor(), getDiscreteIntFactor()); + scenarii = script.compute(designPlan, simulationsDir); + displayScenarios(scenarii); } /** @@ -425,17 +438,17 @@ // this script need pathToFunction parameter to find R script in current directory SensitivityAnalysisStorage.setParameterValue(script,"pathToFunction", IsisFish.config.getDatabaseDirectory().getAbsolutePath() + File.separator + "sensitivityanalysis"); - Assert.assertNotNull("RegularFractions script not found in test data", script); + // test continuous DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); displayScenarios(scenarii); - + } /** - * Test de génération des scenarios via la methode RegularExpandGrid. + * Test de génération des scenarios via la methode Sobol. * * @throws IsisFishException * @throws SensitivityException