Fix the super keyword misuse

Remove the super keyword misuse, and create a static method
for the correct assignment

Change-Id: I7048d45c709520788eca53c8275af508d0c4a9a8
Issue-ID: SO-292
Signed-off-by: byungwoojun<byung-woo.jun@ericsson.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
index 7005042..3b97cad 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -41,7 +41,7 @@ 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.*;\r
+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.domain.ServiceDecomposition
@@ -53,28 +53,27 @@ import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapGetter
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
 class CreateVcpeResCustServiceTest extends GroovyTestBase {
        
-       private static String request\r
-       \r
-       @Rule\r
+       private static String request
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
+
        String Prefix = "CVRCS_"
-       String RbType = "DCRENI_"\r
+       String RbType = "DCRENI_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
                request = FileUtil.readResourceFile("__files/VCPE/CreateVcpeResCustService/request.json")
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public CreateVcpeResCustServiceTest() {
@@ -82,19 +81,19 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-       // @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+       // @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
                initPreProcess(mex)
-               \r
-               CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()\r
-               CreateVcpeResCustService.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
+               
+               CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
+               CreateVcpeResCustService.preProcessRequest(mex)
+
+               verify(mex).getVariable(DBGFLAG)
                verify(mex).setVariable("prefix", Prefix)
                verify(mex).setVariable("aaiDistDelay", "aaidelay")
                verify(mex).setVariable("createVcpeServiceRequest", request)
@@ -115,7 +114,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                
                def reqinfo = map.get(Prefix+"requestInfo")
                assertTrue(reqinfo.indexOf("<request-id>mri</") >= 0)
-               assertTrue(reqinfo.indexOf("<source>VID</") >= 0)\r
+               assertTrue(reqinfo.indexOf("<source>VID</") >= 0)
        }
                        
        @Test
@@ -1260,6 +1259,6 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        
        private initProcessJavaException(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
-       }\r
-               \r
+       }
+               
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
index 65c9e45..af56f34 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -41,7 +41,7 @@ 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.*;\r
+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.domain.ServiceDecomposition
@@ -53,28 +53,27 @@ import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapGetter
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
 class DeleteVcpeResCustServiceTest extends GroovyTestBase {
        
-       private static String request\r
-       \r
-       @Rule\r
+       private static String request
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
+
        String Prefix = "DVRCS_"
-       String RbType = "DCRENI_"\r
+       String RbType = "DCRENI_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
                request = FileUtil.readResourceFile("__files/VCPE/DeleteVcpeResCustService/request.json")
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public DeleteVcpeResCustServiceTest() {
@@ -82,18 +81,18 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-//     @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+//     @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
                initPreProcess(mex)
-               \r
-               DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()\r
-               DeleteVcpeResCustService.preProcessRequest(mex)\r
-\r
+               
+               DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+               DeleteVcpeResCustService.preProcessRequest(mex)
+
                verify(mex).getVariable(DBGFLAG)
                
                assertEquals(Prefix, map.get("prefix"))
@@ -116,7 +115,7 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
                
                def reqinfo = map.get(Prefix+"requestInfo")
                assertTrue(reqinfo.indexOf("<request-id>mri</") >= 0)
-               assertTrue(reqinfo.indexOf("<source>VID</") >= 0)\r
+               assertTrue(reqinfo.indexOf("<source>VID</") >= 0)
        }
                        
        @Test
@@ -771,5 +770,5 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
                                                .withStatus(status)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("VCPE/DeleteVcpeResCustService/" + fileResp)));
