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 dce1d13f4daed99016a4740a7b82bcd27e1629b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 18:15:45 2016 +0100 Utilisation base empty_h2 --- .../replication/ReplicateReferentialsTest.java | 2 +- .../services/service/MigrateTestsDatabases.java | 53 ++++++++++++++-------- .../service/SqlScriptProducerServiceTopiaTest.java | 2 +- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java b/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java index 3a93b7c..c38b3b0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java @@ -21,7 +21,7 @@ public class ReplicateReferentialsTest extends ReplicateTestSupport { TopiaSqlTables tables = dataSourceResource.getTopiaApplicationContext().getReferentialTables(); ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.empty) + = createReplicateTablesRequest(DatabaseName.empty_h2) .setTables(tables) .build(); 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 7299c6b..fdebd1a 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 @@ -3,11 +3,13 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -21,43 +23,57 @@ import java.nio.file.Files; * @author Tony Chemit - chemit@codelutin.com */ @Ignore -@DatabaseVersionConfiguration(MigrateTestsDatabases.FROM_VERSION) +@DatabaseVersionConfiguration(ObserveFixtures.PREVIOUS_DEFAULT_VERSION) public class MigrateTestsDatabases extends AbstractServiceTopiaTest { - /** Logger. */ + /** + * Logger. + */ private static final Log log = LogFactory.getLog(MigrateTestsDatabases.class); - public static final String FROM_VERSION = "4.0.1"; + protected SqlScriptProducerService service; - public static final String TO_VERSION = "4.903"; + @Before + public void setUp() throws Exception { + service = dataSourceResource.newService(SqlScriptProducerService.class); + } @DatabaseNameConfiguration(DatabaseName.referentiel) @Test public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(TO_VERSION); + migrate(service.getDump()); } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(TO_VERSION); + migrate(service.getDump()); } @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @Test public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(TO_VERSION); + migrate(service.getDump()); } - @DatabaseNameConfiguration(DatabaseName.empty) + @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test - public void migrateEmptyDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(TO_VERSION); + public void migrateEmptyH2Db() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + migrate(service.getH2Schema()); } - protected void migrate(String toVersion) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + @DatabaseNameConfiguration(DatabaseName.empty_h2) + @Test + public void migrateEmptyPgDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + migrate(DatabaseName.empty_pg.name(), service.getPostgresSchema()); + } + + protected void migrate(byte[] dump) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + migrate(dataSourceResource.getDbName(), dump); + } + + protected void migrate(String dbName, byte[] dump) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - String dbName = dataSourceResource.getDbName(); File databasesRootDirectory = dataSourceResource.getDataSourceConfiguration().getDatabaseFile(); while (!"observe".equals(databasesRootDirectory.getName())) { @@ -66,27 +82,24 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { String sqlFilename = dbName + ".sql.gz"; - File f = databasesRootDirectory + File scriptfile = databasesRootDirectory .toPath() .resolve("observe-test-data") .resolve("src") .resolve("main") .resolve("resources") .resolve("db") - .resolve(toVersion) + .resolve(ObserveFixtures.DEFAULT_VERSION) .resolve(sqlFilename) .toFile(); if (log.isInfoEnabled()) { - log.info("Will generate " + dbName + " to " + f); + log.info("Will generate " + dbName + " to " + scriptfile); } - Files.createDirectories(f.toPath().getParent()); - - SqlScriptProducerService service = dataSourceResource.newService(SqlScriptProducerService.class); + Files.createDirectories(scriptfile.toPath().getParent()); - byte[] dump = service.getDump(); - FileUtils.writeByteArrayToFile(f, dump); + FileUtils.writeByteArrayToFile(scriptfile, dump); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java index 6c81da2..90b5976 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java @@ -29,7 +29,7 @@ public class SqlScriptProducerServiceTopiaTest extends AbstractServiceTopiaTest service = dataSourceResource.newService(SqlScriptProducerService.class); } - @DatabaseNameConfiguration(DatabaseName.empty) + @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test public void testProduceSchema() throws Exception { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.