summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorMax Benjamin <max.benjamin@att.com>2020-06-23 17:57:26 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-23 17:57:26 +0000
commitc919ee261f665b824e716e77b5cc358ec15e44a9 (patch)
tree14a3b73144b66a25818c4207691f277eed8ad963 /bpmn
parent49e00e08dbbe4fcb6be9a7c4b9580918cc8f04f9 (diff)
parent2ae848c04b2b455076fe22a965081f61d8705f00 (diff)
Merge "style of test now matches"
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/so-bpmn-tasks/pom.xml4
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java2
-rw-r--r--bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListenerTest.java11
3 files changed, 10 insertions, 7 deletions
diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index e510a2928a..dec9560574 100644
--- a/bpmn/so-bpmn-tasks/pom.xml
+++ b/bpmn/so-bpmn-tasks/pom.xml
@@ -119,7 +119,7 @@
</execute>
</action>
</pluginExecution>
- <pluginExecution>
+ <pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -132,7 +132,7 @@
<execute />
</action>
</pluginExecution>
- <pluginExecution>
+ <pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java
index cf5226ad78..6589ae77f5 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java
@@ -42,6 +42,4 @@ public class SkipConfigVnfListener implements FlowManipulator {
}
}
-
-
}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListenerTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListenerTest.java
index c23fb03bb9..64c42fa577 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListenerTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListenerTest.java
@@ -21,7 +21,6 @@
package org.onap.so.bpmn.infrastructure.workflow.tasks.listeners;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,6 +29,11 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.extension.mockito.delegate.DelegateExecutionFake;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
import org.onap.so.bpmn.common.BuildingBlockExecution;
import org.onap.so.bpmn.common.DelegateExecutionImpl;
import org.onap.so.bpmn.servicedecomposition.entities.BuildingBlock;
@@ -39,6 +43,7 @@ import org.onap.so.db.catalog.client.CatalogDbClient;
import org.onap.so.serviceinstancebeans.ModelInfo;
import org.onap.so.serviceinstancebeans.RequestDetails;
+@RunWith(MockitoJUnitRunner.class)
public class SkipConfigVnfListenerTest {
private static final String MODEL_UUID = "modelUuidTest";
@@ -46,7 +51,9 @@ public class SkipConfigVnfListenerTest {
private static final String G_CURRENT_SEQUENCE = "gCurrentSequence";
private DelegateExecution execution;
+ @Mock
private CatalogDbClient catalogDbClientMock;
+ @InjectMocks
private SkipConfigVnfListener testedObject;
private BuildingBlockExecution buildingBlockExecution;
@@ -54,8 +61,6 @@ public class SkipConfigVnfListenerTest {
public void setup() {
execution = new DelegateExecutionFake();
buildingBlockExecution = new DelegateExecutionImpl(execution);
- catalogDbClientMock = mock(CatalogDbClient.class);
- testedObject = new SkipConfigVnfListener(catalogDbClientMock);
}
@Test