Reenable tests for most of the top-level modules

- mso-requests-db-adapter
- aai-client
- so-optimization-clients
- so-sdn-clients

Issue-ID: SO-4141
Change-Id: I59264e394de71eea1a091bd08d32b181a44713d5
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 066e3e6..0f9582e 100644 (file)
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -26,6 +26,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>

diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml
index c47f529..fefefa9 100644 (file)
--- a/graph-inventory/aai-client/pom.xml
+++ b/graph-inventory/aai-client/pom.xml
@@ -238,5 +238,10 @@
       <artifactId>antlr4-runtime</artifactId>
       <version>4.7</version>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/so-optimization-clients/pom.xml b/so-optimization-clients/pom.xml
index c51ef89..2abcc65 100644 (file)
--- a/so-optimization-clients/pom.xml
+++ b/so-optimization-clients/pom.xml
@@ -66,6 +66,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

diff --git a/so-sdn-clients/pom.xml b/so-sdn-clients/pom.xml
index 1036de6..a580233 100644 (file)
--- a/so-sdn-clients/pom.xml
+++ b/so-sdn-clients/pom.xml
@@ -96,6 +96,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.onap.sdnc.northbound</groupId>
       <artifactId>generic-resource-api-client</artifactId>

diff --git a/so-sdn-clients/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java b/so-sdn-clients/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java
index 0b338bd..111687f 100644 (file)
--- a/so-sdn-clients/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java
+++ b/so-sdn-clients/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java
@@ -7,9 +7,9 @@
  * Licensed 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.
@@ -55,7 +55,7 @@ public class SDNCClientIT extends BaseIntegrationTest {
         String responseJson =
                 new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "SDNCClientPut404Response.json")));
 
-        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation/";
+        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation";
 
         wireMockServer.stubFor(post(urlMatching(queryLink)).willReturn(
                 aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(responseJson)));
@@ -68,7 +68,7 @@ public class SDNCClientIT extends BaseIntegrationTest {
         String responseJson =
                 new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "SDNCClientPut200Response.json")));
 
-        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation/";
+        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation";
 
         wireMockServer.stubFor(post(urlMatching(queryLink)).willReturn(
                 aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(responseJson)));