Author: chatellier Date: 2009-06-15 08:11:27 +0000 (Mon, 15 Jun 2009) New Revision: 2377 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Do test in java.io.tmpdir ! (modified by surefire). Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/pom.xml 2009-06-15 08:11:27 UTC (rev 2377) @@ -520,9 +520,19 @@ </archive> </configuration> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> </plugins> </pluginManagement> - </build> <reporting> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -44,28 +44,22 @@ */ public abstract class AbstractIsisFishTest { - protected static File basedir; - - protected static File targetdir; - protected static File dirDatabase; - protected static File getBasedir() { - if (basedir == null) { - String base = System.getProperty("basedir"); - if (base == null || base.isEmpty()) { - base = new File("").getAbsolutePath(); - } - basedir = new File(base); - } - return basedir; - } + /** + * Return specific temp dir. + * + * @return system temp dir + */ + public static File getTestDirectory() { + String tempdir = System.getProperty("java.io.tmpdir"); - protected static File getTargetdir() { - if (targetdir == null) { - targetdir = new File(getBasedir(), "target"); + File tempdirfile = new File(tempdir); + if (!tempdirfile.exists()) { + tempdirfile.mkdirs(); } - return targetdir; + + return tempdirfile; } /** @@ -79,7 +73,7 @@ @BeforeClass public static void init() throws Exception { - File mavenTestDir = new File(getTargetdir() + File.separator + "surefire-workdir"); + File mavenTestDir = getTestDirectory(); dirDatabase = FileUtil.createTempDirectory("isisdbtest", "", mavenTestDir); System.setProperty("user.home", dirDatabase.getAbsolutePath()); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -62,7 +62,7 @@ Level hibernateLogLevel = hibernatelog.getLevel(); - String loggerFile = new File(getTargetdir(), SimulationLoggerUtilTest.class.getSimpleName() + "_" + System.nanoTime() + ".log").getAbsolutePath(); + String loggerFile = new File(getTestDirectory(), SimulationLoggerUtilTest.class.getSimpleName() + "_" + System.nanoTime() + ".log").getAbsolutePath(); System.out.println(">>>> loggerFile " + loggerFile); // todo do a test for addSimulationAppender too! Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -62,7 +62,7 @@ @Before public void setUp() throws Exception { - testDir = new File(getTargetdir(), "bench_" + System.nanoTime()); + testDir = new File(getTestDirectory(), "bench_" + System.nanoTime()); testDir.mkdirs(); System.out.println("benchdir " + testDir); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -45,7 +45,7 @@ public static File getTestDir() { if (testDir == null) { - testDir = new File(getTargetdir(), "bench_" + System.nanoTime()); + testDir = new File(getTestDirectory(), "bench_" + System.nanoTime()); if (!testDir.mkdirs()) { throw new IllegalStateException("could not create directory " + testDir); } 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-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -153,7 +153,7 @@ if (log.isDebugEnabled()) { xml = xml.replaceAll(">", ">\n"); - FileUtil.writeString(new File(getTargetdir(), + FileUtil.writeString(new File(getTestDirectory(), "mexicohelper_designplan.xml"), xml); log.info("testGetDesignPlanAsXML xml = " + xml); } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -128,7 +128,7 @@ for (String zipName : SIMULATION_ZIP_FILE) { // recuperation du fichier zip de la simulation de test - File zip = new File(getBasedir(), zipName); + File zip = new File(getTestDirectory(), zipName); // import de cette simulation String name = "simulation-test-" + System.currentTimeMillis(); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -96,7 +96,7 @@ */ @Test public void testCompile() throws IOException, ClassNotFoundException { - File f = File.createTempFile("testCompile", ".java", getTargetdir()); + File f = File.createTempFile("testCompile", ".java", getTestDirectory()); String filename = FileUtil.basename(f, ".java"); String code = getFirstClassContent(filename); FileUtil.writeString(f, code); @@ -129,12 +129,12 @@ @Test public void testCompileDepend() throws IOException, ClassNotFoundException { - File fA = File.createTempFile("testCompileA", ".java", getTargetdir()); + File fA = File.createTempFile("testCompileA", ".java", getTestDirectory()); String filenameA = FileUtil.basename(fA, ".java"); String codeA = getFirstClassContent(filenameA); FileUtil.writeString(fA, codeA); - File fB = File.createTempFile("testCompileB", ".java", getTargetdir()); + File fB = File.createTempFile("testCompileB", ".java", getTestDirectory()); String filenameB = FileUtil.basename(fB, ".java"); String codeB = getSecondClassContent(filenameB, filenameA); FileUtil.writeString(fB, codeB); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-06-12 17:35:02 UTC (rev 2376) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-06-15 08:11:27 UTC (rev 2377) @@ -64,7 +64,7 @@ /** Class logger */ private static Log log = LogFactory.getLog(VCSSVNTest.class); - public static final File TMPDIR = getTargetdir(); + public static final File TMPDIR = getTestDirectory(); public static final String FILECONTENTTAG = "Version 3.1.0"; public static final String FILECONTENTTRUNK = "Version 3.2.0";