Migrate the schema-service from JUnit 4 to JUnit 5

Issue-ID: AAI-4053
Change-Id: I100c96c9d231f1d5c232886bc00bf3e05cc209b3
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

4 files changed, 83 insertions, 56 deletions

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index 32906e9..a42c60c 100644
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -96,11 +96,6 @@
     </profiles>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
             <scope>compile</scope>
@@ -109,6 +104,10 @@
                     <groupId>org.onap.aai.aai-common</groupId>
                     <artifactId>aai-aaf-auth</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -122,8 +121,20 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-junit</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -146,6 +157,21 @@
             <artifactId>org.eclipse.persistence.moxy</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java b/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java
index 99d74a1..d538d21 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java
@@ -20,7 +20,7 @@
 
 package org.onap.aai.queries;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,9 +28,8 @@ import java.nio.charset.Charset;
 import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.onap.aai.config.IntrospectionConfig;
 import org.onap.aai.config.RestBeanConfig;
 import org.onap.aai.config.SpringContextAware;
@@ -48,13 +47,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.rules.SpringClassRule;
-import org.springframework.test.context.junit4.rules.SpringMethodRule;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ContextConfiguration(
     classes = {SchemaLocationsBean.class, SchemaVersions.class, AAIConfigTranslator.class,
         EdgeIngestor.class, EdgeSerializer.class, NodeIngestor.class, SpringContextAware.class,
         IntrospectionConfig.class, RestBeanConfig.class, GremlinServerSingleton.class})
+@ExtendWith(SpringExtension.class)
 @TestPropertySource(
     properties = {"schema.uri.base.path = /aai",
         "schema.ingest.file = src/test/resources/application-test.properties"})
@@ -89,13 +88,7 @@ public abstract class AAISetup {
     @Value("${schema.uri.base.path}")
     protected String basePath;
 
-    @ClassRule
-    public static final SpringClassRule springClassRule = new SpringClassRule();
-
-    @Rule
-    public final SpringMethodRule springMethodRule = new SpringMethodRule();
-
-    @BeforeClass
+    @BeforeAll
     public static void setupBundleconfig() throws Exception {
         System.setProperty("AJSC_HOME", "./");
         System.setProperty("BUNDLECONFIG_DIR", "src/main/resources/");
@@ -107,7 +100,7 @@ public abstract class AAISetup {
         InputStream inputStream = getClass().getClassLoader().getResourceAsStream(filename);
 
         String message = String.format("Unable to find the %s in src/test/resources", filename);
-        assertNotNull(message, inputStream);
+        assertNotNull(inputStream, message);
 
         String resource = IOUtils.toString(inputStream, Charset.defaultCharset());
         return resource;
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
index 84051b0..21a3312 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
@@ -20,8 +20,8 @@
 
 package org.onap.aai.queries;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -33,12 +33,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aai.config.IntrospectionConfig;
@@ -65,25 +62,18 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.rules.SpringClassRule;
-import org.springframework.test.context.junit4.rules.SpringMethodRule;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(Parameterized.class)
 @ContextConfiguration(
     classes = {SchemaLocationsBean.class, SchemaConfigVersions.class, AAIConfigTranslator.class,
         EdgeIngestor.class, EdgeSerializer.class, NodeIngestor.class, SpringContextAware.class,
         GremlinServerSingleton.class, IntrospectionConfig.class})
+@ExtendWith(SpringExtension.class)
 @TestPropertySource(
     properties = {"schema.uri.base.path = /aai", "schema.source.name = onap",
         "schema.ingest.file = src/test/resources/application-test.properties"})
 public abstract class OnapQueryTest {
 
-    @ClassRule
-    public static final SpringClassRule springClassRule = new SpringClassRule();
-
-    @Rule
-    public final SpringMethodRule springMethodRule = new SpringMethodRule();
-
     protected Logger logger;
     protected Graph graph;
     protected GremlinGroovyShell shell;
@@ -109,17 +99,8 @@ public abstract class OnapQueryTest {
     @Autowired
     protected GremlinServerSingleton gremlinServerSingleton;
 
-    @Parameterized.Parameter(value = 0)
     public SchemaVersion version;
 
-    @Parameterized.Parameters(name = "Version.{0}")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] {{new SchemaVersion("v11")}, {new SchemaVersion("v12")},
-            {new SchemaVersion("v13")}, {new SchemaVersion("v14")}, {new SchemaVersion("v15")},
-            {new SchemaVersion("v16")}, {new SchemaVersion("v17")}, {new SchemaVersion("v18")},
-            {new SchemaVersion("v19")}, {new SchemaVersion("v20")}});
-    }
-
     protected String query;
 
     LinkedHashMap<String, Object> params;
@@ -127,25 +108,24 @@ public abstract class OnapQueryTest {
     @Autowired
     private Environment env;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupBundleconfig() {
         System.setProperty("AJSC_HOME", "./");
         System.setProperty("BUNDLECONFIG_DIR", "src/main/resources/");
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws AAIException, NoEdgeRuleFoundException, EdgeRuleNotFoundException,
         AmbiguousRuleChoiceException, IOException {
         System.setProperty("AJSC_HOME", ".");
         System.setProperty("BUNDLECONFIG_DIR", "src/main/resources");
         logger = LoggerFactory.getLogger(getClass());
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         graph = TinkerGraph.open();
         gts = graph.traversal();
         createGraph();
         shell = new GremlinGroovyShell();
-        loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, version);
-        setUpQuery();
+
     }
 
     protected void setUpQuery() {
@@ -184,7 +164,7 @@ public abstract class OnapQueryTest {
         // java.lang.AssertionError: Expected all the vertices to be found
         // Expected :[v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12]]
         // Actual :[v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12]]
-        assertEquals("Expected all the vertices to be found", nonDuplicateExpectedResult, vertices);
+        assertEquals(nonDuplicateExpectedResult, vertices, "Expected all the vertices to be found");
 
     }
 
@@ -202,4 +182,8 @@ public abstract class OnapQueryTest {
 
     protected abstract void addParam(Map<String, Object> params);
 
+    public void initOnapQueryTest(SchemaVersion version) {
+        this.version = version;
+    }
+
 }
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java b/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java
index 373e251..3bd7e04 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java
@@ -20,25 +20,49 @@
 
 package org.onap.aai.queries;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
+import java.util.stream.Stream;
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.introspection.ModelType;
 import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException;
+import org.onap.aai.setup.SchemaVersion;
 
 public class VnfToEsrSystemInfoQueryTest extends OnapQueryTest {
     public VnfToEsrSystemInfoQueryTest() {
         super();
     }
 
-    @Test
-    public void run() {
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of(new SchemaVersion("v11")),
+            Arguments.of(new SchemaVersion("v12")),
+            Arguments.of(new SchemaVersion("v13")),
+            Arguments.of(new SchemaVersion("v14")),
+            Arguments.of(new SchemaVersion("v15")),
+            Arguments.of(new SchemaVersion("v16")),
+            Arguments.of(new SchemaVersion("v17")),
+            Arguments.of(new SchemaVersion("v18")),
+            Arguments.of(new SchemaVersion("v19")),
+            Arguments.of(new SchemaVersion("v20"))
+        );
+
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    public void run(SchemaVersion version) {
+        loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, version);
+        setUpQuery();
         super.run();
         assertTrue(true);
     }