Bugfix

[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 9b73892..4e3fd0f 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -184,7 +184,7 @@ public class ApplicationTest {
             ric.getLock().lockBlocking(LockType.EXCLUSIVE);
             ric.getLock().unlockBlocking();
             assertThat(ric.getLock().getLockCounter()).isEqualTo(0);
-            assertThat(ric.getState()).isEqualTo(Ric.RicState.IDLE);
+            assertThat(ric.getState()).isEqualTo(Ric.RicState.AVAILABLE);
         }
     }
 
@@ -211,7 +211,7 @@ public class ApplicationTest {
 
     @Test
     public void testSynchronization() throws Exception {
-        addRic("ric").setState(Ric.RicState.UNDEFINED);
+        addRic("ric").setState(Ric.RicState.UNAVAILABLE);
         String ricName = "ric";
         Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName);
 
@@ -222,7 +222,7 @@ public class ApplicationTest {
         Policy policy = addPolicy(policyId, "typeName", "service", ricName); // This should be created in the RIC
         supervision.checkAllRics(); // The created policy should be put in the RIC
         await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ricName).getState()));
-        await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic(ricName).getState()));
+        await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ricName).getState()));
 
         Policies ricPolicies = getA1Client(ricName).getPolicies();
         assertThat(ricPolicies.size()).isEqualTo(1);
@@ -266,7 +266,7 @@ public class ApplicationTest {
 
         String url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
         final String policyBody = jsonString();
-        this.rics.getRic(ricName).setState(Ric.RicState.IDLE);
+        this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE);
 
         restClient().put(url, policyBody).block();
 
@@ -290,7 +290,7 @@ public class ApplicationTest {
         url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
         this.rics.getRic(ricName).setState(Ric.RicState.SYNCHRONIZING);
         testErrorCode(restClient().put(url, policyBody), HttpStatus.LOCKED);
-        this.rics.getRic(ricName).setState(Ric.RicState.IDLE);
+        this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE);
     }
 
     @Test
@@ -355,6 +355,7 @@ public class ApplicationTest {
         this.addRic("ric1");
         this.addRic("ricXXX");
         this.addPolicy("instance1", "type1", "service1", "ric1");
+        this.addPolicy("instance2", "type1", "service1", "ricXXX");
 
         // Try change ric1 -> ricXXX
         String urlWrongRic = putPolicyUrl("service1", "ricXXX", "type1", "instance1");
@@ -558,6 +559,8 @@ public class ApplicationTest {
         testErrorCode(restClient().put("/service", "crap"), HttpStatus.BAD_REQUEST);
         testErrorCode(restClient().put("/service", "{}"), HttpStatus.BAD_REQUEST);
         testErrorCode(restClient().put("/service", createServiceJson("name", -123)), HttpStatus.BAD_REQUEST);
+        testErrorCode(restClient().put("/service", createServiceJson("name", 0, "missing.portandprotocol.com")),
+            HttpStatus.BAD_REQUEST);
 
         // GET non existing servive
         testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND);
@@ -611,7 +614,11 @@ public class ApplicationTest {
     }
 
     private String createServiceJson(String name, long keepAliveIntervalSeconds) {
-        ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, "callbackUrl");
+        return createServiceJson(name, keepAliveIntervalSeconds, "https://examples.javacodegeeks.com/core-java/");
+    }
+
+    private String createServiceJson(String name, long keepAliveIntervalSeconds, String url) {
+        ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, url);
 
         String json = gson.toJson(service);
         return json;
@@ -718,7 +725,7 @@ public class ApplicationTest {
             .controllerName("") //
             .build();
         Ric ric = new Ric(conf);
-        ric.setState(Ric.RicState.IDLE);
+        ric.setState(Ric.RicState.AVAILABLE);
         this.rics.put(ric);
         return ric;
     }