X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fportal%2Fnonrtric%2Fcontrolpanel%2Fmock%2FPolicyControllerMockConfiguration.java;h=d6476db9bf252fc98cdf742ba1ca9ae570fdea7e;hb=6b3b1b864dea5c5ed5154cf9a7210b672917feca;hp=e593736a8cf1f3b7f475133cb7554fd08bbf5b40;hpb=7c3b8301076b986c22dbec3287339f44b1c1a542;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/PolicyControllerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/PolicyControllerMockConfiguration.java
index e593736..d6476db 100644
--- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/PolicyControllerMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/PolicyControllerMockConfiguration.java
@@ -35,7 +35,6 @@ import java.util.Optional;
 import java.util.Vector;
 import java.util.stream.Collectors;
 
-import org.oransc.portal.nonrtric.controlpanel.model.ImmutablePolicyInfo;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyInfo;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyInstances;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyType;
@@ -154,8 +153,14 @@ public class PolicyControllerMockConfiguration {
         }
 
         void putInstance(String typeId, String instanceId, Object instanceData, String ric) {
-            PolicyInfo i = ImmutablePolicyInfo.builder().json(instanceData).lastModified(getTimeStampUTC())
-                .id(instanceId).ric(ric).service("service").type(typeId).build();
+            PolicyInfo i = PolicyInfo.builder() //
+                .policyData(instanceData) //
+                .lastModified(getTimeStampUTC()) //
+                .policyId(instanceId) //
+                .ricId(ric) //
+                .serviceId("service") //
+                .policyTypeId(typeId) //
+                .build(); //
             instances.put(instanceId, i);
         }
 
@@ -168,7 +173,7 @@ public class PolicyControllerMockConfiguration {
             if (i == null) {
                 throw new RestClientException("Type not found: " + id);
             }
-            return i.json();
+            return i.policyData;
         }
 
         public Collection<PolicyType> getTypes() {
@@ -179,7 +184,7 @@ public class PolicyControllerMockConfiguration {
             ArrayList<PolicyInfo> result = new ArrayList<>();
             for (PolicyInfo i : instances.values()) {
                 if (typeId.isPresent()) {
-                    if (i.type().equals(typeId.get())) {
+                    if (i.policyTypeId.equals(typeId.get())) {
                         result.add(i);
                     }