Remove new code smells

[nonrtric.git] / policy-agent / src / test / java / org / oransc / policyagent / ApplicationTest.java

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
index 917aca0..05485d7 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -34,7 +34,6 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.AfterEach;
@@ -217,9 +216,8 @@ public class ApplicationTest {
     @Test
     public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception {
         String ricName = "ric1";
-        Ric ric = addRic(ricName);
         String managedElementId = "kista_1";
-        ric.addManagedElement(managedElementId);
+        addRic(ricName, managedElementId);
 
         String url = baseUrl() + "/ric?managedElementId=" + managedElementId;
         String rsp = this.restTemplate.getForObject(url, String.class);
@@ -232,7 +230,7 @@ public class ApplicationTest {
         this.setRestErrorhandler();
         String url = baseUrl() + "/ric?managedElementId=kista_1";
         ResponseEntity<String> entity = this.restTemplate.getForEntity(url, String.class);
-        assertThat(entity.getStatusCode().equals(HttpStatus.NOT_FOUND));
+        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
     }
 
     @Test
@@ -275,7 +273,7 @@ public class ApplicationTest {
         this.setRestErrorhandler();
         String urlWrongRic = baseUrl() + "/policy?type=type1&instance=instance1&ric=ricXXX&service=service1";
         ResponseEntity<String> entity = this.putForEntity(urlWrongRic, jsonString());
-        assertThat(entity.getStatusCode().equals(HttpStatus.METHOD_NOT_ALLOWED));
+        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.METHOD_NOT_ALLOWED);
 
         Policy policy = policies.getPolicy("instance1");
         assertThat(policy.ric().name()).isEqualTo("ric1"); // Not changed
@@ -415,7 +413,7 @@ public class ApplicationTest {
         // Keep alive
         url = baseUrl() + "/services/keepalive?name=name";
         ResponseEntity<String> entity = this.restTemplate.postForEntity(url, null, String.class);
-        assertThat(entity.getStatusCode().equals(HttpStatus.OK));
+        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 
         // DELETE
         assertThat(services.size()).isEqualTo(1);
@@ -490,6 +488,7 @@ public class ApplicationTest {
             this.supervision = supervision;
         }
 
+        @Override
         public void run() {
             for (int i = 0; i < 100; ++i) {
                 if (i % 10 == 0) {
@@ -547,10 +546,17 @@ public class ApplicationTest {
     }
 
     private Ric addRic(String ricName) {
+        return addRic(ricName, null);
+    }
+
+    private Ric addRic(String ricName, String managedElement) {
         if (rics.get(ricName) != null) {
             return rics.get(ricName);
         }
-        Vector<String> mes = new Vector<>();
+        List<String> mes = new ArrayList<>();
+        if (managedElement != null) {
+            mes.add(managedElement);
+        }
         RicConfig conf = ImmutableRicConfig.builder() //
             .name(ricName) //
             .baseUrl(ricName) //