Upgrade Java 17 in policy-drools-apps

[policy/drools-applications.git] / controlloop / common / feature-controlloop-management / src / test / java / org / onap / policy / drools / server / restful / RestControlLoopManagerTest.java

diff --git a/controlloop/common/feature-controlloop-management/src/test/java/org/onap/policy/drools/server/restful/RestControlLoopManagerTest.java b/controlloop/common/feature-controlloop-management/src/test/java/org/onap/policy/drools/server/restful/RestControlLoopManagerTest.java
index b9caef9..279b47c 100644 (file)
--- a/controlloop/common/feature-controlloop-management/src/test/java/org/onap/policy/drools/server/restful/RestControlLoopManagerTest.java
+++ b/controlloop/common/feature-controlloop-management/src/test/java/org/onap/policy/drools/server/restful/RestControlLoopManagerTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,19 +23,18 @@ package org.onap.policy.drools.server.restful;
 
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.ws.rs.core.Response.Status;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import javax.ws.rs.core.Response.Status;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.kie.api.builder.ReleaseId;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
 import org.onap.policy.common.utils.coder.CoderException;
@@ -51,7 +51,7 @@ import org.onap.policy.simulators.Util;
 /**
  * Test RestControlLoopManager.
  */
-public class RestControlLoopManagerTest {
+class RestControlLoopManagerTest {
 
     private static final String KSESSION = "op";
     private static final String KMODULE_DRL_PATH = "src/test/resources/op.drl";
@@ -91,7 +91,7 @@ public class RestControlLoopManagerTest {
      *
      * @throws Exception if failure to complete the set up.
      */
-    @BeforeClass
+    @BeforeAll
     public static void setUp() throws Exception {
         System.setProperty("kie.maven.settings.custom", "src/test/resources/settings.xml");
         LoggerUtils.setLevel(LoggerUtils.ROOT_LOGGER, "WARN");
@@ -133,7 +133,7 @@ public class RestControlLoopManagerTest {
     /**
      * test tear down.
      */
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         PolicyControllerConstants.getFactory().get(CONTROLLER).stop();
         await().atMost(1, TimeUnit.MINUTES).until(isContainerAlive(), equalTo(Boolean.FALSE));
@@ -141,7 +141,7 @@ public class RestControlLoopManagerTest {
         PolicyEngineConstants.getManager().removePolicyController(CONTROLLER);
         PolicyEngineConstants.getManager().stop();
 
-        final Path controllerPath =
+        final var controllerPath =
             Paths.get(SystemPersistenceConstants.getManager().getConfigurationPath().toString(),
                 CONTROLLER_FILE);
         try {
@@ -150,7 +150,7 @@ public class RestControlLoopManagerTest {
             /* to satisfy checkstyle */
         }
 
-        Path controllerBakPath =
+        var controllerBakPath =
             Paths.get(SystemPersistenceConstants.getManager().getConfigurationPath().toString(),
                 CONTROLLER_FILE_BAK);
 
@@ -165,7 +165,7 @@ public class RestControlLoopManagerTest {
      * Test Operational Policies.
      */
     @Test
-    public void testOperationalPolicy() throws IOException {
+    void testOperationalPolicy() {
         assertEquals(Status.OK.getStatusCode(), HttpClientFactoryInstance.getClientFactory()
             .get(CONTROLLER).get(URL_CONTEXT_PATH_CONTROLLOOPS).getStatus());
 
@@ -180,7 +180,7 @@ public class RestControlLoopManagerTest {
      * Test AAI Custom Query.
      */
     @Test
-    public void testAaiCq() throws CoderException {
+    void testAaiCq() {
         assertEquals(Status.OK.getStatusCode(), HttpClientFactoryInstance.getClientFactory()
             .get(CONTROLLER).get(URL_CONTEXT_PATH_TOOLS_AAI_CQ + "dummy").getStatus());
     }