11/7: merge casablanca to master

[so.git] / bpmn / so-bpmn-building-blocks / src / test / java / org / onap / so / bpmn / infrastructure / bpmn / subprocess / HomingBBTest.java

diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/buildingblock/SniroHomingV2BBTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/HomingBBTest.java
similarity index 63%
rename from bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/buildingblock/SniroHomingV2BBTest.java
rename to bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/HomingBBTest.java
index d4496d3..5162b83 100644 (file)
--- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/buildingblock/SniroHomingV2BBTest.java
+++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/HomingBBTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,55 +18,40 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.bpmn.buildingblock;
+package org.onap.so.bpmn.infrastructure.bpmn.subprocess;
 
-import static org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareAssertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.camunda.bpm.engine.test.assertions.ProcessEngineAssertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 
 import org.camunda.bpm.engine.delegate.BpmnError;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.onap.so.bpmn.BaseBPMNTest;
 import org.onap.so.bpmn.buildingblock.SniroHomingV2;
 import org.onap.so.bpmn.common.BuildingBlockExecution;
-import org.onap.so.BaseTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 
-@Ignore //these test run locally but fail when ran in conjunction with others in jenkins
-public class SniroHomingV2BBTest extends BaseTest{
-
-       @MockBean
-       protected SniroHomingV2 sniroHoming;
+public class HomingBBTest extends BaseBPMNTest{
 
        @Test
        public void testHomingV2_success(){
                mockSubprocess("ReceiveWorkflowMessage", "Mock ReceiveWorkflowMessage", "GenericStub");
-               ProcessInstance pi = runtimeService.startProcessInstanceByKey("HomingV2", variables);
+               ProcessInstance pi = runtimeService.startProcessInstanceByKey("HomingBB", variables);
                assertThat(pi).isNotNull();
-               assertThat(pi).isStarted().hasPassedInOrder("start", "callSniro", "callReceiveAsync", "processSolution", "end");
+               assertThat(pi).isStarted().hasPassedInOrder("start", "sniroOofCheck", "callSniro", "ExclusiveGateway_1ckp059", "receiveAsyncCallback", "sniroOofCheck2", "processSniroSolution", "ExclusiveGateway_1kvzxpb", "end");
                assertThat(pi).isEnded();
        }
 
        @Test
        public void testHomingV2_error_bpmnError(){
                doThrow(new BpmnError("MSOWorkflowException")).when(sniroHoming).callSniro(any(BuildingBlockExecution.class));
-               ProcessInstance pi = runtimeService.startProcessInstanceByKey("HomingV2", variables);
-               assertThat(pi).isNotNull();
-               assertThat(pi).isStarted()
-                               .hasPassedInOrder("start", "catchBpmnError", "processBpmnError", "endBpmnError")
-                               .hasNotPassed("callReceiveAsync");
-               assertThat(pi).isEnded();
-       }
-
-       @Test
-       public void testHomingV2_error_javaException(){
-               doThrow(new RuntimeException("Test")).when(sniroHoming).callSniro(any(BuildingBlockExecution.class));
-               ProcessInstance pi = runtimeService.startProcessInstanceByKey("HomingV2", variables);
+               ProcessInstance pi = runtimeService.startProcessInstanceByKey("HomingBB", variables);
                assertThat(pi).isNotNull();
                assertThat(pi).isStarted()
-                               .hasPassedInOrder("start", "catchJavaException", "processJavaException", "endJavaException")
+                               .hasPassedInOrder("start", "sniroOofCheck", "startBpmnError", "processMsoWorkflowException", "endBpmnError")
                                .hasNotPassed("callReceiveAsync");
                assertThat(pi).isEnded();
        }