summaryrefslogtreecommitdiffstats
path: root/POLICY-SDK-APP/src
diff options
context:
space:
mode:
authorMichael Mokry <mm117s@att.com>2018-04-02 00:34:56 -0500
committerMichael Mokry <mm117s@att.com>2018-04-02 00:38:57 -0500
commitc2a62b0884e64c5dae3da64c034807cd2b98bccb (patch)
tree5ee1c44d3de9924f2e932b9e769b0d07ab1013d0 /POLICY-SDK-APP/src
parent3387ae275aeb64113d48cd67b44db217b67e598e (diff)
Support CSIT tests for OOF Policy
I added an INSERT to the sql upgrade file and some sonar fixes and Junits Change-Id: I37139d5a8ad78d9d46ee01f81c2edd052672712e Issue-ID: POLICY-639 Signed-off-by: Michael Mokry <mm117s@att.com>
Diffstat (limited to 'POLICY-SDK-APP/src')
-rw-r--r--POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java10
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js2
-rw-r--r--POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java8
-rw-r--r--POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml (renamed from POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml)0
4 files changed, 12 insertions, 8 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
index 4ae13443d..a45bfed57 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
@@ -97,10 +97,6 @@ public class CreateOptimizationController extends RestrictedBaseController {
return commonClassDao;
}
- public static void setCommonClassDao(CommonClassDao commonClassDao) {
- CreateOptimizationController.commonClassDao = commonClassDao;
- }
-
private OptimizationModels newModel;
private String newFile;
private String directory;
@@ -130,6 +126,10 @@ public class CreateOptimizationController extends RestrictedBaseController {
@Autowired
private CreateOptimizationController(CommonClassDao commonClassDao){
+ setCommonClassDao(commonClassDao);
+ }
+
+ public static void setCommonClassDao(CommonClassDao commonClassDao) {
CreateOptimizationController.commonClassDao = commonClassDao;
}
@@ -595,7 +595,7 @@ public class CreateOptimizationController extends RestrictedBaseController {
}
@RequestMapping(value={"/oof_dictionary/set_ModelData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
- public void SetModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{
+ public void setModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{
modelList = new ArrayList<>();
dirDependencyList = new ArrayList<>();
classMap = new LinkedHashMap<>();
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
index e499c9ff5..cbd011f2e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
@@ -73,7 +73,7 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
console.log("failed");
});
- PolicyAppService.getData('get_PriorityValues').then(function (data) {
+ PolicyAppService.getData('get_DCAEPriorityValues').then(function (data) {
var j = data;
$scope.data = JSON.parse(j.data);
console.log($scope.data);
diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java
index af573c616..35395a859 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java
@@ -386,8 +386,10 @@ public class CreateOptimizationControllerTest {
public void testSetModelData() {
logger.debug("testSetModelData: enter");
-
+
+ CreateOptimizationController controller = new CreateOptimizationController();
HttpServletRequest request = createMock(HttpServletRequest.class);
+ MockHttpServletResponse response = new MockHttpServletResponse();
expect(request.getContentType()).andReturn("multipart/form-data; boundary=----WebKitFormBoundaryWcRUaIbC8kXgjr3p");
expect(request.getMethod()).andReturn("post");
expect(request.getHeader("Content-length")).andReturn("7809");
@@ -407,12 +409,14 @@ public class CreateOptimizationControllerTest {
expect(request.getCharacterEncoding()).andReturn("UTF-8");
expect(request.getContentLength()).andReturn(1024);
replay(request);
-
+ controller.setModelData(request, response);
+
} catch (Exception e) {
logger.error("testSetModelData" + e);
e.printStackTrace();
}
+
logger.debug("testSetModelData: exit");
}
diff --git a/POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml b/POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml
index 0c30ceea0..0c30ceea0 100644
--- a/POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml
+++ b/POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml