Repository: polygene-java
Updated Branches:
  refs/heads/Migrate_Junit5 6ae17138f -> 7585af083


Annotations are not inherited in overridden methods in JUnit 5, so @BeforeEach 
needed in all subclasses


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/346a8521
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/346a8521
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/346a8521

Branch: refs/heads/Migrate_Junit5
Commit: 346a8521cf36a8553ff4afe19a980a8c0278f100
Parents: 6ae1713
Author: niclas <nic...@hedhman.org>
Authored: Mon Apr 16 10:06:43 2018 +0800
Committer: niclas <nic...@hedhman.org>
Committed: Mon Apr 16 10:06:43 2018 +0800

----------------------------------------------------------------------
 .../entity/EntityCompositeEqualityTest.java     |  2 +-
 .../query/QueryBuilderFactoryImplTest.java      |  1 +
 .../runtime/value/AssociationToValueTest.java   |  2 +
 .../polygene/test/AbstractPolygeneTest.java     |  4 +-
 .../test/cache/AbstractCachePoolTest.java       |  2 +
 .../test/indexing/AbstractAnyQueryTest.java     |  2 +
 .../test/indexing/AbstractEntityFinderTest.java |  2 +-
 extensions/cache-memcache/build.gradle          |  1 +
 .../cache/memcache/MemcacheCachePoolTest.java   | 25 ++++++++++--
 .../cassandra/CassandraEntityStoreTest.java     |  2 +
 .../mongodb/MongoDBEntityStoreTest.java         |  2 +
 .../MongoDBEntityStoreWithCacheTest.java        |  2 +
 .../entitystore/redis/RedisEntityStoreTest.java |  2 +
 .../redis/RedisEntityStoreWithCacheTest.java    |  2 +
 .../entitystore/riak/RiakEntityStoreTest.java   |  5 ++-
 .../riak/RiakEntityStoreWithCacheTest.java      |  5 ++-
 extensions/entitystore-sql/build.gradle         |  4 +-
 .../sql/PostgreSQLEntityStoreTest.java          | 43 ++++++++++++--------
 .../withPropagationMandatory/IssueTest.java     |  3 +-
 .../qi64/withPropagationRequired/IssueTest.java |  3 +-
 .../withPropagationRequiresNew/IssueTest.java   |  3 +-
 .../postgresql/PostgreSQLComplexQueryTest.java  |  2 +
 .../postgresql/PostgreSQLDBIntegrityTest.java   |  2 +
 .../postgresql/PostgreSQLEntityFinderTest.java  |  2 +
 .../sql/postgresql/PostgreSQLQueryTest.java     |  2 +
 .../library/alarm/AlarmHistoryImplTest.java     |  2 +
 .../library/alarm/AlarmPointImplTest.java       |  3 ++
 .../library/alarm/AlarmServiceTest.java         |  2 +
 .../library/alarm/ExtendedAlarmModelTest.java   |  2 +
 .../library/alarm/SimpleAlarmModelTest.java     |  2 +
 .../library/alarm/StandardAlarmModelTest.java   |  2 +
 .../rdf/entity/EntitySerializerTest.java        |  4 +-
 .../rdf/entity/EntityTypeSerializerTest.java    |  4 +-
 .../tutorials/cargo/step2/Step2TestCase.java    |  2 +
 34 files changed, 114 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityCompositeEqualityTest.java
----------------------------------------------------------------------
diff --git 
a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityCompositeEqualityTest.java
 
b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityCompositeEqualityTest.java
index 428c994..8eda987 100644
--- 
a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityCompositeEqualityTest.java
+++ 
b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityCompositeEqualityTest.java
@@ -44,8 +44,8 @@ public class EntityCompositeEqualityTest
     private UnitOfWork unitOfWork;
     private EntityBuilder<MyComposite> myCompositeBuilder;
 
-    @BeforeEach
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/runtime/src/test/java/org/apache/polygene/runtime/query/QueryBuilderFactoryImplTest.java
----------------------------------------------------------------------
diff --git 
a/core/runtime/src/test/java/org/apache/polygene/runtime/query/QueryBuilderFactoryImplTest.java
 
b/core/runtime/src/test/java/org/apache/polygene/runtime/query/QueryBuilderFactoryImplTest.java
index 00ca4fa..f27b92d 100644
--- 
a/core/runtime/src/test/java/org/apache/polygene/runtime/query/QueryBuilderFactoryImplTest.java
+++ 
b/core/runtime/src/test/java/org/apache/polygene/runtime/query/QueryBuilderFactoryImplTest.java
@@ -55,6 +55,7 @@ public class QueryBuilderFactoryImplTest
         module.transients( TestComposite.class );
     }
 
