Author: chatellier Date: 2009-04-20 07:45:43 +0000 (Mon, 20 Apr 2009) New Revision: 1429 Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java Log: Do test in target directory. Remove create directory after test. Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-04-19 18:19:50 UTC (rev 1428) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-04-20 07:45:43 UTC (rev 1429) @@ -70,13 +70,15 @@ config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); config.setProperty(Environment.DIALECT,"org.hibernate.dialect.H2Dialect"); config.setProperty(Environment.DRIVER,"org.h2.Driver"); - config.setProperty(Environment.URL, "jdbc:h2:file:/tmp/" + TopiaTestCase.class.getSimpleName() + "/db/data_" + System.currentTimeMillis()); + config.setProperty(Environment.URL, "jdbc:h2:file:target/" + TopiaTestCase.class.getSimpleName() + "/db/data_" + System.currentTimeMillis()); } @AfterClass public static void after() throws TopiaException { // destroy database context.clear(true); + + // TODO directory target/TopiaTestCase is not deleted } /** Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java 2009-04-19 18:19:50 UTC (rev 1428) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java 2009-04-20 07:45:43 UTC (rev 1429) @@ -39,6 +39,7 @@ import org.codelutin.util.FileUtil; import org.hibernate.cfg.Environment; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -67,7 +68,8 @@ @BeforeClass public static void init() throws IOException { - tempDir = FileUtil.createTempDirectory("h2", "-exportxml"); + File tmpDirectory = new File("target"); + tempDir = FileUtil.createTempDirectory("h2", "-exportxml", tmpDirectory); // init dburl String dburl = "file:" + tempDir.getAbsolutePath() + File.separator + "data"; @@ -84,6 +86,14 @@ config.setProperty(Environment.DRIVER,"org.h2.Driver"); config.setProperty(Environment.URL,"jdbc:h2:" + dburl); } + + /** + * Remove temp directory + */ + @AfterClass + public static void clear() { + FileUtil.deleteRecursively(tempDir); + } /** * Prepare test.