Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3

Commits:

8 changed files:

Changes:

  • pom.xml
    ... ... @@ -99,7 +99,7 @@
    99 99 
         <projectId>ird-t3</projectId>
    100 100 
         <stageId>frirdt3</stageId>
    101 101 
         <applicationName>t3</applicationName>
    102 
    -    <t3-data.version>1.4-SNAPSHOT</t3-data.version>
    102 
    +    <t3-data.version>1.4</t3-data.version>
    103 103
    104 104 
         <env>dev</env>
    105 105 
         <skipITs>true</skipITs>

  • t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java
    ... ... @@ -174,6 +174,7 @@ public class FakeT3ServiceContext implements TestRule, T3ServiceContext, Closeab
    174 174 
                 public void evaluate() throws Throwable {
    175 175 
                     try {
    176 176 
                         starting(description);
    177 
    +                    initOk=true;
    177 178 
                     } catch (Exception e) {
    178 179 
                         Assume.assumeNoException("Can't start test: " + e.getMessage(), e);
    179 180 
                     }

  • 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
    192 192 
                 }
    193 193 
             }
    194 194 
             rootContext = T3TopiaApplicationContextBuilder.forH2Referential(testDir.toPath(), injectReferential ? t3DataVersion : null).build();
    195 
    +        initOk=true;
    195 196 
         }
    196 197
    197 198 
         @Override
    198 199 
         public void close() {
    199 
    -        if (transaction != null) {
    200 
    -            transaction.close();
    200 
    +        if (rootContext != null && rootContext.isOpened()) {
    201 
    +            rootContext.close();
    201 202 
             }
    202 203 
         }
    203 204

  • t3-actions/src/test/resources/log4j.properties
    ... ... @@ -26,5 +26,11 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
    26 26 
     log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%F:%L) %M - %m%n
    27 27
    28 28 
     # package level
    29 
    -log4j.logger.fr.ird.t3=INFO
    30 29 
     log4j.logger.fr.ird.t3.actions=DEBUG
    30 
    +log4j.logger.fr.ird.t3=INFO
    31 
    +log4j.logger.org.nuiton.topia=INFO
    32 
    +log4j.logger.org.hibernate=WARN
    33 
    +log4j.logger.org.hibernate.orm.deprecation=ERROR
    34 
    +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR
    35 
    +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR
    36 
    +log4j.logger.org.nuiton.topia.migration=INFO

  • 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]
    27 27
    28 28 
     # package level
    29 29 
     log4j.logger.fr.ird.t3=INFO
    30 
    +log4j.logger.org.nuiton.topia=INFO
    31 
    +log4j.logger.org.hibernate=WARN
    32 
    +log4j.logger.org.hibernate.orm.deprecation=ERROR
    33 
    +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR
    34 
    +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR
    30 35 
     log4j.logger.org.nuiton.topia.migration=INFO

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java
    ... ... @@ -33,7 +33,7 @@ import org.junit.Test;
    33 33 
      *
    34 34 
      * @author Tony Chemit - dev@tchemit.fr
    35 35 
      */
    36 
    -//@Ignore
    36 
    +@Ignore
    37 37 
     public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSupport {
    38 38
    39 39 
         @Override

  • 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]
    27 27
    28 28 
     # package level
    29 29 
     log4j.logger.fr.ird.t3=INFO
    30 
    -#log4j.logger.fr.ird.t3.actions=DEBUG
    31 
    -#log4j.logger.fr.ird.t3.entities.T3EntityHelper=DEBUG
    32 
    -#log4j.logger.RemoveProxyEntityVisitor=DEBUG
    33 
    -#log4j.logger.T3DataEntityVisitor=DEBUG
    34 
    -
    35 
    -#log4j.logger.org.nuiton.topia.persistence.util=INFO
    36 
    -#log4j.logger.org.nuiton.util=INFO
    37 
    -#log4j.logger.org.nuiton.topia.persistence.util.Collector=DEBUG
    30 
    +log4j.logger.org.nuiton.topia=INFO
    31 
    +log4j.logger.org.hibernate=WARN
    32 
    +log4j.logger.org.hibernate.orm.deprecation=ERROR
    33 
    +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR
    34 
    +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR
    \ No newline at end of file

  • t3-installer/src/main/resources/log4j.properties
    ... ... @@ -34,7 +34,10 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
    34 34 
     log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%c:%L) %M - %m%n
    35 35
    36 36 
     # levels
    37 
    -
    37 
    +log4j.logger.fr.ird.t3=INFO
    38 
    +log4j.logger.org.nuiton.topia=INFO
    38 39 
     log4j.logger.org.hibernate=WARN
    39 40 
     log4j.logger.org.hibernate.orm.deprecation=ERROR
    40 41 
     log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR
    42 
    +log4j.logger.org.nuiton.topia.persistence.internal.HibernateProvider=ERROR
    43 
    +log4j.logger.org.nuiton.topia.migration=INFO

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.