+    @Override
     @BeforeEach
     public void setUp()
         throws Exception

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/runtime/src/test/java/org/apache/polygene/runtime/value/AssociationToValueTest.java
----------------------------------------------------------------------
diff --git 
a/core/runtime/src/test/java/org/apache/polygene/runtime/value/AssociationToValueTest.java
 
b/core/runtime/src/test/java/org/apache/polygene/runtime/value/AssociationToValueTest.java
index 3101569..99b5fbf 100644
--- 
a/core/runtime/src/test/java/org/apache/polygene/runtime/value/AssociationToValueTest.java
+++ 
b/core/runtime/src/test/java/org/apache/polygene/runtime/value/AssociationToValueTest.java
@@ -39,6 +39,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -110,6 +111,7 @@ public class AssociationToValueTest extends 
AbstractPolygeneTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java
----------------------------------------------------------------------
diff --git 
a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java
 
b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java
index 4f8e1c2..ded4f4a 100644
--- 
a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java
+++ 
b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java
@@ -64,8 +64,8 @@ public abstract class AbstractPolygeneTest extends 
AbstractPolygeneBaseTest
     @Structure
     protected ModuleDescriptor module;
 
-    @BeforeEach
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {
@@ -87,8 +87,8 @@ public abstract class AbstractPolygeneTest extends 
AbstractPolygeneBaseTest
         assemble( module );
     }
 
-    @AfterEach
     @Override
