MSO API Handler Infra test repair

Repairing a number of tests in ServiceInstancesTest.

Change-Id: Ic74015fb092433a0aa26d22ea726321d1c98efe3
Issue-ID: SO-489
Signed-off-by: Arthur Martella <amartell@research.att.com>

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
index dba562e..fc8e8d9 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
@@ -985,7 +985,7 @@ public class ServiceInstances {
                }
                //if an aLaCarte flag was sent in the request, throw an error if the recipe was not found
                RequestParameters reqParam = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters();
-               if(reqParam!=null && reqParam.isaLaCarte() && recipe==null){
+               if(reqParam!=null && reqParam.isaLaCarte()!=null && reqParam.isaLaCarte() && recipe==null){
                        return null;
                }
 

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
index d8996a9..28cb51a 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
@@ -99,7 +99,6 @@ public class ServiceInstanceTest {
             "Locked instance - This service (testService) already has a request being worked with a status of null (RequestId - null). The existing request must finish or be cleaned up before proceeding."));\r
        }\r
        \r
-       @Ignore // 1802 merge\r
        @Test\r
        public void createServiceInstanceTestDBException(){\r
                new MockUp<RequestsDatabase>() {\r
@@ -134,7 +133,7 @@ public class ServiceInstanceTest {
                                + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\",\"instanceName\": \"testService\"},\"requestParameters\": { \"autoBuildVfModules\": false,\"subscriptionServiceType\": \"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
                Response resp = instance.createServiceInstance(requestJson, "v2");\r
                String respBody = resp.getEntity().toString();\r
-               assertTrue(respBody.contains("Exception while creating record in DB null"));\r
+               assertTrue(respBody.contains("Exception while creating record in DB") && respBody.contains("NullPointerException"));\r
        }\r
        \r
        @Ignore // 1802 merge\r
@@ -179,10 +178,9 @@ public class ServiceInstanceTest {
                                + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\",\"instanceName\": \"testService\"},\"requestParameters\": { \"autoBuildVfModules\": false,\"subscriptionServiceType\": \"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
                Response resp = instance.createServiceInstance(requestJson, "v2");\r
                String respBody = resp.getEntity().toString();\r
-               assertTrue(respBody.contains("Failed calling bpmn properties"));\r
+               assertTrue(respBody.contains("Failed calling bpmn properties"));  // was: Request Failed due to BPEL error\r
        }\r
        \r
-       @Ignore // 1802 merge\r
        @Test(expected = Exception.class)\r
        public void createServiceInstanceTest200Http(){\r
                new MockUp<RequestsDatabase>() {\r
@@ -253,7 +251,6 @@ public class ServiceInstanceTest {
                String respBody = resp.getEntity().toString();\r
        }\r
        \r
-       @Ignore // 1802 merge\r
        @Test\r
        public void createServiceInstanceTest500Http(){\r
                new MockUp<RequestsDatabase>() {\r
@@ -396,7 +393,6 @@ public class ServiceInstanceTest {
                assertTrue(respBody.contains("No valid modelVersionId is specified"));\r
        }\r
        \r
-       @Ignore // 1802 merge\r
        @Test\r
        public void createServiceInstanceTestNullHttpResp(){\r
                new MockUp<RequestsDatabase>() {\r
@@ -592,7 +588,7 @@ public class ServiceInstanceTest {
                                +"\"networkInstanceId\":\"1882937\","\r
                                +"\"volumeGroupInstanceId\":\"1882935\","\r
                                +"\"vfModuleInstanceId\":\"1882934\","\r
-                               + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": false},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\"}}}";\r
+                               + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": false,\"subscriptionServiceType\":\"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\"}}}";\r
                Response resp = instance.createServiceInstance(requestJson, "v2");\r
                String respBody = resp.getEntity().toString();\r
                assertTrue(respBody.contains("Error parsing request.") && respBody.contains("No valid modelName is specified"));\r
@@ -607,7 +603,7 @@ public class ServiceInstanceTest {
                                +"\"networkInstanceId\":\"1882937\","\r
                                +"\"volumeGroupInstanceId\":\"1882935\","\r
                                +"\"vfModuleInstanceId\":\"1882934\","\r
-                               + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": true},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
+                               + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": true,\"subscriptionServiceType\":\"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
                Response resp = instance.createServiceInstance(requestJson, "v2");\r
                String respBody = resp.getEntity().toString();\r
                assertTrue(respBody.contains("Error parsing request.") && respBody.contains("AutoBuildVfModule is not valid in the v2 version"));\r
@@ -689,7 +685,6 @@ public class ServiceInstanceTest {
                assertTrue(respStr.contains("Error parsing request.") && respStr.contains("No valid serviceInstanceId matching the serviceInstanceId in request URI is specified"));\r
        }\r
 \r
-       @Ignore // 1802 merge\r
        @Test\r
        public void activateServiceInstanceTestNormal(){\r
                ServiceInstances instance = new ServiceInstances();\r
@@ -743,7 +738,6 @@ public class ServiceInstanceTest {
                assertTrue(respStr.contains("Error parsing request.") && respStr.contains("No valid serviceInstanceId matching the serviceInstanceId in request URI is specified"));\r
        }\r
        \r
-       @Ignore // 1802 merge\r
        @Test\r
        public void deactivateServiceInstanceTestNormal(){\r
                ServiceInstances instance = new ServiceInstances();\r
@@ -797,7 +791,6 @@ public class ServiceInstanceTest {
                assertTrue(respStr.contains("Error parsing request.") && respStr.contains("No valid modelVersionId is specified"));\r
        }\r
        \r
-       @Ignore // 1802 merge\r
        @Test\r
        public void deleteServiceInstanceTestNormal(){\r
                ServiceInstances instance = new ServiceInstances();\r
@@ -961,7 +954,6 @@ public class ServiceInstanceTest {
        }\r
        \r
        /*** Replace Vnf Instance Test Cases ***/\r
-       @Ignore\r
        @Test\r
        public void replaceVNFInstanceTestNormal(){\r
                ServiceInstances instance = new ServiceInstances();\r
@@ -996,7 +988,6 @@ public class ServiceInstanceTest {
        \r
        /*** Update Vnf Instance Test Cases ***/\r
 \r
-       @Ignore\r
        @Test\r
        public void deleteVNFInstanceTestNormal(){\r
                ServiceInstances instance = new ServiceInstances();\r