Integrate Config Binding Service client

[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 8bcd99a..18ea22b 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -17,19 +17,14 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-
 package org.oransc.policyagent;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertFalse;
-
 import java.net.URL;
-import java.util.Vector;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.oransc.policyagent.configuration.ApplicationConfig;
-import org.oransc.policyagent.configuration.ImmutableRicConfig;
-import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.repository.ImmutablePolicy;
 import org.oransc.policyagent.repository.ImmutablePolicyType;
@@ -37,7 +32,6 @@ import org.oransc.policyagent.repository.Policies;
 import org.oransc.policyagent.repository.Policy;
 import org.oransc.policyagent.repository.PolicyType;
 import org.oransc.policyagent.repository.PolicyTypes;
-import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -50,6 +44,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
 
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class ApplicationTest {
@@ -65,6 +60,7 @@ public class ApplicationTest {
         }
     }
 
+
     @TestConfiguration
     static class Beans {
         @Bean
@@ -114,7 +110,6 @@ public class ApplicationTest {
         String url = "http://localhost:" + port + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
         String json = "{}";
         addPolicyType("type1");
-        addRic(beans.getRics(), "ric1", url);
 
         this.restTemplate.put(url, json);
 
@@ -125,24 +120,11 @@ public class ApplicationTest {
         assertThat(policy.ownerServiceName()).isEqualTo("service1");
     }
 
-    private void addRic(Rics rics, String ric, String url) {
-        Vector<String> nodeNames = new Vector<>(1);
-        nodeNames.add("node1");
-        RicConfig ricConfig = ImmutableRicConfig.builder() //
-            .name(ric) //
-            .baseUrl(url) //
-            .managedElementIds(nodeNames) //
-            .build();
-        Ric ricObj = new Ric(ricConfig);
-
-        rics.put(ricObj);
-    }
-
     private PolicyType addPolicyType(String name) {
         PolicyType type = ImmutablePolicyType.builder() //
-            .jsonSchema("") //
-            .name(name) //
-            .build();
+                .jsonSchema("") //
+                .name(name) //
+                .build();
 
         beans.getPolicyTypes().put(type);
         return type;
@@ -150,11 +132,11 @@ public class ApplicationTest {
 
     private Policy addPolicy(String id, String typeName, String service) throws ServiceException {
         Policy p = ImmutablePolicy.builder().id(id) //
-            .json("{}") //
-            .ownerServiceName(service) //
-            .ric(beans.getRics().getRic("ric1")) //
-            .type(addPolicyType(typeName)) //
-            .build();
+                .json("{}") //
+                .ownerServiceName(service) //
+                .ric(beans.getRics().getRic("ric1")) //
+                .type(addPolicyType(typeName)) //
+                .build();
         beans.getPolicies().put(p);
         return p;
     }
@@ -177,7 +159,6 @@ public class ApplicationTest {
     @Test
     public void getPolicies() throws Exception {
         String url = "http://localhost:" + port + "/policies";
-        addRic(beans.getRics(), "ric1", url);
         addPolicy("id1", "type1", "service1");
         addPolicy("id2", "type2", "service2");