Merge "Remove unneeded param type definition"

[so.git] / bpmn / MSOInfrastructureBPMN / src / test / groovy / org / openecomp / mso / bpmn / vcpe / scripts / DoDeleteAllottedResourceTXCTest.groovy

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 97f714d..115f298 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
@@ -24,7 +24,6 @@ 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
@@ -65,7 +64,7 @@ class DoDeleteAllottedResourceTXCTest extends GroovyTestBase {
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
+               // nothing for now
        }
          
     @Before
@@ -197,8 +196,10 @@ class DoDeleteAllottedResourceTXCTest extends GroovyTestBase {
                assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0)
                assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0)
                assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0)
-               assertTrue(result.indexOf("<service-instance-id>psii</") >= 0)
+               assertTrue(result.indexOf("<service-instance-id>sii</") >= 0)
                assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0)
+               assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0)
+               assertTrue(result.indexOf("<global-customer-id>gci</") >= 0)
                assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0)
                assertTrue(result.indexOf("<request-id>mri</") >= 0)
                assertTrue(result.indexOf("<model-invariant-uuid/>") >= 0)
@@ -572,6 +573,8 @@ class DoDeleteAllottedResourceTXCTest extends GroovyTestBase {
                when(mex.getVariable("allottedResourceId")).thenReturn("ari")
                when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
                when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
+               when(mex.getVariable("subscriptionServiceType")).thenReturn("sst")
+               when(mex.getVariable("globalCustomerId")).thenReturn("gci")
                when(mex.getVariable("sdncCallbackUrl")).thenReturn("scu")
                when(mex.getVariable("msoRequestId")).thenReturn("mri")
        }