Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Reorder modifiers"
[so.git] / bpmn / MSOInfrastructureBPMN / src / test / groovy / org / openecomp / mso / bpmn / vcpe / scripts / CreateVcpeResCustServiceTest.groovy
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..a8401d7 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,21 +18,21 @@
  * ============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.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.core.domain.HomingSolution
 import org.openecomp.mso.bpmn.mock.FileUtil
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
@@ -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 // 1802 merge
+       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)
@@ -110,12 +109,14 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                assertTrue(map.containsKey("subscriberInfo"))
                
                verify(mex).setVariable("brgWanMacAddress", "brgmac")
+               verify(mex).setVariable("customerLocation", ["customerLatitude":"32.897480", "customerLongitude":"-97.040443", "customerName":"some_company"])
+               verify(mex).setVariable("homingService", "sniro")
                assertTrue(map.containsKey("serviceInputParams"))
                assertTrue(map.containsKey(Prefix+"requestInfo"))
                
                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
@@ -133,7 +134,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-       // @Ignore  
+       @Ignore // 1802 merge
        public void preProcessRequest_EmptyParts() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -142,6 +143,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                def req = request
                                        .replace('"source"', '"sourceXXX"')
                                        .replace('"BRG_WAN_MAC_Address"', '"BRG_WAN_MAC_AddressXXX"')
+                                       .replace('"Customer_Location"', '"Customer_LocationXXX"')
                
                when(mex.getVariable("bpmnRequest")).thenReturn(req)
                when(mex.getVariable("serviceInstanceId")).thenReturn(null)
@@ -165,6 +167,8 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                assertTrue(map.containsKey("subscriberInfo"))
                
                assertEquals("", map.get("brgWanMacAddress"))
+               assertEquals("", map.get("customerLocation"))
+               assertEquals("oof", map.get("homingService"))
                assertTrue(map.containsKey("serviceInputParams"))
                assertTrue(map.containsKey(Prefix+"requestInfo"))
                
@@ -465,7 +469,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                verify(mex).setVariable("createTXCAR", true)
                verify(mex).setVariable("allottedResourceModelInfoTXC", "modelB")
                verify(mex).setVariable("allottedResourceRoleTXC", "TXCr")
-               verify(mex).setVariable("allottedResourceTypeTXC", "TunnelXConn")
+               verify(mex).setVariable("allottedResourceTypeTXC", "Tunnel XConn")
                verify(mex).setVariable("parentServiceInstanceIdTXC", "homeB")
        }
                        
@@ -485,7 +489,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                verify(mex, never()).setVariable("createTXCAR", true)
                verify(mex, never()).setVariable("allottedResourceModelInfoTXC", "modelB")
                verify(mex, never()).setVariable("allottedResourceRoleTXC", "TXCr")
-               verify(mex, never()).setVariable("allottedResourceTypeTXC", "TunnelXConn")
+               verify(mex, never()).setVariable("allottedResourceTypeTXC", "Tunnel XConn")
                verify(mex, never()).setVariable("parentServiceInstanceIdTXC", "homeB")
        }
                        
@@ -1083,7 +1087,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        private ServiceDecomposition initFilterVnfs(ExecutionEntity mex) {
                List<VnfResource> vnflst = new LinkedList<>()
                vnflst.add(makeVnf("", "BRG"))
-               vnflst.add(makeVnf("2", "TunnelXConn"))
+               vnflst.add(makeVnf("2", "Tunnel XConn"))
                vnflst.add(makeVnf("3", ""))
                vnflst.add(makeVnf("4", "BRG"))
                vnflst.add(makeVnf("5", "other"))
@@ -1145,7 +1149,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                HomingSolution home = mock(HomingSolution.class)
                
                when(ar.toJsonStringNoRootName()).thenReturn("json"+id)
-               when(ar.getAllottedResourceType()).thenReturn("TunnelXConn")
+               when(ar.getAllottedResourceType()).thenReturn("Tunnel XConn")
                when(ar.getModelInfo()).thenReturn(mod)
                when(ar.getAllottedResourceRole()).thenReturn("TXCr")
                when(ar.getHomingSolution()).thenReturn(home)
@@ -1182,7 +1186,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                vnflst.add(makeVnf("A", "BRG"))
                vnflst.add(makeVnf("B", ""))
                vnflst.add(makeVnf("C", ""))
-               vnflst.add(makeVnf("D", "TunnelXConn"))
+               vnflst.add(makeVnf("D", "Tunnel XConn"))
                
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
                when(mex.getVariable("createVcpeServiceRequest")).thenReturn(request)
@@ -1260,6 +1264,6 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        
        private initProcessJavaException(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
-       }\r
-               \r
+       }
+               
 }
Service Orchestrator