Author: tchemit Date: 2012-09-11 17:54:12 +0200 (Tue, 11 Sep 2012) New Revision: 647 Url: http://forge.codelutin.com/repositories/revision/echobase/647 Log: add csv files to svn (no more private stuff) Added: trunk/echobase-tools/src/test/baracouda.mdb Modified: trunk/echobase-tools/pom.xml 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/TestHelper.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-09-11 14:51:24 UTC (rev 646) +++ trunk/echobase-tools/pom.xml 2012-09-11 15:54:12 UTC (rev 647) @@ -21,19 +21,40 @@ <description>EchoBase tools module</description> <properties> + + <csvVersion>2012-04-12</csvVersion> <redmine.releaseFiles> - ${basedir}/target/echobase-legacyData-${project.version}.zip, - ${basedir}/target/echobase-referentiel-${project.version}.zip + ${basedir}/target/echobase-legacyData-${project.version}.echobase, + ${basedir}/target/echobase-referentiel-${project.version}.echobase </redmine.releaseFiles> </properties> <build> + + <testResources> + <testResource> + <directory>src/test/echobase-${csvVersion}</directory> + <includes> + <include>**/*.csv</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </testResource> + </testResources> + <pluginManagement> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>-Xms512m -Xmx1512m</argLine> + <environmentVariables> + <csvVersion>${csvVersion}</csvVersion> + </environmentVariables> </configuration> </plugin> </plugins> @@ -208,32 +229,6 @@ </plugins> </build> </profile> - - <profile> - <activation> - <file> - <exists>src/test/private/echobase-2012-04-12</exists> - </file> - </activation> - <id>echobase-csv-inputs</id> - <build> - <testResources> - <testResource> - <directory>src/test/private/echobase-2012-04-12</directory> - <includes> - <include>**/*.csv</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.*</include> - </includes> - </testResource> - </testResources> - </build> - </profile> - </profiles> </project> Added: trunk/echobase-tools/src/test/baracouda.mdb =================================================================== (Binary files differ) Property changes on: trunk/echobase-tools/src/test/baracouda.mdb ___________________________________________________________________ Added: svn:mime-type + application/octet-stream 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 2012-09-11 14:51:24 UTC (rev 646) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-09-11 15:54:12 UTC (rev 647) @@ -70,14 +70,6 @@ protected EchoBaseConfiguration configuration; - @BeforeClass - public static void beforeClass() { - - // check /csv dir is available in test resources - TestHelper.assertCsvResourceDirectoryExists(); - - } - @Before public void setUp() throws Exception { 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 2012-09-11 14:51:24 UTC (rev 646) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2012-09-11 15:54:12 UTC (rev 647) @@ -80,7 +80,7 @@ File dir = new File(exportdir, "echobase"); - File distributionFile = new File(exportdir, "echobase-legacyData-" + dbVersion + ".zip"); + File distributionFile = new File(exportdir, "echobase-legacyData-" + dbVersion + ".echobase"); Assert.assertFalse(distributionFile.exists()); File sourceDir = TestHelper.getCsvResourceDirectory(); @@ -108,7 +108,7 @@ File dir = new File(exportdir, "echobase"); - File distributionFile = new File(exportdir, "echobase-referentiel-" + dbVersion + ".zip"); + File distributionFile = new File(exportdir, "echobase-referentiel-" + dbVersion + ".echobase"); Assert.assertFalse(distributionFile.exists()); File sourceDir = TestHelper.getCsvResourceDirectory(); 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 2012-09-11 14:51:24 UTC (rev 646) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-09-11 15:54:12 UTC (rev 647) @@ -23,10 +23,8 @@ */ package fr.ifremer.echobase.tools; +import com.google.common.base.Preconditions; 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.util.FileUtil; @@ -45,13 +43,13 @@ protected static File basedir; - /** Logger. */ - private static final Log log = LogFactory.getLog(TestHelper.class); - protected static final long timestamp = System.currentTimeMillis(); - /** La version du jeux de données utilisé. */ - public static final String ECHOBASE_CSV_VERSION = "2012-04-12"; + public static String getCsvVersion() { + String tmp = System.getenv("csvVersion"); + Preconditions.checkNotNull(tmp, "Could not find csvVersion in properties"); + return tmp; + } public static File getBasedir() { if (basedir == null) { @@ -64,20 +62,10 @@ 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-" + ECHOBASE_CSV_VERSION + ".csv"); + basedir, "src.test.echobase-" + getCsvVersion() + ".csv"); return sourceDir; } @@ -91,32 +79,4 @@ FileUtil.createDirectoryIfNecessary(result); return result; } -// -// public static TopiaContext getRootContext(File dbDir) { -// -// JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(dbDir); -// TopiaContext context = EchobaseTopiaContexts.newWorkingDb(persistenceHelper, dbConf); -// return context; -// } - -// /** -// * Used to get all contract of a package -// * -// * @param entitiesPackage package contening desired entities -// * @return contracts contained in entitiesPackage -// */ -// public static EchoBaseEntityEnum[] getContractsOf(Package entitiesPackage) { -// EchoBaseEntityEnum[] echoBaseEntityEnums = EchoBaseEntityEnum.values(); -// List<EchoBaseEntityEnum> refClasses = new ArrayList<EchoBaseEntityEnum>(); -// for (EchoBaseEntityEnum echoBaseEntityEnum : echoBaseEntityEnums) { -// -// // Get all entities in package fr.ifremer.echobase.entities.references -// Class<? extends TopiaEntity> contract = echoBaseEntityEnum.getContract(); -// if (entitiesPackage.equals(contract.getPackage())) { -// refClasses.add(echoBaseEntityEnum); -// } -// } -// return refClasses.toArray(new EchoBaseEntityEnum[refClasses.size()]); -// } - } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java 2012-09-11 14:51:24 UTC (rev 646) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java 2012-09-11 15:54:12 UTC (rev 647) @@ -87,8 +87,6 @@ @BeforeClass public static void beforeClass() { - AbstractToolTest.beforeClass(); - msAccessFile = FileUtil.getFileFromPaths(TestHelper.getBasedir(), "src", "test",