This is an automated email from the git hooks/post-receive script. New commit to branch master in repository topia-sample-project. See https://gitlab.nuiton.org/nuiton/topia-sample-project.git commit d4471b112fe59fcee9e2f680053e049187a97db8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Oct 23 10:44:44 2017 +0200 Update dependencies, using ToPIA 3.3.1 --- pom.xml | 12 ++++-------- src/test/java/com/company/SampleTest.java | 32 +++++++++++-------------------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 5f95d4b..2d5cab0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,8 @@ <url>http://maven.apache.org</url> <properties> - <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-beta-17</topiaVersion> + <eugeneVersion>3.0-alpha-10</eugeneVersion> + <topiaVersion>3.3.1-SNAPSHOT</topiaVersion> </properties> <dependencies> @@ -23,14 +23,14 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.176</version> + <version>1.4.196</version> <scope>runtime</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - <version>4.11</version> + <version>4.12</version> </dependency> </dependencies> @@ -42,7 +42,6 @@ <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> </configuration> <executions> <execution> @@ -54,9 +53,6 @@ <!-- DefaultPackage used for Model classes generation (XxxEntityEnum, XxxTopiaXyz classes, ...) --> <defaultPackage>com.company.app</defaultPackage> <templates> - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.eugene.java.JavaEnumerationTransformer, org.nuiton.topia.templates.TopiaMetaTransformer </templates> </configuration> diff --git a/src/test/java/com/company/SampleTest.java b/src/test/java/com/company/SampleTest.java index 23d3631..ebc18a8 100644 --- a/src/test/java/com/company/SampleTest.java +++ b/src/test/java/com/company/SampleTest.java @@ -11,10 +11,8 @@ import com.company.app.entities.BookTopiaDao; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfigurationBuilder; @@ -25,32 +23,23 @@ import java.util.Map; public class SampleTest { - protected static MyLibraryTopiaApplicationContext applicationContext; + private MyLibraryTopiaApplicationContext applicationContext; - protected MyLibraryTopiaPersistenceContext persistenceContext; + private MyLibraryTopiaPersistenceContext persistenceContext; - protected AuthorTopiaDao authorDao; + private AuthorTopiaDao authorDao; - protected BookTopiaDao bookDao; + private BookTopiaDao bookDao; - @BeforeClass - public static void createApplicationContext() { + @Before + public void createPersistenceContextAndDaos() { TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); TopiaConfiguration topiaConfiguration = topiaConfigurationBuilder - . forH2DatabaseInTempDirectory() - . onlyCreateSchemaIfDatabaseIsEmpty() - . doNotValidateSchemaOnStartup() - . build(); + .forH2DatabaseInTempDirectory() + .onlyCreateSchemaIfDatabaseIsEmpty() + .doNotValidateSchemaOnStartup() + .build(); applicationContext = new MyLibraryTopiaApplicationContext(topiaConfiguration); - } - - @AfterClass - public static void closeApplicationContext() { - applicationContext.close(); - } - - @Before - public void createPersistenceContextAndDaos() { persistenceContext = applicationContext.newPersistenceContext(); authorDao = persistenceContext.getAuthorDao(); bookDao = persistenceContext.getBookDao(); @@ -59,6 +48,7 @@ public class SampleTest { @After public void closePersistenceContext() { persistenceContext.close(); + applicationContext.close(); } @Test -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.