r178 - in trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools: . loaders
Author: tchemit Date: 2011-12-13 16:49:27 +0100 (Tue, 13 Dec 2011) New Revision: 178 Url: http://forge.codelutin.com/repositories/revision/echobase/178 Log: make test works or not if src/test/private/csv does or not exist Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2011-12-13 15:49:27 UTC (rev 178) @@ -76,6 +76,10 @@ @BeforeClass public static void beforeClass() { + + // check /csv dir is available in test resources + TestHelper.assertCsvResourceDirectoryExists(); + configuration = new EchoBaseConfiguration("echobase-test.properties"); } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2011-12-13 15:49:27 UTC (rev 178) @@ -55,11 +55,12 @@ File distributionFile = new File(exportdir, "echobase.zip"); Assert.assertFalse(distributionFile.exists()); - File basedir = TestHelper.getBasedir(); - File sourceDir = FileUtil.getFileFromFQN(basedir, "src.main.resources.csv"); + File sourceDir = TestHelper.getCsvResourceDirectory(); + new EchoBaseDbCreator().createEchoBaseDb(sourceDir, dir, distributionFile); Assert.assertTrue(distributionFile.exists()); } + } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java 2011-12-13 15:49:27 UTC (rev 178) @@ -51,12 +51,11 @@ @Test public void exportMSAccessToCsv() throws Exception { - msAccessFile = FileUtil.getFileFromPaths(TestHelper.getBasedir(), - "src", - "test", - "private", - "baracouda.mdb" - ); + File privateDir = FileUtil.getFileFromFQN(TestHelper.getBasedir(), + "src.test.private"); + + msAccessFile = new File(privateDir, "baracouda.mdb"); + if (!msAccessFile.exists()) { if (log.isWarnEnabled()) { log.warn("Could not find " + msAccessFile + Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2011-12-13 15:49:27 UTC (rev 178) @@ -27,6 +27,9 @@ import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; import org.junit.Ignore; import org.junit.rules.TestName; import org.nuiton.topia.TopiaContext; @@ -49,6 +52,9 @@ protected static File basedir; + /** Logger. */ + private static final Log log = LogFactory.getLog(TestHelper.class); + protected static final long timestamp = System.currentTimeMillis(); public static File getBasedir() { @@ -62,6 +68,22 @@ return basedir; } + public static void assertCsvResourceDirectoryExists() { + File sourceDir = getCsvResourceDirectory(); + if (!sourceDir.exists()) { + if (log.isWarnEnabled()) { + log.warn("Could not find " + sourceDir + ", will skip some tests..."); + } + } + Assume.assumeTrue(sourceDir.exists()); + } + + public static File getCsvResourceDirectory() { + File basedir = getBasedir(); + File sourceDir = FileUtil.getFileFromFQN(basedir, "src.test.private.echobase.csv"); + return sourceDir; + } + public static File getTestBasedir(Class<?> testClass) { File result = new File(FileUtils.getTempDirectory(), testClass.getName() + "_" + timestamp); return result; Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java 2011-12-13 15:49:27 UTC (rev 178) @@ -53,15 +53,19 @@ generateBaracoudaEntities(); } + Set<MetaFilenameAware> dones; + @Override protected void loadDependencies(Set<MetaFilenameAware> dones) throws IOException, TopiaException { super.loadDependencies(dones); - loadDependencies(EchoBaseEntityEnum.Voyage, dones); + this.dones = dones; } @Test public void testGenerateEchotypeAssociation() throws Exception { + loadDependencies(EchoBaseEntityEnum.Voyage, dones); + AssociationMeta associationMeta = loader.getMeta().getAssociations(Voyage.PROPERTY_ECHOTYPE);
participants (1)
-
tchemit@users.forge.codelutin.com