+    @AfterEach
     public void tearDown()
     {
         if( unitOfWorkFactory != null && 
unitOfWorkFactory.isUnitOfWorkActive() )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
----------------------------------------------------------------------
diff --git 
a/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
 
b/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
index 576163c..4f437a1 100644
--- 
a/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
+++ 
b/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
@@ -26,6 +26,7 @@ import 
org.apache.polygene.api.constraint.ValueConstraintViolation;
 import org.apache.polygene.spi.cache.Cache;
 import org.apache.polygene.spi.cache.CachePool;
 import org.apache.polygene.test.AbstractPolygeneTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -44,6 +45,7 @@ public abstract class AbstractCachePoolTest
     protected Cache<String> cache;
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
----------------------------------------------------------------------
diff --git 
a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
 
b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
index 120772b..ec18b90 100644
--- 
a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
+++ 
b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
@@ -37,6 +37,7 @@ import org.apache.polygene.test.model.Port;
 import org.apache.polygene.test.model.Protocol;
 import org.apache.polygene.test.model.QueryParam;
 import org.apache.polygene.test.model.URL;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Abstract satisfiedBy with tests for any queries against Index/Query engines.
@@ -76,6 +77,7 @@ public class AbstractAnyQueryTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
----------------------------------------------------------------------
diff --git 
a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
 
b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
index 094f96b..c79200a 100644
--- 
a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
+++ 
b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
@@ -90,8 +90,8 @@ public abstract class AbstractEntityFinderTest
 
     private EntityFinder entityFinder;
 
-    @BeforeEach
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/cache-memcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/build.gradle 
b/extensions/cache-memcache/build.gradle
index 8aa67a7..9ddc2b0 100644
--- a/extensions/cache-memcache/build.gradle
+++ b/extensions/cache-memcache/build.gradle
@@ -32,6 +32,7 @@ dependencies {
   runtimeOnly polygene.core.runtime
 
   testImplementation polygene.internals.testsupport
+  testImplementation 'com.github.faustxvi:junit5-docker:1.0.0-RC5'
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/cache-memcache/src/test/java/org/apache/polygene/cache/memcache/MemcacheCachePoolTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/cache-memcache/src/test/java/org/apache/polygene/cache/memcache/MemcacheCachePoolTest.java
 
b/extensions/cache-memcache/src/test/java/org/apache/polygene/cache/memcache/MemcacheCachePoolTest.java
index 0b5b575..13afee6 100644
--- 
a/extensions/cache-memcache/src/test/java/org/apache/polygene/cache/memcache/MemcacheCachePoolTest.java
+++ 
b/extensions/cache-memcache/src/test/java/org/apache/polygene/cache/memcache/MemcacheCachePoolTest.java
@@ -19,6 +19,9 @@
  */
 package org.apache.polygene.cache.memcache;
 
+import com.github.junit5docker.Docker;
+import com.github.junit5docker.Port;
+import com.github.junit5docker.WaitFor;
 import org.apache.polygene.api.common.Visibility;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -31,11 +34,14 @@ import org.junit.ClassRule;
 /**
  * Memcache CachePool Test.
  */
+@Docker( image = "memcached",
+         ports = @Port( exposed = 11211, inner = 11211 ),
+         newForEachCase = false )
 public class MemcacheCachePoolTest
     extends AbstractCachePoolTest
 {
-    @ClassRule
-    public static final DockerRule DOCKER = new DockerRule( "memcached", 11211 
);
+//    @ClassRule
+//    public static final DockerRule DOCKER = new DockerRule( "memcached", 
11211 );
 
     @Override
     // START SNIPPET: assembly
@@ -43,6 +49,14 @@ public class MemcacheCachePoolTest
         throws AssemblyException
     {
         // END SNIPPET: assembly
+        try
+        {
+            Thread.sleep(10000);
+        }
+        catch( InterruptedException e )
+        {
+            e.printStackTrace();
+        }
         ModuleAssembly confModule = module.layer().module( "confModule" );
         new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( 
confModule );
         // START SNIPPET: assembly
@@ -52,8 +66,11 @@ public class MemcacheCachePoolTest
             assemble( module );
         // END SNIPPET: assembly
         MemcacheConfiguration memcacheConf = confModule.forMixin( 
MemcacheConfiguration.class ).declareDefaults();
-        String dockerHost = DOCKER.getDockerHost();
-        int dockerPort = DOCKER.getExposedContainerPort( "11211/tcp" );
+//        String dockerHost = DOCKER.getDockerHost();
+//        int dockerPort = DOCKER.getExposedContainerPort( "11211/tcp" );
+        String dockerHost = "localhost";
+        int dockerPort = 11211;
+
         memcacheConf.addresses().set( dockerHost + ':' + dockerPort );
         memcacheConf.protocol().set( "binary" );
         // START SNIPPET: assembly

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
 
b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
index 9d7e83d..743342b 100644
--- 
a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
+++ 
b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
@@ -28,6 +28,7 @@ import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 import org.apache.polygene.test.entity.CanRemoveAll;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Test the CassandraEntityStoreService.
@@ -68,6 +69,7 @@ public class CassandraEntityStoreTest
     // END SNIPPET: assembly
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
 
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
index d4194da..9e44d8b 100644
--- 
a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
+++ 
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
@@ -28,6 +28,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Test the MongoDBEntityStoreService.
@@ -66,6 +67,7 @@ public class MongoDBEntityStoreTest extends 
AbstractEntityStoreTest
     private String dbName;
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
 
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
index b334ead..2b00000 100644
--- 
a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
+++ 
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
@@ -28,6 +28,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 import org.apache.polygene.test.docker.DockerRule;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Test the MongoDBEntityStoreService usage with a CachePool.
@@ -61,6 +62,7 @@ public class MongoDBEntityStoreWithCacheTest
     private String dbName;
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
 
b/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
index f678b72..0808462 100644
--- 
a/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
+++ 
b/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
@@ -27,6 +27,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
@@ -59,6 +60,7 @@ public class RedisEntityStoreTest
     private JedisPool jedisPool;
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
 
b/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
index a229be2..d5c869d 100644
--- 
a/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
+++ 
b/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
@@ -27,6 +27,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 import org.apache.polygene.test.docker.DockerRule;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
@@ -53,6 +54,7 @@ public class RedisEntityStoreWithCacheTest
     private JedisPool jedisPool;
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
 
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
index 145f7a8..31c886e 100644
--- 
a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
+++ 
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
@@ -25,6 +25,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 public class RiakEntityStoreTest extends AbstractEntityStoreTest
 {
@@ -34,7 +35,9 @@ public class RiakEntityStoreTest extends 
AbstractEntityStoreTest
     private RiakFixture riakFixture;
 
     @Override
-    public void setUp() throws Exception
+    @BeforeEach
+    public void setUp()
+        throws Exception
     {
         super.setUp();
         RiakEntityStoreService es = serviceFinder.findService( 
RiakEntityStoreService.class ).get();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
 
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
index 7e20235..3cfd08d 100644
--- 
a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
+++ 
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
@@ -28,6 +28,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 import org.apache.polygene.test.docker.DockerRule;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 public class RiakEntityStoreWithCacheTest extends 
AbstractEntityStoreWithCacheTest
 {
@@ -37,7 +38,9 @@ public class RiakEntityStoreWithCacheTest extends 
AbstractEntityStoreWithCacheTe
     private RiakFixture riakFixture;
 
     @Override
-    public void setUp() throws Exception
+    @BeforeEach
+    public void setUp()
+        throws Exception
     {
         super.setUp();
         RiakEntityStoreService es = serviceFinder.findService( 
RiakEntityStoreService.class ).get();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-sql/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/build.gradle 
b/extensions/entitystore-sql/build.gradle
index a39f75d..a2f4cd3 100644
--- a/extensions/entitystore-sql/build.gradle
+++ b/extensions/entitystore-sql/build.gradle
@@ -34,7 +34,9 @@ dependencies {
   testImplementation polygene.internals.testsupport
   testImplementation polygene.library( 'sql-dbcp' )
   testImplementation polygene.library( 'sql-bonecp' )
-  testImplementation (libraries.docker_junit ) { exclude group: "junit", 
module: "junit" }
+
+  testImplementation 'com.github.faustxvi:junit5-docker:1.0.0-RC5'
+//  testImplementation (libraries.docker_junit ) { exclude group: "junit", 
module: "junit" }
   testImplementation libraries.h2
   testImplementation libraries.junit_vintage
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTest.java
 
b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTest.java
index f790a69..3f2490b 100644
--- 
a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTest.java
+++ 
b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTest.java
@@ -19,6 +19,9 @@
  */
 package org.apache.polygene.entitystore.sql;
 
+import com.github.junit5docker.Docker;
+import com.github.junit5docker.Port;
+import com.github.junit5docker.WaitFor;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.polygene.api.common.Visibility;
@@ -35,23 +38,27 @@ import org.jooq.SQLDialect;
 import org.junit.After;
 import org.junit.ClassRule;
 
+@Docker( image = "postgres",
+         ports = @Port( exposed = 45432, inner = 5432 ),
+         waitFor = @WaitFor( "PostgreSQL init process complete; ready for 
start up." ),
+         newForEachCase = false )
 public class PostgreSQLEntityStoreTest
     extends AbstractEntityStoreTest
 {
-    @ClassRule
-    public static final DockerRule DOCKER;
-
-    static
-    {
-        Map<String,String> environment = new HashMap<>();
-        environment.put( "POSTGRES_USER", System.getProperty( "user.name" ));
-        environment.put( "POSTGRES_PASSWORD", "ThisIsGreat!");
-
-        DOCKER = new DockerRule( "postgres",
-                                 environment,
-                                 5000L,
-                                 "PostgreSQL init process complete; ready for 
start up." );
-    }
+//    @ClassRule
+//    public static final DockerRule DOCKER;
+//
+//    static
+//    {
+//        Map<String, String> environment = new HashMap<>();
+//        environment.put( "POSTGRES_USER", System.getProperty( "user.name" ) 
);
+//        environment.put( "POSTGRES_PASSWORD", "ThisIsGreat!" );
+//
+//        DOCKER = new DockerRule( "postgres",
+//                                 environment,
+//                                 5000L,
+//                                 "PostgreSQL init process complete; ready 
for start up." );
+//    }
 
     @Override
     // START SNIPPET: assembly
@@ -87,10 +94,10 @@ public class PostgreSQLEntityStoreTest
             .assemble( module );
         // END SNIPPET: assembly
 
-
-        String host = DOCKER.getDockerHost();
-        int port = DOCKER.getExposedContainerPort( "5432/tcp" );
-
+//        String host = DOCKER.getDockerHost();
+//        int port = DOCKER.getExposedContainerPort( "5432/tcp" );
+        int port = 45432;
+        String host = "localhost";
         DataSourceConfiguration defaults = config.forMixin( 
DataSourceConfiguration.class ).declareDefaults();
         defaults.url().set( "jdbc:postgresql://" + host + ":" + port + 
"/jdbc_test_db" );
         defaults.username().set( System.getProperty( "user.name" ) );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
index 0f96be2..ddf6cda 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
@@ -26,6 +26,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.qi64.AbstractIssueTest;
 import org.apache.polygene.index.rdf.qi64.AccountComposite;
 import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -40,8 +41,8 @@ public final class IssueTest
 {
     private AccountService accountService;
 
-    @Before
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
index 00ac1f6..7d9a010 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
@@ -26,6 +26,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.qi64.AbstractIssueTest;
 import org.apache.polygene.index.rdf.qi64.AccountComposite;
 import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.core.Is.is;
@@ -38,8 +39,8 @@ public final class IssueTest
 {
     private AccountService accountService;
 
-    @Before
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
index 953ec5f..bd99cd2 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
@@ -27,6 +27,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.qi64.AbstractIssueTest;
 import org.apache.polygene.index.rdf.qi64.AccountComposite;
 import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.core.Is.is;
@@ -39,8 +40,8 @@ public class IssueTest
 {
     private AccountService accountService;
 
-    @Before
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLComplexQueryTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLComplexQueryTest.java
 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLComplexQueryTest.java
index d9ad732..f13801a 100644
--- 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLComplexQueryTest.java
+++ 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLComplexQueryTest.java
@@ -24,6 +24,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.indexing.AbstractComplexQueryTest;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 public class PostgreSQLComplexQueryTest
     extends AbstractComplexQueryTest
@@ -42,6 +43,7 @@ public class PostgreSQLComplexQueryTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
index 7d7ccfe..0fea8d5 100644
--- 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
+++ 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
@@ -39,6 +39,7 @@ import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.docker.DockerRule;
 import org.junit.Assert;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PostgreSQLDBIntegrityTest
@@ -68,6 +69,7 @@ public class PostgreSQLDBIntegrityTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
index ca96386..a5e3f39 100644
--- 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
+++ 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
@@ -24,6 +24,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.indexing.AbstractEntityFinderTest;
 import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
 
 public class PostgreSQLEntityFinderTest
     extends AbstractEntityFinderTest
@@ -42,6 +43,7 @@ public class PostgreSQLEntityFinderTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
index 8e92d16..5c77597 100644
--- 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
+++ 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
@@ -25,6 +25,7 @@ import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.indexing.AbstractQueryTest;
 import org.junit.ClassRule;
 import org.junit.Ignore;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -51,6 +52,7 @@ public class PostgreSQLQueryTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
index adfe8ff..c0d3db3 100644
--- 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
+++ 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
@@ -30,6 +30,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -66,6 +67,7 @@ public class AlarmHistoryImplTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
index 174f00f..2dfbfee 100644
--- 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
+++ 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
@@ -31,6 +31,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -63,6 +64,8 @@ public class AlarmPointImplTest extends AbstractPolygeneTest
     {
     }
 
+    @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
index 549ffcf..e021cef 100644
--- 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
+++ 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
@@ -29,6 +29,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -67,6 +68,7 @@ public class AlarmServiceTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java
 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java
index e2679f5..2993388 100644
--- 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java
+++ 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java
@@ -32,6 +32,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -66,6 +67,7 @@ public class ExtendedAlarmModelTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
index 82a8ba7..f2933ae 100644
--- 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
+++ 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
@@ -32,6 +32,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -66,6 +67,7 @@ public class SimpleAlarmModelTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
index c5e77f6..f41e518 100644
--- 
a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
+++ 
b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
@@ -33,6 +33,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -67,6 +68,7 @@ public class StandardAlarmModelTest
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
 
b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
index d233090..bb651e5 100644
--- 
a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
+++ 
b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
@@ -44,6 +44,7 @@ import 
org.apache.polygene.spi.entitystore.EntityStoreUnitOfWork;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openrdf.model.Statement;
 import org.openrdf.rio.RDFHandlerException;
@@ -56,6 +57,7 @@ public class EntitySerializerTest
 {
     @Service
     EntityStore entityStore;
+
     @Uses
     EntityStateSerializer serializer;
 
@@ -70,7 +72,7 @@ public class EntitySerializerTest
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
----------------------------------------------------------------------
diff --git 
a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
 
b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
index 9d30057..d8a2eab 100644
--- 
a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
+++ 
b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
@@ -39,6 +39,7 @@ import org.apache.polygene.spi.entitystore.EntityStore;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openrdf.model.Statement;
 import org.openrdf.rio.RDFHandlerException;
@@ -61,7 +62,8 @@ public class EntityTypeSerializerTest
         module.objects( EntityTypeSerializer.class, 
EntityTypeSerializerTest.class );
     }
 
-    @Override @Before
+    @Override
+    @BeforeEach
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/346a8521/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
----------------------------------------------------------------------
diff --git 
a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
 
b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
index 7986b1a..845c7d0 100644
--- 
a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
+++ 
b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
@@ -23,6 +23,7 @@ import org.apache.polygene.api.composite.TransientBuilder;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,6 +36,7 @@ public class Step2TestCase
     private ShippingService shippingService;
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

Reply via email to