Author: echatellier Date: 2014-06-02 09:06:01 +0200 (Mon, 02 Jun 2014) New Revision: 3993 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3993 Log: fix tests Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2014-06-02 06:52:35 UTC (rev 3992) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2014-06-02 07:06:01 UTC (rev 3993) @@ -85,7 +85,7 @@ Assert.assertTrue("String \"" + simulationResultZip + "\" not found in template", content.indexOf(simulationResultZip) > 0); Assert.assertTrue("String \"" + simulationPreScript + "\" not found in template", content.indexOf(simulationPreScript) > 0); Assert.assertTrue("Action --simulateRemotellyWithPreScript not on script", content.indexOf(" --simulateRemotellyWithPreScript ") > 0); - Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk64/bin/java") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk7/bin/java") > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-06-02 06:52:35 UTC (rev 3992) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-06-02 07:06:01 UTC (rev 3993) @@ -197,7 +197,9 @@ */ @After public void clear() throws IOException { - FileUtils.deleteDirectory(simulationsDir); + if (simulationsDir != null) { + FileUtils.deleteDirectory(simulationsDir); + } } /**