Author: tchemit Date: 2012-03-29 12:29:50 +0200 (Thu, 29 Mar 2012) New Revision: 441 Url: http://forge.codelutin.com/repositories/revision/echobase/441 Log: add at release time default datas to import in a new EchoBase application Modified: trunk/echobase-tools/pom.xml trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-03-29 10:14:49 UTC (rev 440) +++ trunk/echobase-tools/pom.xml 2012-03-29 10:29:50 UTC (rev 441) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -124,6 +126,12 @@ </dependencies> + <properties> + <redmine.releaseFiles> + ${basedir}/target/echobase-legacyDatas-${project.version}.zip + ${basedir}/target/echobase-referentiel-${project.version}.zip + </redmine.releaseFiles> + </properties> <build> <pluginManagement> <plugins> @@ -177,13 +185,22 @@ <profile> <id>db-to-zip</id> - + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> <build> <defaultGoal>test</defaultGoal> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <environmentVariables> + <dbVersion>${project.version}</dbVersion> + <dbDestination>${basedir}/target</dbDestination> + </environmentVariables> <includes> <include>**/*EchoBaseDbZipCreatorIT.java</include> </includes> 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-03-29 10:14:49 UTC (rev 440) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2012-03-29 10:29:50 UTC (rev 441) @@ -23,11 +23,14 @@ */ package fr.ifremer.echobase.tools; +import org.apache.commons.io.FileUtils; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.FileUtil; import java.io.File; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; @@ -44,6 +47,20 @@ static final String date = new SimpleDateFormat("dd-MM-yyyy").format(new Date()); + static File dbDesFile; + + static String dbVersion; + + @BeforeClass + public static void beforeTest() throws IOException { + + String dbDestination = System.getenv("dbDestination"); + + dbVersion = System.getenv("dbVersion"); + dbDesFile = new File(dbDestination); + FileUtil.createDirectoryIfNecessary(dbDesFile); + } + @Test public void createEchoBaseLegacyDataDb() throws Exception { @@ -57,7 +74,7 @@ File dir = new File(exportdir, "echobase"); - File distributionFile = new File(exportdir, "echobase-legacyDatas-" + date + ".zip"); + File distributionFile = new File(exportdir, "echobase-legacyDatas-" + dbVersion + ".zip"); Assert.assertFalse(distributionFile.exists()); File sourceDir = TestHelper.getCsvResourceDirectory(); @@ -65,6 +82,8 @@ new EchoBaseDbCreator().createEchoBaseLegacyDataDb(sourceDir, dir, distributionFile); Assert.assertTrue(distributionFile.exists()); + + FileUtils.copyFileToDirectory(distributionFile, dbDesFile); } @Test @@ -80,7 +99,7 @@ File dir = new File(exportdir, "echobase"); - File distributionFile = new File(exportdir, "echobase-referentiel-" + date + ".zip"); + File distributionFile = new File(exportdir, "echobase-referentiel-" + dbVersion + ".zip"); Assert.assertFalse(distributionFile.exists()); File sourceDir = TestHelper.getCsvResourceDirectory(); @@ -88,6 +107,9 @@ new EchoBaseDbCreator().createEchoBaseReferentielDb(sourceDir, dir, distributionFile); Assert.assertTrue(distributionFile.exists()); + + FileUtils.copyFileToDirectory(distributionFile, dbDesFile); + }