-       }\r
+       }
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollbackTest.groovy
index af532e7..bbe9d52 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollbackTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollbackTest.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -39,7 +39,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
 import static com.github.tomakehurst.wiremock.client.WireMock.get
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteAllottedResource
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
@@ -47,25 +47,25 @@ import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchAllottedResou
 
 import org.openecomp.mso.bpmn.core.RollbackData
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
-class DoCreateAllottedResourceBRGRollbackTest extends GroovyTestBase {\r
-       \r
-       @Rule\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+class DoCreateAllottedResourceBRGRollbackTest extends GroovyTestBase {
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
+
        String Prefix = "DCARBRGRB_"
-       String RbType = "DCARBRG_"\r
+       String RbType = "DCARBRG_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
+               // nothing for now
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public DoCreateAllottedResourceBRGRollbackTest() {
@@ -73,18 +73,18 @@ class DoCreateAllottedResourceBRGRollbackTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-//     @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+//     @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
-               \r
-               DoCreateAllottedResourceBRGRollback DoCreateAllottedResourceBRGRollback = new DoCreateAllottedResourceBRGRollback()\r
-               DoCreateAllottedResourceBRGRollback.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
+               
+               DoCreateAllottedResourceBRGRollback DoCreateAllottedResourceBRGRollback = new DoCreateAllottedResourceBRGRollback()
+               DoCreateAllottedResourceBRGRollback.preProcessRequest(mex)
+
+               verify(mex).getVariable(DBGFLAG)
                verify(mex).setVariable("prefix", Prefix)
                verify(mex).setVariable("serviceInstanceId", "sii")
                verify(mex).setVariable("parentServiceInstanceId", "psii")
@@ -99,7 +99,7 @@ class DoCreateAllottedResourceBRGRollbackTest extends GroovyTestBase {
                verify(mex).setVariable("sdncDeleteRequest", "createreq")
                verify(mex).setVariable("sdncUnassignRequest", "assignreq")
                
-               verify(mex, never()).setVariable("skipRollback", true)\r
+               verify(mex, never()).setVariable("skipRollback", true)
        }
                        
        @Test
@@ -648,6 +648,6 @@ class DoCreateAllottedResourceBRGRollbackTest extends GroovyTestBase {
        
        private initProcessRollbackJavaException(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
-       }\r
-               \r
+       }
+               
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
index 89c13f1..acc6970 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -39,7 +39,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
 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.*;\r
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchAllottedResource
@@ -49,24 +49,24 @@ import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutAllottedResourc
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
 class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
-       \r
-       @Rule\r
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
-       String Prefix = "DCARBRG_"\r
+
+       String Prefix = "DCARBRG_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
+               // nothing for now
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public DoCreateAllottedResourceBRGTest() {
@@ -74,19 +74,19 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-//     @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+//     @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
-               \r
-               DoCreateAllottedResourceBRG DoCreateAllottedResourceBRG = new DoCreateAllottedResourceBRG()\r
-               DoCreateAllottedResourceBRG.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
-               verify(mex).setVariable("prefix", Prefix)\r
+               
+               DoCreateAllottedResourceBRG DoCreateAllottedResourceBRG = new DoCreateAllottedResourceBRG()
+               DoCreateAllottedResourceBRG.preProcessRequest(mex)
+
+               verify(mex).getVariable(DBGFLAG)
+               verify(mex).setVariable("prefix", Prefix)
                                
                assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
                assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
@@ -97,7 +97,7 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
                assertTrue(checkMissingPreProcessRequest("vgmuxBearerIP"))
                assertTrue(checkMissingPreProcessRequest("brgWanMacAddress"))
                assertTrue(checkMissingPreProcessRequest("allottedResourceRole"))
-               assertTrue(checkMissingPreProcessRequest("allottedResourceType"))\r
+               assertTrue(checkMissingPreProcessRequest("allottedResourceType"))
        }
        
        
@@ -992,6 +992,6 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
        private initUpdateAaiAROrchStatus(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
                when(mex.getVariable("aaiARPath")).thenReturn(aaiUriPfx + "/aai/v9/business/customers/customer/"+CUST+"/service-subscriptions/service-subscription/"+SVC+"/service-instances/service-instance/"+INST+"/allotted-resources/allotted-resource/"+ARID)
-       }\r
-               \r
+       }
+               
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollbackTest.groovy
index e5635de..02352cf 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollbackTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollbackTest.groovy
@@ -59,7 +59,7 @@ class DoCreateAllottedResourceTXCRollbackTest extends GroovyTestBase {
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
+               // nothing for now
        }
          
     @Before

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
index b27e368..2de6e44 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -39,7 +39,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
 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.*;\r
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchAllottedResource
@@ -51,28 +51,24 @@ import java.util.Map
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
-class DoCreateAllottedResourceTXCTest extends GroovyTestBase {\r
-       \r
-       @Rule\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
-       String Prefix = "DCARTXC_"\r
+
+       String Prefix = "DCARTXC_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               def fr = new FileReader("src/test/resources/mso.bpmn.urn.properties")
-               urnProps.load(fr)
-               fr.close()
-               
-               aaiUriPfx = urnProps.get("aai.endpoint")
+               // nothing for now
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public DoCreateAllottedResourceTXCTest() {
@@ -80,19 +76,19 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-       // @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+       // @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
-               \r
-               DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()\r
-               DoCreateAllottedResourceTXC.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
-               verify(mex).setVariable("prefix", Prefix)\r
+               
+               DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()
+               DoCreateAllottedResourceTXC.preProcessRequest(mex)
+
+               verify(mex).getVariable(DBGFLAG)
+               verify(mex).setVariable("prefix", Prefix)
                                
                assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
                assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
@@ -101,7 +97,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
                assertTrue(checkMissingPreProcessRequest("allottedResourceModelInfo"))
                assertTrue(checkMissingPreProcessRequest("brgWanMacAddress"))
                assertTrue(checkMissingPreProcessRequest("allottedResourceRole"))
-               assertTrue(checkMissingPreProcessRequest("allottedResourceType"))\r
+               assertTrue(checkMissingPreProcessRequest("allottedResourceType"))
        }
        
        
@@ -950,6 +946,6 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        private initUpdateAaiAROrchStatus(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
                when(mex.getVariable("aaiARPath")).thenReturn(aaiUriPfx + "/aai/v9/business/customers/customer/"+CUST+"/service-subscriptions/service-subscription/"+SVC+"/service-instances/service-instance/"+INST+"/allotted-resources/allotted-resource/"+ARID)
-       }\r
-               \r
+       }
+               
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy
index ec65347..4e62a56 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -42,7 +42,7 @@ 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.*;\r
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteAllottedResource
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
@@ -54,24 +54,24 @@ import java.util.Map
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
-class DoDeleteAllottedResourceBRGTest extends GroovyTestBase {\r
-       \r
-       @Rule\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+class DoDeleteAllottedResourceBRGTest extends GroovyTestBase {
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
-       String Prefix = "DDARBRG_"\r
+
+       String Prefix = "DDARBRG_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
+               // nothing for now
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public DoDeleteAllottedResourceBRGTest() {
@@ -79,24 +79,24 @@ class DoDeleteAllottedResourceBRGTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-//     @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+//     @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
-               \r
-               DoDeleteAllottedResourceBRG DoDeleteAllottedResourceBRG = new DoDeleteAllottedResourceBRG()\r
-               DoDeleteAllottedResourceBRG.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
+               
+               DoDeleteAllottedResourceBRG DoDeleteAllottedResourceBRG = new DoDeleteAllottedResourceBRG()
+               DoDeleteAllottedResourceBRG.preProcessRequest(mex)
+
+               verify(mex).getVariable(DBGFLAG)
                verify(mex).setVariable("prefix", Prefix)
-               verify(mex).setVariable("sdncCallbackUrl", "sdncurn")\r
+               verify(mex).setVariable("sdncCallbackUrl", "sdncurn")
                                
                assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
                assertTrue(checkMissingPreProcessRequest("serviceInstanceId"))
-               assertTrue(checkMissingPreProcessRequest("allottedResourceId"))\r
+               assertTrue(checkMissingPreProcessRequest("allottedResourceId"))
        }
                        
        @Test
@@ -599,6 +599,6 @@ class DoDeleteAllottedResourceBRGTest extends GroovyTestBase {
                when(mex.getVariable("aaiARPath")).thenReturn(aaiUriPfx + "/aai/v9/business/customers/customer/"+CUST+"/service-subscriptions/service-subscription/"+SVC+"/service-instances/service-instance/"+INST+"/allotted-resources/allotted-resource/"+ARID)
                when(mex.getVariable("aaiARResourceVersion")).thenReturn("myvers")
                when(mex.getVariable("URN_aai_endpoint")).thenReturn(aaiUriPfx)
-       }\r
-               \r
+       }
+               
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy
index adf6313..33273c5 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy
@@ -65,7 +65,7 @@ class DoDeleteAllottedResourceTXCTest extends GroovyTestBase {
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
+               // nothing for now
        }
          
     @Before

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 121583e..01ca53b 100644 (file)
--- 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
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+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\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+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.*;\r
+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\r
-\r
+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"\r
+       static final String DBGFLAG = "isDebugLogEnabled"
        
        static Properties urnProps = new Properties()
        static String aaiUriPfx
        
-       String processName\r
+       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;
                }
-       }\r
-       \r
-       public ExecutionEntity setupMock() {\r
-               \r
-               ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)\r
-               when(mockProcessDefinition.getKey()).thenReturn(processName)\r
-               RepositoryService mockRepositoryService = mock(RepositoryService.class)\r
-               when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)\r
-               when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn(processName)\r
-               when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")\r
-               ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)\r
-               when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)\r
-               \r
-               ExecutionEntity mex = mock(ExecutionEntity.class)\r
-               \r
-               when(mex.getId()).thenReturn("100")\r
-               when(mex.getProcessDefinitionId()).thenReturn(processName)\r
-               when(mex.getProcessInstanceId()).thenReturn(processName)\r
-               when(mex.getProcessEngineServices()).thenReturn(mockProcessEngineServices)\r
+       }
+       
+       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")\r
-               \r
-               return mex\r
+               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();
-       }\r
-               \r
+       }
+               
 }