1 files changed, 46 insertions, 42 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/GroovyTestBase.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/GroovyTestBase.groovy
index 121583ec10..01ca53ba97 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/GroovyTestBase.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/GroovyTestBase.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-

-

-import org.camunda.bpm.engine.ProcessEngineServices

-import org.camunda.bpm.engine.RepositoryService

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.camunda.bpm.engine.repository.ProcessDefinition

-import org.camunda.bpm.engine.runtime.Execution

+
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.camunda.bpm.engine.runtime.Execution
 import org.junit.Before
-import org.junit.BeforeClass

-import org.junit.Rule

+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore

+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -41,14 +41,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.patch
 import static com.github.tomakehurst.wiremock.client.WireMock.put
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
-import static org.junit.Assert.*;

+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule

-

+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
 class GroovyTestBase {
 	
 	static final int PORT = 28090
@@ -60,20 +60,24 @@ class GroovyTestBase {
 	static final String ARID = "arId-1"
 	static final String VERS = "myvers"
 	
-	static final String DBGFLAG = "isDebugLogEnabled"

+	static final String DBGFLAG = "isDebugLogEnabled"
 	
 	static Properties urnProps = new Properties()
 	static String aaiUriPfx
 	
-	String processName

+	String processName
 
-	public static void setUpBeforeClass() {
+	static {
 		def fr = new FileReader("src/test/resources/mso.bpmn.urn.properties")
 		urnProps.load(fr)
 		fr.close()
-		
+
 		aaiUriPfx = urnProps.get("aai.endpoint")
 	}
+
+	public static void setUpBeforeClass() {
+		// moved to the above static block to get the static aaiUriPfx assignment correctly.
+	}
 	
 	public GroovyTestBase(String processName) {
 		this.processName = processName
@@ -88,37 +92,37 @@ class GroovyTestBase {
 		} catch(BpmnError e) {
 			return true;
 		}
-	}

-	

-	public ExecutionEntity setupMock() {

-		

-		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)

-		when(mockProcessDefinition.getKey()).thenReturn(processName)

-		RepositoryService mockRepositoryService = mock(RepositoryService.class)

-		when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)

-		when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn(processName)

-		when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")

-		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)

-		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)

-		

-		ExecutionEntity mex = mock(ExecutionEntity.class)

-		

-		when(mex.getId()).thenReturn("100")

-		when(mex.getProcessDefinitionId()).thenReturn(processName)

-		when(mex.getProcessInstanceId()).thenReturn(processName)

-		when(mex.getProcessEngineServices()).thenReturn(mockProcessEngineServices)

+	}
+	
+	public ExecutionEntity setupMock() {
+		
+		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+		when(mockProcessDefinition.getKey()).thenReturn(processName)
+		RepositoryService mockRepositoryService = mock(RepositoryService.class)
+		when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+		when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn(processName)
+		when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+		
+		ExecutionEntity mex = mock(ExecutionEntity.class)
+		
+		when(mex.getId()).thenReturn("100")
+		when(mex.getProcessDefinitionId()).thenReturn(processName)
+		when(mex.getProcessInstanceId()).thenReturn(processName)
+		when(mex.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
 		when(mex.getProcessEngineServices().getRepositoryService().getProcessDefinition(mex.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
 		
 		when(mex.getVariable("isAsyncProcess")).thenReturn("true")
-		when(mex.getVariable(processName+"WorkflowResponseSent")).thenReturn("false")

-		

-		return mex

+		when(mex.getVariable(processName+"WorkflowResponseSent")).thenReturn("false")
+		
+		return mex
 	}
 	
 	public Map<String,Object> setupMap(ExecutionEntity mex) {
 		MapSetter mapset = new MapSetter();
 		doAnswer(mapset).when(mex).setVariable(any(), any())
 		return mapset.getMap();
-	}

-		

+	}
+		
 }