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

Author: niclash

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
     {

core/runtime/src/test/java/org/apache/polygene/runtime/query/QueryBuilderFactoryImplTest.java

@@ -55,6 +55,7 @@ public void assemble( ModuleAssembly module )
         module.transients( TestComposite.class );
     }
 
+    @Override
     @BeforeEach
     public void setUp()
         throws Exception

core/runtime/src/test/java/org/apache/polygene/runtime/value/AssociationToValueTest.java

@@ -39,6 +39,7 @@
 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 void assemble( ModuleAssembly module )
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

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 @@ protected void defineApplication( ApplicationAssembly applicationAssembly )
         assemble( module );
     }
 
-    @AfterEach
     @Override
+    @AfterEach
     public void tearDown()
     {
         if( unitOfWorkFactory != null && unitOfWorkFactory.isUnitOfWorkActive() )

core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java

@@ -26,6 +26,7 @@
 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
     {

core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java

@@ -37,6 +37,7 @@
 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 @@ protected void assembleValues( ModuleAssembly module, Visibility visibility )
     }
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {

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
     {

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
 }

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,18 +34,29 @@
 /**
  * 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
     public void assemble( ModuleAssembly module )
         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 void assemble( ModuleAssembly module )
             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

extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java

@@ -28,6 +28,7 @@
 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 void assemble( ModuleAssembly module )
     // END SNIPPET: assembly
 
     @Override
+    @BeforeEach
     public void setUp()
         throws Exception
     {