X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=8a6523c4ca0b923251434b53e25c90d807d43bfc;hb=ffe0c150f08205d73ee362f58f492aeb2703f295;hp=0d00daa4069bd91c57e86528e9e0d37a0f6b5ade;hpb=3e827b5c2bc00500577af25e9cb559b6243e1abd;p=nonrtric.git

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 0d00daa4..8a6523c4 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -39,7 +39,6 @@ import org.oransc.policyagent.configuration.ImmutableRicConfig;
 import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.controllers.ImmutableServiceRegistrationInfo;
 import org.oransc.policyagent.controllers.ImmutableServiceStatus;
-import org.oransc.policyagent.controllers.PolicyTypeInfo;
 import org.oransc.policyagent.controllers.ServiceRegistrationInfo;
 import org.oransc.policyagent.controllers.ServiceStatus;
 import org.oransc.policyagent.exceptions.ServiceException;
@@ -126,6 +125,8 @@ public class ApplicationTest {
 
     @Test
     public void testGetRics() throws Exception {
+        reset();
+        addRic("kista_1");
         String url = baseUrl() + "/rics";
         String rsp = this.restTemplate.getForObject(url, String.class);
         System.out.println(rsp);
@@ -138,8 +139,10 @@ public class ApplicationTest {
 
     @Test
     public void testGetRic() throws Exception {
+        reset();
         String url = baseUrl() + "/ric?managedElementId=kista_1";
         String rsp = this.restTemplate.getForObject(url, String.class);
+        System.out.println(rsp);
         assertThat(rsp).isEqualTo("ric1");
     }
 
@@ -169,6 +172,7 @@ public class ApplicationTest {
     private PolicyType addPolicyType(String policyTypeName, String ricName) {
         PolicyType type = ImmutablePolicyType.builder() //
             .name(policyTypeName) //
+            .schema("{\"title\":\"" + policyTypeName + "\"}") //
             .build();
 
         policyTypes.put(type);
@@ -181,7 +185,11 @@ public class ApplicationTest {
             return rics.get(ricName);
         }
         Vector<String> mes = new Vector<>();
-        RicConfig conf = ImmutableRicConfig.builder().name(ricName).baseUrl("baseUrl").managedElementIds(mes).build();
+        RicConfig conf = ImmutableRicConfig.builder() //
+            .name(ricName) //
+            .baseUrl("baseUrl") //
+            .managedElementIds(mes) //
+            .build();
         Ric ric = new Ric(conf);
         this.rics.put(ric);
         return ric;
@@ -243,26 +251,56 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicyTypes() throws Exception {
+    public void testGetPolicySchemas() throws Exception {
         reset();
         addPolicyType("type1", "ric1");
         addPolicyType("type2", "ric2");
 
-        String url = baseUrl() + "/policy_types";
+        String url = baseUrl() + "/policy_schemas";
         String rsp = this.restTemplate.getForObject(url, String.class);
+        System.out.println("*** " + rsp);
         assertThat(rsp).contains("type1");
         assertThat(rsp).contains("type2");
+        assertThat(rsp).contains("title");
 
-        List<PolicyTypeInfo> info = parseList(rsp, PolicyTypeInfo.class);
+        List<String> info = parseList(rsp, String.class);
         assertEquals(2, info.size());
 
-        url = baseUrl() + "/policy_types?ric=ric1";
+        url = baseUrl() + "/policy_schemas?ric=ric1";
         rsp = this.restTemplate.getForObject(url, String.class);
         assertThat(rsp).contains("type1");
-        info = parseList(rsp, PolicyTypeInfo.class);
+        info = parseList(rsp, String.class);
         assertEquals(1, info.size());
     }
 
+    @Test
+    public void testGetPolicySchema() throws Exception {
+        reset();
+        addPolicyType("type1", "ric1");
+        addPolicyType("type2", "ric2");
+
+        String url = baseUrl() + "/policy_schema?id=type1";
+        String rsp = this.restTemplate.getForObject(url, String.class);
+        System.out.println(rsp);
+        assertThat(rsp).contains("type1");
+        assertThat(rsp).contains("title");
+    }
+
+    @Test
+    public void testGetPolicyTypes() throws Exception {
+        reset();
+        addPolicyType("type1", "ric1");
+        addPolicyType("type2", "ric2");
+
+        String url = baseUrl() + "/policy_types";
+        String rsp = this.restTemplate.getForObject(url, String.class);
+        assertThat(rsp).isEqualTo("[\"type2\",\"type1\"]");
+
+        url = baseUrl() + "/policy_types?ric=ric1";
+        rsp = this.restTemplate.getForObject(url, String.class);
+        assertThat(rsp).isEqualTo("[\"type1\"]");
+    }
+
     @Test
     public void testGetPolicies() throws Exception {
         String url = baseUrl() + "/policies";