This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 18717f0908d797e50d855b50938a78f465b8a7bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 29 21:48:48 2015 +0100 Ajout d'une base vide pour les tests --- .../observe/services/service/MigrateTestsDatabases.java | 14 ++++++++++---- .../src/main/java/fr/ird/observe/test/DatabaseName.java | 1 + .../src/main/resources/db/5.0-3/empty.sql.gz | Bin 0 -> 7858 bytes 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java index c67b4d5..1080b96 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java @@ -34,22 +34,28 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @DatabaseNameConfiguration(DatabaseName.referentiel) @Test public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { - migrateReferentielDb(TO_VERSION); + migrate(TO_VERSION); } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { - migrateReferentielDb(TO_VERSION); + migrate(TO_VERSION); } @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @Test public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { - migrateReferentielDb(TO_VERSION); + migrate(TO_VERSION); } - protected void migrateReferentielDb(String toVersion) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + @DatabaseNameConfiguration(DatabaseName.empty) + @Test + public void migrateEmptyDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + migrate(TO_VERSION); + } + + protected void migrate(String toVersion) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { String dbName = dataSourceResource.getDbName(); File databasesRootDirectory = dataSourceResource.getDataSourceConfiguration().getDatabaseFile(); diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java b/observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java index 289e554..338aaac 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java @@ -6,6 +6,7 @@ package fr.ird.observe.test; * @author Tony Chemit - chemit@codelutin.com */ public enum DatabaseName { + empty, referentiel, dataForTestLongline, dataSourceTest, dataForTestSeine diff --git a/observe-test-data/src/main/resources/db/5.0-3/empty.sql.gz b/observe-test-data/src/main/resources/db/5.0-3/empty.sql.gz new file mode 100644 index 0000000..6e0d66c Binary files /dev/null and b/observe-test-data/src/main/resources/db/5.0-3/empty.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.