Author: echatellier Date: 2011-11-07 16:02:50 +0100 (Mon, 07 Nov 2011) New Revision: 3521 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3521 Log: #471 : Some tests fails during perform Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-11-07 15:01:17 UTC (rev 3520) +++ trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-11-07 15:02:50 UTC (rev 3521) @@ -29,9 +29,11 @@ import java.io.FileFilter; import org.apache.commons.io.FileUtils; -import org.nuiton.util.FileUtil; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import freemarker.cache.ClassTemplateLoader; @@ -43,7 +45,7 @@ * * Contains BeforeClass and AfterClass method to proper init cases. * - * Each test is done in a isolated isis-database-3 directory, and user.home + * Each test is done in a isolated isis-database directory, and user.home * is set to this directory. * * @author chatellier @@ -74,7 +76,7 @@ /** * Toujours appeler cette method pour les test d'isis. - * (sinon,il ira ecrire dans le isis-database-3 officiel). + * (sinon, il ira ecrire dans le isis-database officiel). * * Create a temp dir and init isis with that temp dir as database. * @@ -90,7 +92,6 @@ System.setProperty(IsisConfig.Option.LAUNCH_UI.key, "false"); System.setProperty(IsisConfig.Option.DATABASE_DIRECTORY.key, dirDatabase.getAbsolutePath()); System.setProperty(IsisConfig.Option.SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_dsa"); - //System.setProperty(IsisConfig.Option.VCS_SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_rsa"); IsisFish.init(); IsisFish.initVCS(); @@ -112,6 +113,16 @@ } }); } + + /** + * Some tests modify configuration, reset it before all tests. + * @throws ArgumentsParserException + */ + @Before + public void resetConfig() throws ArgumentsParserException { + IsisFish.config = new IsisConfig(); + IsisFish.config.parse(); + } /** * Return current database directory.