Java 17 / Spring 6 / Spring Boot 3 Upgrade

[policy/api.git] / main / src / test / java / org / onap / policy / api / contract / ApiContractTest.java

diff --git a/main/src/test/java/org/onap/policy/api/contract/ApiContractTest.java b/main/src/test/java/org/onap/policy/api/contract/ApiContractTest.java
index 3b90a10..08cb7f1 100644 (file)
--- a/main/src/test/java/org/onap/policy/api/contract/ApiContractTest.java
+++ b/main/src/test/java/org/onap/policy/api/contract/ApiContractTest.java
@@ -23,11 +23,10 @@ package org.onap.policy.api.contract;
 
 import static org.junit.Assert.assertEquals;
 
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
-import javax.ws.rs.core.Response;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.api.main.PolicyApiApplication;
 import org.onap.policy.api.main.rest.utils.CommonTestRestController;
 import org.onap.policy.common.utils.security.SelfSignedKeyStore;
@@ -38,25 +37,22 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = PolicyApiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles({ "test", "stub" })
+@ActiveProfiles({"test", "stub"})
 @DirtiesContext(classMode = ClassMode.AFTER_CLASS)
-public class ApiContractTest extends CommonTestRestController {
+class ApiContractTest extends CommonTestRestController {
     protected static final String APP_JSON = "application/json";
     protected static final String APP_YAML = "application/yaml";
     private static final String TOSCA_NODE_TEMPLATE_RESOURCE =
-            "nodetemplates/nodetemplates.metadatasets.input.tosca.json";
+        "nodetemplates/nodetemplates.metadatasets.input.tosca.json";
 
     @LocalServerPort
     private int apiPort;
 
     private static SelfSignedKeyStore keystore;
 
-
-    @BeforeClass
+    @BeforeAll
     public static void setupParameters() throws IOException, InterruptedException {
         keystore = new SelfSignedKeyStore();
     }
@@ -72,20 +68,20 @@ public class ApiContractTest extends CommonTestRestController {
     }
 
     @Test
-    public void testStubPolicyDesign() throws Exception {
+    void testStubPolicyDesign() throws Exception {
         checkStubJsonGet("policies");
         checkStubJsonGet("policies/policyname/versions/1.0.2");
         checkStubJsonGet("policytypes");
         checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16");
         checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/latest");
-        checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0/");
+        checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0");
         checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0/policies");
         checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0/policies/"
             + "9c65fa1f-2833-4076-a64d-5b62e35cd09b");
         checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0/policies/"
-                + "9c65fa1f-2833-4076-a64d-5b62e35cd09b/versions/latest");
+            + "9c65fa1f-2833-4076-a64d-5b62e35cd09b/versions/latest");
         checkStubJsonGet("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0/policies/"
-                + "9c65fa1f-2833-4076-a64d-5b62e35cd09b/versions/1.2.3");
+            + "9c65fa1f-2833-4076-a64d-5b62e35cd09b/versions/1.2.3");
         checkStubJsonGet("healthcheck");
 
         checkStubJsonPost("policies");
@@ -95,11 +91,11 @@ public class ApiContractTest extends CommonTestRestController {
         checkStubJsonDelete("policies/policyname/versions/1.0.2");
         checkStubJsonDelete("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0");
         checkStubJsonDelete("policytypes/380d5cb1-e43d-45b7-b10b-ebd15dfabd16/versions/1.0.0/policies/"
-                + "9c65fa1f-2833-4076-a64d-5b62e35cd09b/versions/1.2.3");
+            + "9c65fa1f-2833-4076-a64d-5b62e35cd09b/versions/1.2.3");
     }
 
     @Test
-    public void testStubNodeTemplateDesign() throws Exception {
+    void testStubNodeTemplateDesign() throws Exception {
         checkStubJsonGet("nodetemplates");
         checkStubJsonGet("nodetemplates/k8stemplate/versions/1.0.0");
 
@@ -111,7 +107,7 @@ public class ApiContractTest extends CommonTestRestController {
     }
 
     @Test
-    public void testErrors() throws Exception {
+    void testErrors() throws Exception {
         var responseYaml = super.readResource("policies", APP_YAML, apiPort);
         assertEquals(Response.Status.NOT_IMPLEMENTED.getStatusCode(), responseYaml.getStatus());