From 2ae848c04b2b455076fe22a965081f61d8705f00 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max" Date: Fri, 19 Jun 2020 17:07:01 -0400 Subject: style of test now matches updated unit test to match other tests in the codebase Issue-ID: SO-2992 Signed-off-by: Benjamin, Max (mb388a) Change-Id: Icf844d9c07105d23646681a3b29eeae06a03e91c --- .../workflow/tasks/listeners/SkipConfigVnfListener.java | 2 -- .../workflow/tasks/listeners/SkipConfigVnfListenerTest.java | 11 ++++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'bpmn/so-bpmn-tasks/src') 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 -- cgit 1.2.3-korg