Merge "added additional mock to MsoGroovyTest"

1 files changed, 69 insertions, 66 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoGroovyTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoGroovyTest.groovy
index de44caa120..525307a5df 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoGroovyTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoGroovyTest.groovy
@@ -1,22 +1,22 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 
 package org.onap.so.bpmn.common.scripts
 
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
 import org.onap.aai.domain.yang.GenericVnf
 import org.onap.so.bpmn.mock.FileUtil
+import org.onap.so.client.HttpClient
 import org.onap.so.client.aai.AAIObjectPlurals
 import org.onap.so.client.aai.AAIObjectType
 import org.onap.so.client.aai.AAIResourcesClient
@@ -47,54 +48,56 @@ abstract class MsoGroovyTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none()
 
-	protected ExecutionEntity mockExecution
-	protected AAIResourcesClient client
+    protected ExecutionEntity mockExecution
+    protected AAIResourcesClient client
     protected AllottedResourceUtils allottedResourceUtils_MOCK
-	protected final String SEARCH_RESULT_AAI_WITH_RESULTDATA =
-			FileUtil.readResourceFile("__files/aai/searchResults.json")
-	protected static final String CLOUD_OWNER = Defaults.CLOUD_OWNER.toString();
-
-	protected void init(String procName){
-		mockExecution = setupMock(procName)
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-		client = mock(AAIResourcesClient.class)
-	}
-
-	protected ExecutionEntity setupMock(String procName) {
-		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
-		when(mockProcessDefinition.getKey()).thenReturn(procName)
-		
-		RepositoryService mockRepositoryService = mock(RepositoryService.class)
-		when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
-		when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn(procName)
-		when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
-		
-		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
-		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
-		
-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
-		when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
-		
-		return mockExecution
-	}
-	
-	protected ExecutionEntity setupMockWithPrefix(String procName, String prefix) {
-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
-
-		when(mockExecution.getVariable("prefix")).thenReturn(prefix)
-
-		ProcessEngineServices processEngineServices = mock(ProcessEngineServices.class)
-		RepositoryService repositoryService = mock(RepositoryService.class)
-		ProcessDefinition processDefinition = mock(ProcessDefinition.class)
-
-		when(mockExecution.getProcessEngineServices()).thenReturn(processEngineServices)
-		when(processEngineServices.getRepositoryService()).thenReturn(repositoryService)
-		when(repositoryService.getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(processDefinition)
-		when(processDefinition.getKey()).thenReturn(procName)
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-		return mockExecution
-	}
-	
+    protected final String SEARCH_RESULT_AAI_WITH_RESULTDATA =
+    FileUtil.readResourceFile("__files/aai/searchResults.json")
+    protected static final String CLOUD_OWNER = Defaults.CLOUD_OWNER.toString();
+
+    protected void init(String procName){
+        mockExecution = setupMock(procName)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        client = mock(AAIResourcesClient.class)
+    }
+
+    protected ExecutionEntity setupMock(String procName) {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn(procName)
+
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn(procName)
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+
+        HttpClient httpClient = mock(HttpClient.class)
+
+        return mockExecution
+    }
+
+    protected ExecutionEntity setupMockWithPrefix(String procName, String prefix) {
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+
+        when(mockExecution.getVariable("prefix")).thenReturn(prefix)
+
+        ProcessEngineServices processEngineServices = mock(ProcessEngineServices.class)
+        RepositoryService repositoryService = mock(RepositoryService.class)
+        ProcessDefinition processDefinition = mock(ProcessDefinition.class)
+
+        when(mockExecution.getProcessEngineServices()).thenReturn(processEngineServices)
+        when(processEngineServices.getRepositoryService()).thenReturn(repositoryService)
+        when(repositoryService.getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(processDefinition)
+        when(processDefinition.getKey()).thenReturn(procName)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        return mockExecution
+    }
+
     protected <T> Optional<T> getAAIObjectFromJson(Class<T> clazz , String file){
         String json = FileUtil.readResourceFile(file)
         AAIResultWrapper resultWrapper = new AAIResultWrapper(json)