Upgraded all tests to JUnit 5, and removed the vintage platform. Problem though, since no tests are started by Gradle.

Author: niclash

artwork/logo-flag.svg

@@ -47,8 +47,8 @@ import org.gradle.api.tasks.bundling.Zip
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.gradle.maven.MavenModule
 import org.gradle.maven.MavenPomArtifact
-import org.gradle.plugins.ide.internal.IdeDependenciesExtractor
-import org.gradle.plugins.ide.internal.resolver.model.IdeExtendedRepoFileDependency
+//import org.gradle.plugins.ide.internal.IdeDependenciesExtractor
+//import org.gradle.plugins.ide.internal.resolver.model.IdeExtendedRepoFileDependency
 import org.gradle.plugins.signing.Sign
 import org.gradle.plugins.signing.SigningExtension
 import org.gradle.process.ExecSpec
@@ -553,6 +553,7 @@ class DistributionsPlugin implements Plugin<Project>
         }
         // Copy Maven artifacts using the Gradle IDE Model
         // Include sources if available, otherwise include javadoc if available
+/* TODO: Paul!!! These internal classes disappeared in Gradle between 4.2 and 4.6
         IdeDependenciesExtractor dependenciesExtractor = new IdeDependenciesExtractor()
         def ideDependencies = dependenciesExtractor.extractRepoFileDependencies project.dependencies,
                                                                                 [ configuration ], [ ],
@@ -575,6 +576,7 @@ class DistributionsPlugin implements Plugin<Project>
             Files.exists( javadocDestination ) ?: Files.copy( ideDependency.javadocFile.toPath(), javadocDestination )
           }
         }
+*/
       }
     }
     project.tasks.create( TaskNames.ZIP_DEPENDENCIES_DIST, Zip ) { Zip task ->

artwork/logo.svg

@@ -34,6 +34,7 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.file.CopySpec
 import org.gradle.api.logging.LogLevel
+import org.gradle.api.logging.Logger
 
 @CompileStatic
 class InternalDockerPlugin implements Plugin<Project>
@@ -84,7 +85,9 @@ class InternalDockerPlugin implements Plugin<Project>
         }
         else
         {
-          project.logger.lifecycle "Unable to connect to Docker, all Docker tasks will be SKIPPED\n  ${ ( ( Exception ) ex ).message }"
+          def logger = project.logger
+          def mess = ex == null ? "" : ((Exception) ex).message
+          logger.lifecycle "Unable to connect to Docker, all Docker tasks will be SKIPPED\n  ${ mess }"
         }
       }
       task.onComplete = {

artwork/pb-polygene.svg

@@ -1,3 +1,22 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
 package org.apache.polygene.test;
 
 import org.apache.polygene.api.structure.Application;

buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy

@@ -0,0 +1,121 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+package org.apache.polygene.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import static java.nio.file.FileVisitResult.CONTINUE;
+import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.BOTTOM_UP;
+import static org.junit.platform.commons.util.ReflectionUtils.findFields;
+
+public class TemporaryFolder
+    implements Extension, BeforeEachCallback, AfterEachCallback
+{
+    private File root;
+
+    public TemporaryFolder()
+    {
+    }
+
+    @Override
+    public void beforeEach( ExtensionContext context )
+        throws Exception
+    {
+        try
+        {
+            root = File.createTempFile( "junit5-", ".tmp" );
+        }
+        catch( IOException ioe )
+        {
+            throw new RuntimeException( ioe );
+        }
+        root.delete(); // Remove if already exists
+        root.mkdir();
+
+        findFields( context.getRequiredTestClass(),
+                    f -> f.getType().equals( TemporaryFolder.class ), BOTTOM_UP )
+            .forEach( f -> {
+                try
+                {
+                    f.setAccessible( true );
+                    f.set( context.getRequiredTestInstance(), this );
+                }
+                catch( IllegalAccessException e )
+                {
+                    throw new UndeclaredThrowableException( e );
+                }
+            } );
+    }
+
+    @Override
+    public void afterEach( ExtensionContext context )
+        throws Exception
+    {
+        try
+        {
+            Files.walkFileTree( root.toPath(), new DeleteAllVisitor() );
+        }
+        catch( IOException ioe )
+        {
+            throw new RuntimeException( ioe );
+        }
+    }
+
+    public File file( String name )
+        throws IOException
+    {
+        return new File( root, name );
+    }
+
+    public File getRoot()
+    {
+        return root;
+    }
+
+    private static class DeleteAllVisitor extends SimpleFileVisitor<Path>
+    {
+        @Override
+        public FileVisitResult visitFile( Path file, BasicFileAttributes attributes )
+            throws IOException
+        {
+            Files.delete( file );
+            return CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult postVisitDirectory( Path directory, IOException exception )
+            throws IOException
+        {
+            Files.delete( directory );
+            return CONTINUE;
+        }
+    }
+}

buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/internals/InternalDockerPlugin.groovy

@@ -0,0 +1,64 @@
+package org.apache.polygene.test;
+
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.Optional;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.BOTTOM_UP;
+import static org.junit.platform.commons.util.ReflectionUtils.findFields;
+
+public class TestName
+    implements BeforeAllCallback, BeforeEachCallback
+{
+    private String testName;
+    private String methodName;
+
+    @Override
+    public void beforeAll( ExtensionContext context )
+        throws Exception
+    {
+        Optional<Class<?>> testClass = context.getTestClass();
+        testClass.ifPresent( cls -> testName = cls.getName() );
+        context.getTestMethod().ifPresent( m -> methodName = m.getName() );
+        inject( context );
+    }
+
+    @Override
+    public void beforeEach( ExtensionContext context )
+        throws Exception
+    {
+        Optional<Class<?>> testClass = context.getTestClass();
+        testClass.ifPresent( cls -> testName = cls.getName() );
+        context.getTestMethod().ifPresent( m -> methodName = m.getName() );
+        inject( context );
+    }
+
+    private void inject( ExtensionContext context )
+    {
+        findFields( context.getRequiredTestClass(),
+                    f -> f.getType().equals( TestName.class ), BOTTOM_UP )
+            .forEach( f -> {
+                try
+                {
+                    f.setAccessible( true );
+                    f.set( context.getRequiredTestInstance(), this );
+                }
+                catch( IllegalAccessException e )
+                {
+                    throw new UndeclaredThrowableException( e );
+                }
+            } );
+    }
+
+    public String getTestName()
+    {
+        return testName;
+    }
+
+    public String getMethodName()
+    {
+        return methodName;
+    }
+}

core/testsupport/src/main/java/org/apache/polygene/test/PolygeneUnitExtension.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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
 /**
@@ -89,6 +90,7 @@ public void setUp()
 
 
     @Override
+    @AfterEach
     public void tearDown()
     {
         if( this.unitOfWork != null )

core/testsupport/src/main/java/org/apache/polygene/test/TemporaryFolder.java

@@ -20,7 +20,7 @@ import org.apache.polygene.gradle.dependencies.DependenciesDeclarationExtension
 def dependencies = extensions.getByType(DependenciesDeclarationExtension)
 
 // Gradle version
-dependencies.gradleVersion = '4.2.1'
+dependencies.gradleVersion = '4.6'
 
 // Remote repositories
 dependencies.repositoriesUrls << [
@@ -79,7 +79,7 @@ def servletVersion = '3.1.0'
 def shiroVersion = '1.4.0'
 def slf4jVersion = '1.7.25'
 def solrVersion = "1.4.1" // 4.x Fails to compile!
-def springVersion = '4.3.9.RELEASE'
+def springVersion = '5.0.5.RELEASE'
 def spymemcachedVersion = '2.12.3'
 def velocityVersion = '1.7'
 dependencies.libraries << [
@@ -184,7 +184,8 @@ dependencies.libraries << [
 // Runtime, Test and Samples dependencies
 def awaitilityVersion = '3.0.0'
 def dnsJavaVersion = '2.1.8'
-def dockerJUnitVersion = '0.3'
+def dockerJUnit5Version = '1.0.0-RC5'
+
 def easyMockVersion = '3.4'
 def h2Version = '1.4.196'
 def hamcrestVersion = '1.3'
@@ -200,15 +201,15 @@ dependencies.libraries << [
         awaitility        : "org.awaitility:awaitility:$awaitilityVersion",
         derby             : "org.apache.derby:derby:$derbyVersion",
         dnsjava           : "dnsjava:dnsjava:$dnsJavaVersion",
-        docker_junit      : "com.github.tdomzal:junit-docker-rule:$dockerJUnitVersion",
+        docker_junit      : "com.github.faustxvi:junit5-docker:$dockerJUnit5Version",
+
         easymock          : "org.easymock:easymock:$easyMockVersion",
         h2                : "com.h2database:h2:$h2Version",
         hamcrest          : ["org.hamcrest:hamcrest-core:$hamcrestVersion",
                              "org.hamcrest:hamcrest-library:$hamcrestVersion"],
         junit             : ["org.junit.jupiter:junit-jupiter-api:$junitVersion",
                              "org.junit.jupiter:junit-jupiter-params:$junitVersion"
         ],
-        junit_vintage     : "org.junit.vintage:junit-vintage-engine:$junitVersion",
 
         logback           : "ch.qos.logback:logback-classic:$logbackVersion",
         mockito           : "org.mockito:mockito-core:$mockitoVersion",