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%2Fconfig%2FPolicyControllerMockConfiguration.java;h=6fb657b24acd87230ede983ace9a488755c92756;hb=b7a1bd777a4880ea236b609b398757086f0686f6;hp=ff17d06ee74dce42193e1d7b932a53012e75656d;hpb=2e425bc51a5e8cb865db1e35e11ebe9240f72397;p=portal%2Fnonrtric-controlpanel.git diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java index ff17d06..6fb657b 100644 --- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java +++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java @@ -21,7 +21,6 @@ package org.oransc.portal.nonrtric.controlpanel.config; import com.google.gson.GsonBuilder; - import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; @@ -34,7 +33,6 @@ import java.util.Map; 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; @@ -79,13 +77,13 @@ public class PolicyControllerMockConfiguration { public ResponseEntity putPolicy(String policyTypeIdString, String policyInstanceId, Object json, String ric) { database.putInstance(policyTypeIdString, policyInstanceId, json, ric); - return new ResponseEntity<>("Policy was put successfully", HttpStatus.OK); + return new ResponseEntity<>(HttpStatus.OK); } @Override public ResponseEntity deletePolicy(String policyInstanceId) { database.deleteInstance(policyInstanceId); - return new ResponseEntity<>("Policy was deleted successfully", HttpStatus.NO_CONTENT); + return new ResponseEntity<>(HttpStatus.OK); } @Override @@ -116,8 +114,11 @@ public class PolicyControllerMockConfiguration { class Database { Database() { + PolicyType policyType = new PolicyType("", "{}"); + types.put("", policyType); + String schema = getStringFromFile("demo-policy-schema-1.json"); - PolicyType policyType = new PolicyType("type2", schema); + policyType = new PolicyType("type2", schema); types.put("type2", policyType); schema = getStringFromFile("demo-policy-schema-2.json"); @@ -127,6 +128,8 @@ public class PolicyControllerMockConfiguration { schema = getStringFromFile("demo-policy-schema-3.json"); policyType = new PolicyType("type4", schema); types.put("type4", policyType); + + putInstance("", "123", "{\"data\":\"data\"}", "ric_1"); } private String getStringFromFile(String path) {