Springboot 2.0 upgrade

[so.git] / bpmn / so-bpmn-building-blocks / src / test / java / org / onap / so / bpmn / common / AAISetVnfInMaintBBTest.java

diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/common/AAISetVnfInMaintBBTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/common/AAISetVnfInMaintBBTest.java
index 890fd6b..effd50f 100644 (file)
--- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/common/AAISetVnfInMaintBBTest.java
+++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/common/AAISetVnfInMaintBBTest.java
@@ -20,8 +20,8 @@
 
 package org.onap.so.bpmn.common;
 
-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 java.io.IOException;
@@ -30,17 +30,15 @@ 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.BaseTest;
+import org.onap.so.bpmn.BaseBPMNTest;
 
-public class AAISetVnfInMaintBBTest extends BaseTest {
+public class AAISetVnfInMaintBBTest extends BaseBPMNTest {
        
-       @Ignore
+
        @Test
        public void sunnyDayAAISetVnfInMaintBBTest() throws InterruptedException, IOException {         
                ProcessInstance pi = runtimeService.startProcessInstanceByKey("AAISetVnfInMaintBB", variables);
-               assertThat(pi).isNotNull();
-               assertThat(pi).isStarted().hasPassedInOrder("Start_AAISetVnfInMaintBB", "Task_SetInMaint", "End_AAISetVnfInMaintBB");
-               assertThat(pi).isEnded();
+               assertThat(pi).isNotNull().isStarted().hasPassedInOrder("Start_AAISetVnfInMaintBB", "Task_SetInMaint", "End_AAISetVnfInMaintBB");
        }
        
        @Test