Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3e46bd01 by Tony CHEMIT at 2018-03-10T16:43:09Z use t3-data 1.4 at last + still improving tests - - - - - 9 changed files: - pom.xml - t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java - t3-actions/src/test/resources/log4j.properties - t3-domain/src/main/java/fr/ird/t3/test/T3PostgresqlDatabase.java - t3-domain/src/test/resources/log4j.properties - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/resources/log4j.properties - t3-installer/src/main/resources/log4j.properties Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ <projectId>ird-t3</projectId> <stageId>frirdt3</stageId> <applicationName>t3</applicationName> - <t3-data.version>1.4-SNAPSHOT</t3-data.version> + <t3-data.version>1.4</t3-data.version> <env>dev</env> <skipITs>true</skipITs> ===================================== t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java +++ b/t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java @@ -174,6 +174,7 @@ public class FakeT3ServiceContext implements TestRule, T3ServiceContext, Closeab public void evaluate() throws Throwable { try { starting(description); + initOk=true; } catch (Exception e) { Assume.assumeNoException("Can't start test: " + e.getMessage(), e); } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java @@ -192,12 +192,13 @@ public class FakeT3AvdthServiceContext implements TestRule, T3ServiceContext, Cl } } rootContext = T3TopiaApplicationContextBuilder.forH2Referential(testDir.toPath(), injectReferential ? t3DataVersion : null).build(); + initOk=true; } @Override public void close() { - if (transaction != null) { - transaction.close(); + if (rootContext != null && rootContext.isOpened()) { + rootContext.close(); } } ===================================== t3-actions/src/test/resources/log4j.properties ===================================== --- a/t3-actions/src/test/resources/log4j.properties +++ b/t3-actions/src/test/resources/log4j.properties @@ -26,5 +26,11 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ird.t3=INFO log4j.logger.fr.ird.t3.actions=DEBUG +log4j.logger.fr.ird.t3=INFO +log4j.logger.org.nuiton.topia=INFO +log4j.logger.org.hibernate=WARN +log4j.logger.org.hibernate.orm.deprecation=ERROR +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR +log4j.logger.org.nuiton.topia.migration=INFO ===================================== t3-domain/src/main/java/fr/ird/t3/test/T3PostgresqlDatabase.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/test/T3PostgresqlDatabase.java +++ b/t3-domain/src/main/java/fr/ird/t3/test/T3PostgresqlDatabase.java @@ -51,7 +51,7 @@ public class T3PostgresqlDatabase implements TestRule { try { topiaApplicationContext = T3TopiaApplicationContextBuilder.forPgTest().checkConnexion().build(); } catch (Exception e) { - Assume.assumeTrue("Skip test " + description + ", could not connect to database", true); + Assume.assumeNoException("Skip test " + description + ", could not connect to database", e); } return new Statement() { @Override ===================================== t3-domain/src/test/resources/log4j.properties ===================================== --- a/t3-domain/src/test/resources/log4j.properties +++ b/t3-domain/src/test/resources/log4j.properties @@ -27,4 +27,9 @@ log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] # package level log4j.logger.fr.ird.t3=INFO +log4j.logger.org.nuiton.topia=INFO +log4j.logger.org.hibernate=WARN +log4j.logger.org.hibernate.orm.deprecation=ERROR +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR log4j.logger.org.nuiton.topia.migration=INFO ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java @@ -33,7 +33,7 @@ import org.junit.Test; * * @author Tony Chemit - dev@tchemit.fr */ -//@Ignore +@Ignore public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSupport { @Override ===================================== t3-input-avdthv35/src/test/resources/log4j.properties ===================================== --- a/t3-input-avdthv35/src/test/resources/log4j.properties +++ b/t3-input-avdthv35/src/test/resources/log4j.properties @@ -27,11 +27,8 @@ log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] # package level log4j.logger.fr.ird.t3=INFO -#log4j.logger.fr.ird.t3.actions=DEBUG -#log4j.logger.fr.ird.t3.entities.T3EntityHelper=DEBUG -#log4j.logger.RemoveProxyEntityVisitor=DEBUG -#log4j.logger.T3DataEntityVisitor=DEBUG - -#log4j.logger.org.nuiton.topia.persistence.util=INFO -#log4j.logger.org.nuiton.util=INFO -#log4j.logger.org.nuiton.topia.persistence.util.Collector=DEBUG +log4j.logger.org.nuiton.topia=INFO +log4j.logger.org.hibernate=WARN +log4j.logger.org.hibernate.orm.deprecation=ERROR +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR \ No newline at end of file ===================================== t3-installer/src/main/resources/log4j.properties ===================================== --- a/t3-installer/src/main/resources/log4j.properties +++ b/t3-installer/src/main/resources/log4j.properties @@ -34,7 +34,10 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%c:%L) %M - %m%n # levels - +log4j.logger.fr.ird.t3=INFO +log4j.logger.org.nuiton.topia=INFO log4j.logger.org.hibernate=WARN log4j.logger.org.hibernate.orm.deprecation=ERROR log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR +log4j.logger.org.nuiton.topia.migration=INFO View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3e46bd0161e31456cf5f8c5fd57643422... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3e46bd0161e31456cf5f8c5fd57643422... You're receiving this email because of your account on gitlab.com.