Upgrade testing frameworks to latest not-vulnerable versions

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ie68290a79d075132c73e6cc9e82b9dbda92fbe8c
Issue-ID: SDC-4313

28 files changed, 108 insertions, 111 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/PropertyBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/PropertyBusinessLogicTest.java
index 71cb08c9da..f06101d8db 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/PropertyBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/PropertyBusinessLogicTest.java
@@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -387,7 +386,7 @@ class PropertyBusinessLogicTest extends BaseBusinessLogicMock {
         resource.setLastUpdaterUserId("USR01");
 
         when(toscaOperationFacade.getToscaElement("RES01")).thenReturn(Either.left(resource));
-        when(toscaOperationFacade.deletePropertyOfComponent(anyObject(), anyString())).thenReturn(StorageOperationStatus.OK);
+        when(toscaOperationFacade.deletePropertyOfComponent(any(), anyString())).thenReturn(StorageOperationStatus.OK);
         when(toscaOperationFacade.getParentComponents(anyString())).thenReturn(Either.left(new ArrayList<>()));
 
         assertTrue(propertyBusinessLogic.deletePropertyFromComponent("RES01", "PROP", "USR01").isRight());
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java
index 95e3553990..6780bef6b2 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java
@@ -42,7 +42,7 @@ class DistributionEnginePollingTaskTest extends BeConfDependentTest {
 
     // TODO - remove this setup after migration to Junit5 BeConfDependentTest
     @BeforeAll
-    private static void setup() {
+    static void setup() {
         configurationManager =
             new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java
index 94245c76d7..3e70a3229f 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 public class DistributionEngineTest{
@@ -111,7 +111,7 @@ public class DistributionEngineTest{
         when(environmentsEngine.getEnvironments()).thenReturn(envs);
         ActionStatus actionStatus = testInstance.notifyService(DISTRIBUTION_ID, new Service(), new NotificationDataImpl(), "someNonExisitngEnv", modifier);
         assertEquals(ActionStatus.DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE, actionStatus);
-        verifyZeroInteractions(distributionNotificationSender);
+        verifyNoInteractions(distributionNotificationSender);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java
index eee5e3cf56..41ff6c0e36 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java
@@ -52,7 +52,7 @@ class HealthCheckBusinessLogicHealthTest extends BeConfDependentTest {
 
     // TODO - remove this setup after migration to Junit5 BeConfDependentTest
     @BeforeAll
-    private static void setup() {
+    static void setup() {
         configurationManager =
             new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
@@ -79,7 +79,7 @@ class HealthCheckBusinessLogicHealthTest extends BeConfDependentTest {
     }
 
     @BeforeEach
-    private void beforeTest() {
+    void beforeTest() {
         when(dmaapProducerHealth.getHealthCheckInfo())
             .thenReturn(dmaapProducerHealthCheckInfo);
     }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java
index 4cb32658d0..86308942c3 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java
@@ -66,7 +66,6 @@ import java.util.stream.Stream;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyCollection;
-import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -109,18 +108,18 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock {
                 .thenReturn(StorageOperationStatus.OK);
 
         //CapabilityOperation
-        when(capabilitiesValidation.validateCapabilities(anyCollection(), anyObject(), anyBoolean()))
+        when(capabilitiesValidation.validateCapabilities(anyCollection(), any(), anyBoolean()))
                 .thenReturn(Either.left(true));
-        when(capabilitiesOperation.addCapabilities(anyString(), anyObject()))
+        when(capabilitiesOperation.addCapabilities(anyString(), any()))
                 .thenReturn(Either.left(createMockCapabilityListToReturn(
                         createCapability("capName", "capDesc", "capType", "source1",
                                 "0", "10"))));
 
-        when(capabilitiesOperation.updateCapabilities(anyString(), anyObject()))
+        when(capabilitiesOperation.updateCapabilities(anyString(), any()))
                 .thenReturn(Either.left(createMockCapabilityListToReturn(
                         createCapability("capName", "capDesc", "capType", "source1",
                                 "0", "10"))));
-        when(capabilitiesOperation.deleteCapabilities( anyObject(), anyString()))
+        when(capabilitiesOperation.deleteCapabilities( any(), anyString()))
                 .thenReturn(StorageOperationStatus.OK);
         when(mockJanusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
 
@@ -182,9 +181,9 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock {
         Resource resource = createComponent(true);
         resource.setComponentType(ComponentTypeEnum.RESOURCE);
         validateUserRoles(Role.ADMIN, Role.DESIGNER);
-        when(capabilitiesOperation.addCapabilities(anyString(), anyObject()))
+        when(capabilitiesOperation.addCapabilities(anyString(), any()))
                 .thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
-        when(capabilitiesOperation.updateCapabilities(anyString(), anyObject()))
+        when(capabilitiesOperation.updateCapabilities(anyString(), any()))
                 .thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
         when(toscaOperationFacade.getToscaElement(anyString(), any(ComponentParametersView.class)))
                 .thenReturn(Either.left(resource));
@@ -278,9 +277,9 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock {
         Resource resource = createComponent(true);
         resource.setComponentType(ComponentTypeEnum.RESOURCE);
         validateUserRoles(Role.ADMIN, Role.DESIGNER);
-        when(capabilitiesOperation.addCapabilities(anyString(), anyObject()))
+        when(capabilitiesOperation.addCapabilities(anyString(), any()))
                 .thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
-        when(capabilitiesOperation.updateCapabilities(anyString(), anyObject()))
+        when(capabilitiesOperation.updateCapabilities(anyString(), any()))
                 .thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
         when(toscaOperationFacade.getToscaElement(anyString(), any(ComponentParametersView.class)))
                 .thenReturn(Either.left(resource));
@@ -317,7 +316,7 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock {
                 .thenReturn(Either.left(resource));
         when(toscaOperationFacade.getParentComponents(anyString()))
                 .thenReturn(Either.right(StorageOperationStatus.NOT_FOUND));
-        when(capabilitiesOperation.deleteCapabilities(anyObject(), anyString()))
+        when(capabilitiesOperation.deleteCapabilities(any(), anyString()))
                 .thenReturn(StorageOperationStatus.GENERAL_ERROR);
         Either<CapabilityDefinition, ResponseFormat> deleteCapabilityEither
                 = capabilitiesBusinessLogicMock.deleteCapability(componentId, capabilityId, user, true);
@@ -477,4 +476,4 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock {
         return service;
     }
 
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicTest.java
index 141aae7a5a..95d06e3b7b 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicTest.java
@@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
@@ -282,7 +281,7 @@ class GroupBusinessLogicTest {
         component.setUniqueId("GRP.01");
         component.setGroups(grpdefList);
         when(accessValidations.validateUserCanWorkOnComponent("compid", ComponentTypeEnum.SERVICE, "USR01", "DeleteGroup")).thenReturn(component);
-        when(groupsOperation.deleteGroups(anyObject(), anyList())).thenReturn(Either.right(StorageOperationStatus.ARTIFACT_NOT_FOUND));
+        when(groupsOperation.deleteGroups(any(), anyList())).thenReturn(Either.right(StorageOperationStatus.ARTIFACT_NOT_FOUND));
 
         when(janusGraphDao.rollback()).thenReturn(JanusGraphOperationStatus.OK);
         assertThrows(ComponentException.class, () -> {
@@ -305,9 +304,9 @@ class GroupBusinessLogicTest {
         List<GroupDefinition> groupDefListCopy = new ArrayList<>();
         groupDefListCopy.add(updatedGroup);
         when(accessValidations.validateUserCanWorkOnComponent("compid", ComponentTypeEnum.SERVICE, "USR01", "DeleteGroup")).thenReturn(component);
-        when(groupsOperation.deleteGroups(anyObject(), anyList())).thenReturn(Either.left(groupDefListCopy));
-        when(groupsOperation.deleteCalculatedCapabilitiesWithProperties(anyString(), anyObject())).thenReturn(StorageOperationStatus.OK);
-        when(policyTargetsUpdateHandler.removePoliciesTargets(anyObject(), anyString(), anyObject())).thenReturn(ActionStatus.OK);
+        when(groupsOperation.deleteGroups(any(), anyList())).thenReturn(Either.left(groupDefListCopy));
+        when(groupsOperation.deleteCalculatedCapabilitiesWithProperties(anyString(), any())).thenReturn(StorageOperationStatus.OK);
+        when(policyTargetsUpdateHandler.removePoliciesTargets(any(), anyString(), any())).thenReturn(ActionStatus.OK);
 
         GroupDefinition Gdefinition = test.deleteGroup("compid", ComponentTypeEnum.SERVICE, "GRP.01",
             "USR01");
@@ -426,4 +425,4 @@ class GroupBusinessLogicTest {
 
         Assertions.assertEquals(10, result);
     }
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/RequirementBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/RequirementBusinessLogicTest.java
index 63a9d3cbe0..c9043e02f1 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/RequirementBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/RequirementBusinessLogicTest.java
@@ -63,7 +63,6 @@ import java.util.stream.Stream;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyCollection;
-import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -105,18 +104,18 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
                 .thenReturn(StorageOperationStatus.OK);
 
         //CapabilityOperation
-        when(requirementValidation.validateRequirements(anyCollection(), anyObject(), anyBoolean()))
+        when(requirementValidation.validateRequirements(anyCollection(), any(), anyBoolean()))
                 .thenReturn(Either.left(true));
-        when(requirementOperation.addRequirement(anyString(), anyObject()))
+        when(requirementOperation.addRequirement(anyString(), any()))
                 .thenReturn(Either.left(createMockRequirementListToReturn(createRequirement(
                         "reqName", "capType", "node", "source1",
                         "0", "10"))));
 
-        when(requirementOperation.updateRequirement(anyString(), anyObject()))
+        when(requirementOperation.updateRequirement(anyString(), any()))
                 .thenReturn(Either.left(createMockRequirementListToReturn(createRequirement(
                         "reqName", "capType", "node", "source1",
                 "0", "10"))));
-        when(requirementOperation.deleteRequirements( anyObject(), anyString()))
+        when(requirementOperation.deleteRequirements( any(), anyString()))
                 .thenReturn(StorageOperationStatus.OK);
         when(mockJanusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
 
@@ -268,9 +267,9 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
         Resource resource = createComponent(true);
         resource.setComponentType(ComponentTypeEnum.RESOURCE);
         validateUserRoles(Role.ADMIN, Role.DESIGNER);
-        when(requirementOperation.addRequirement(anyString(), anyObject()))
+        when(requirementOperation.addRequirement(anyString(), any()))
                 .thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
-        when(requirementOperation.updateRequirement(anyString(), anyObject()))
+        when(requirementOperation.updateRequirement(anyString(), any()))
                 .thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
         when(toscaOperationFacade.getToscaElement(anyString(), any(ComponentParametersView.class)))
                 .thenReturn(Either.left(resource));
@@ -291,7 +290,7 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
                 .thenReturn(Either.left(resource));
         when(toscaOperationFacade.getParentComponents(anyString()))
                 .thenReturn(Either.right(StorageOperationStatus.NOT_FOUND));
-        when(requirementOperation.deleteRequirements(anyObject(), anyString()))
+        when(requirementOperation.deleteRequirements(any(), anyString()))
                 .thenReturn(StorageOperationStatus.GENERAL_ERROR);
         Either<RequirementDefinition, ResponseFormat> deleteRequirementEither
                 = requirementsBusinessLogicMock.deleteRequirement(componentId, requirementId, user, true);
@@ -405,4 +404,4 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
         return service;
     }
 
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestratorTest.java
index 17063468fc..399227bc4f 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestratorTest.java
@@ -31,7 +31,7 @@ import org.openecomp.sdc.be.model.Resource;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -59,7 +59,7 @@ public class ComponentInstanceChangeOperationOrchestratorTest {
         when(componentInstanceChangeOperation1.onChangeVersion(CONTAINER, PREV_VERSION, NEW_VERSION)).thenReturn(ActionStatus.GENERAL_ERROR);
         ActionStatus actionStatus = testInstance.doPostChangeVersionOperations(CONTAINER, PREV_VERSION, NEW_VERSION);
         assertThat(actionStatus).isEqualTo(ActionStatus.GENERAL_ERROR);
-        verifyZeroInteractions(componentInstanceChangeOperation2, componentInstanceChangeOperation3);
+        verifyNoInteractions(componentInstanceChangeOperation2, componentInstanceChangeOperation3);
     }
 
     @Test
@@ -68,7 +68,7 @@ public class ComponentInstanceChangeOperationOrchestratorTest {
         when(componentInstanceChangeOperation2.onChangeVersion(CONTAINER, PREV_VERSION, NEW_VERSION)).thenReturn(ActionStatus.GENERAL_ERROR);
         ActionStatus actionStatus = testInstance.doPostChangeVersionOperations(CONTAINER, PREV_VERSION, NEW_VERSION);
         assertThat(actionStatus).isEqualTo(ActionStatus.GENERAL_ERROR);
-        verifyZeroInteractions(componentInstanceChangeOperation3);
+        verifyNoInteractions(componentInstanceChangeOperation3);
     }
 
     @Test
@@ -94,7 +94,7 @@ public class ComponentInstanceChangeOperationOrchestratorTest {
         when(componentInstanceChangeOperation1.onDelete(CONTAINER, DELETED_INS_ID)).thenReturn(ActionStatus.GENERAL_ERROR);
         ActionStatus actionStatus = testInstance.doOnDeleteInstanceOperations(CONTAINER, DELETED_INS_ID);
         assertThat(actionStatus).isEqualTo(ActionStatus.GENERAL_ERROR);
-        verifyZeroInteractions(componentInstanceChangeOperation2, componentInstanceChangeOperation3);
+        verifyNoInteractions(componentInstanceChangeOperation2, componentInstanceChangeOperation3);
     }
 
     @Test
@@ -103,7 +103,7 @@ public class ComponentInstanceChangeOperationOrchestratorTest {
         when(componentInstanceChangeOperation2.onDelete(CONTAINER, DELETED_INS_ID)).thenReturn(ActionStatus.GENERAL_ERROR);
         ActionStatus actionStatus = testInstance.doOnDeleteInstanceOperations(CONTAINER, DELETED_INS_ID);
         assertThat(actionStatus).isEqualTo(ActionStatus.GENERAL_ERROR);
-        verifyZeroInteractions(componentInstanceChangeOperation3);
+        verifyNoInteractions(componentInstanceChangeOperation3);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperationTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperationTest.java
index 4631188254..924f5b21bf 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperationTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperationTest.java
@@ -46,7 +46,7 @@ import java.util.stream.Stream;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.openecomp.sdc.be.components.impl.utils.TestGenerationUtils.getComponentsUtils;
 
@@ -86,7 +86,7 @@ public class PolicyTargetsUpdateOperationTest {
         ComponentInstance newVersion = new ComponentInstanceBuilder().setId("newVersion").build();
         ActionStatus operationStatus = policyTargetsUpdateOperation.onChangeVersion(container, prevVersion, newVersion);
         assertThat(operationStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
@@ -97,7 +97,7 @@ public class PolicyTargetsUpdateOperationTest {
         ComponentInstance newVersion = new ComponentInstanceBuilder().setId("newVersion").build();
         ActionStatus operationStatus = policyTargetsUpdateOperation.onChangeVersion(container, prevVersion, newVersion);
         assertThat(operationStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
@@ -106,7 +106,7 @@ public class PolicyTargetsUpdateOperationTest {
         ComponentInstance newVersion = new ComponentInstanceBuilder().setId("newVersion").build();
         ActionStatus operationStatus = policyTargetsUpdateOperation.onChangeVersion(container, prevVersion, newVersion);
         assertThat(operationStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
@@ -136,7 +136,7 @@ public class PolicyTargetsUpdateOperationTest {
         Component container = new Resource();
         ActionStatus operationStatus = policyTargetsUpdateOperation.onDelete(container, "instToDel");
         assertThat(operationStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
@@ -145,14 +145,14 @@ public class PolicyTargetsUpdateOperationTest {
         Component container = new ResourceBuilder().addPolicy(policy).build();
         ActionStatus operationStatus = policyTargetsUpdateOperation.onDelete(container, "instToDel");
         assertThat(operationStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
     public void onDeleteInstance_whenNoPoliciesWithInstanceAsTarget_returnActionOk() {
         ActionStatus operationStatus = policyTargetsUpdateOperation.onDelete(container, "instToDel");
         assertThat(operationStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandlerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandlerTest.java
index 2723746ae4..ee05e41bf7 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandlerTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandlerTest.java
@@ -45,7 +45,7 @@ import java.util.stream.Stream;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.openecomp.sdc.be.components.impl.utils.TestGenerationUtils.getComponentsUtils;
 
@@ -82,7 +82,7 @@ public class PolicyTargetsUpdateHandlerTest {
     public void onDeleteInstance_whenNoPolicies_returnActionOk() {
         Component container = new Resource();
         testInstance.removePoliciesTargets(container, "groupToDel", PolicyTargetType.GROUPS);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
@@ -90,13 +90,13 @@ public class PolicyTargetsUpdateHandlerTest {
         PolicyDefinition policy = PolicyDefinitionBuilder.create().addComponentInstanceTarget("someInst").build();
         Component container = new ResourceBuilder().addPolicy(policy).build();
         testInstance.removePoliciesTargets(container, "groupToDel", PolicyTargetType.GROUPS);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
     public void onDeleteInstance_whenNoPoliciesWithGivenGroupAsTarget_returnActionOk() {
         testInstance.removePoliciesTargets(container, "groupToDel", PolicyTargetType.GROUPS);
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
@@ -135,4 +135,4 @@ public class PolicyTargetsUpdateHandlerTest {
         Stream.of(groupId).forEach(policyDefinitionBuilder::addGroupTarget);
         return policyDefinitionBuilder.setUniqueId(uniqueId).build();
     }
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogicTest.java
index 458d104026..978c5344cd 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogicTest.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 public class GlobalInputsFilteringBusinessLogicTest {
@@ -91,7 +91,7 @@ public class GlobalInputsFilteringBusinessLogicTest {
         Either<List<InputDefinition>, ActionStatus> globalInputsEither = testInstance.filterGlobalInputs(mockResource);
         assertTrue(globalInputsEither.isRight());
         assertEquals(ActionStatus.GENERAL_ERROR, globalInputsEither.right().value());
-        verifyZeroInteractions(genericTypeBusinessLogicMock);
+        verifyNoInteractions(genericTypeBusinessLogicMock);
     }
 
     private void verifyFilteredOnlyGlobalInputs(Either<List<InputDefinition>, ActionStatus> globalInputsEither, String[] genericProperties) {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommandTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommandTest.java
index a8e610f2dc..cfcdecfe56 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommandTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommandTest.java
@@ -52,7 +52,7 @@ import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -81,7 +81,7 @@ public class ComponentGroupMergeCommandTest {
 
         actionStatus = testInstance.mergeComponents(prevResource, DONT_CARE);
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(groupsOperation);
+        verifyNoInteractions(groupsOperation);
     }
 
     @Test
@@ -91,7 +91,7 @@ public class ComponentGroupMergeCommandTest {
         Resource prevResource = createResourceWithGroups(group1, group2);
         ActionStatus actionStatus = testInstance.mergeComponents(prevResource, DONT_CARE);
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(groupsOperation);
+        verifyNoInteractions(groupsOperation);
     }
 
     @Test
@@ -103,7 +103,7 @@ public class ComponentGroupMergeCommandTest {
         Resource currResource = createResourceWithGroups(group1, group2, group3);
         ActionStatus actionStatus = testInstance.mergeComponents(prevResource, currResource);
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(groupsOperation);
+        verifyNoInteractions(groupsOperation);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommandTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommandTest.java
index 42dec9469e..d065546486 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommandTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommandTest.java
@@ -49,7 +49,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -98,14 +98,14 @@ public class GroupPropertiesMergeCommandTest {
     public void whenNewComponentHasNoGroups_returnOk() {
         ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, new Resource());
         assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+        verifyNoInteractions(mergeBusinessLogic, groupsOperation);
     }
 
     @Test
     public void whenOldComponentHasNoGroups_returnOk() {
         ActionStatus mergeStatus = testInstance.mergeComponents(new Resource(), newResource);
         assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+        verifyNoInteractions(mergeBusinessLogic, groupsOperation);
     }
 
     @Test
@@ -120,7 +120,7 @@ public class GroupPropertiesMergeCommandTest {
         Resource newResource = createResourceWithGroups(newGrpWithProps, newGrpNoProps);
         ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
         assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+        verifyNoInteractions(mergeBusinessLogic, groupsOperation);
     }
 
     @Test
@@ -131,7 +131,7 @@ public class GroupPropertiesMergeCommandTest {
         Resource newResource = createResourceWithGroups(newUserDefinedGrp);
         ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
         assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+        verifyNoInteractions(mergeBusinessLogic, groupsOperation);
     }
 
     @Test
@@ -142,7 +142,7 @@ public class GroupPropertiesMergeCommandTest {
         Resource newResource = createResourceWithGroups(newGrp);
         ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
         assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+        verifyNoInteractions(mergeBusinessLogic, groupsOperation);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabilitiesMergeBLTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabilitiesMergeBLTest.java
index ccfd04f050..276c8ae91a 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabilitiesMergeBLTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabilitiesMergeBLTest.java
@@ -64,7 +64,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -209,7 +209,7 @@ public class ComponentInstanceCapabilitiesMergeBLTest {
         when(toscaOperationFacade.updateComponentCalculatedCapabilitiesProperties(newResource)).thenReturn(StorageOperationStatus.OK);
         ActionStatus actionStatus = testInstance.mergeComponents(prevResource, newResource);
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(dataDefinitionsValuesMergingBusinessLogic);
+        verifyNoInteractions(dataDefinitionsValuesMergingBusinessLogic);
     }
 
     @Test
@@ -220,7 +220,7 @@ public class ComponentInstanceCapabilitiesMergeBLTest {
         verifyNoMoreInteractions(toscaOperationFacade);
         ActionStatus actionStatus = testInstance.mergeComponents(prevResource, newResource);
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(dataDefinitionsValuesMergingBusinessLogic);
+        verifyNoInteractions(dataDefinitionsValuesMergingBusinessLogic);
     }
 
     @Test
@@ -268,7 +268,7 @@ public class ComponentInstanceCapabilitiesMergeBLTest {
     public void mergeInstanceCapabilityProperties_emptyCapabilitiesList() {
         ActionStatus actionStatus = testInstance.mergeComponentInstanceCapabilities(new Resource(), new Resource(),  "instanceId", Collections.emptyList());
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade, dataDefinitionsValuesMergingBusinessLogic, capabilityResolver);
+        verifyNoInteractions(toscaOperationFacade, dataDefinitionsValuesMergingBusinessLogic, capabilityResolver);
     }
 
     @Test
@@ -291,6 +291,6 @@ public class ComponentInstanceCapabilitiesMergeBLTest {
         when(toscaOperationFacade.updateComponentInstanceCapabilityProperties(container, INSTANCE1)).thenReturn(StorageOperationStatus.OK);
         ActionStatus actionStatus = testInstance.mergeComponentInstanceCapabilities(container, resource, INSTANCE1, prevCapabilities);
         assertThat(actionStatus).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(dataDefinitionsValuesMergingBusinessLogic);
+        verifyNoInteractions(dataDefinitionsValuesMergingBusinessLogic);
     }
 }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMergeTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMergeTest.java
index e12010c750..f3bf0ae439 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMergeTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMergeTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import fj.data.Either;
@@ -146,7 +146,7 @@ class ComponentInstancePropsAndInputsMergeTest {
         assertThrows(ComponentException.class, () -> {
             testInstance.mergeDataAfterCreate(USER, dataHolder, service, "inst1");
         });
-        verifyZeroInteractions(componentInstanceInputsRedeclareHandler, componentInstancePropertiesMergeBL, toscaOperationFacade);
+        verifyNoInteractions(componentInstanceInputsRedeclareHandler, componentInstancePropertiesMergeBL, toscaOperationFacade);
     }
 
     @Test
@@ -162,7 +162,7 @@ class ComponentInstancePropsAndInputsMergeTest {
         assertThrows(ComponentException.class, () -> {
             testInstance.mergeDataAfterCreate(USER, dataHolder, service, "inst1");
         });
-        verifyZeroInteractions(componentInstanceInputsRedeclareHandler, toscaOperationFacade);
+        verifyNoInteractions(componentInstanceInputsRedeclareHandler, toscaOperationFacade);
     }
 
     @Test
@@ -182,7 +182,7 @@ class ComponentInstancePropsAndInputsMergeTest {
         assertThrows(ComponentException.class, () -> {
             testInstance.mergeDataAfterCreate(USER, dataHolder, service, "inst1");
         });
-        verifyZeroInteractions(componentInstanceInputsRedeclareHandler);
+        verifyNoInteractions(componentInstanceInputsRedeclareHandler);
     }
 
     private void assertComponentFilter(ComponentParametersView value) {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBLTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBLTest.java
index a12335c4f9..595e27813d 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBLTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBLTest.java
@@ -46,7 +46,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -104,7 +104,7 @@ public class ExternalRefsMergeBLTest {
         containerComponent.setComponentInstances(Collections.singletonList(ci));
         DataForMergeHolder dataForMergeHolder = new DataForMergeHolder();
         externalRefsMergeBL.mergeDataAfterCreate(new User(), dataForMergeHolder, containerComponent, NEW_INSTANCE_ID);
-        verifyZeroInteractions(externalReferencesOperation);
+        verifyNoInteractions(externalReferencesOperation);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommandTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommandTest.java
index 42f86984e7..87a01edd74 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommandTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommandTest.java
@@ -52,7 +52,7 @@ import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -149,7 +149,7 @@ public class PoliciesMergeCommandTest {
     public void whenPreviousComponentHasNoPolicies_returnOk() {
         ActionStatus mergeResult = testInstance.mergeComponents(new Resource(), DONT_CARE);
         assertThat(mergeResult).isEqualTo(ActionStatus.OK);
-        verifyZeroInteractions(toscaOperationFacade, componentsUtils);
+        verifyNoInteractions(toscaOperationFacade, componentsUtils);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogicTest.java
index aa7f606a94..84c24f510f 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogicTest.java
@@ -60,7 +60,7 @@ public class DataDefinitionsValuesMergingBusinessLogicTest {
         newProp1.setType("int");
 
         testInstance.mergeInstanceDataDefinitions(Collections.singletonList(oldProp1), Collections.emptyList(), Collections.singletonList(newProp1), Collections.emptyList());
-        Mockito.verifyZeroInteractions(propertyDataValueMergeBusinessLogicMock);
+        Mockito.verifyNoInteractions(propertyDataValueMergeBusinessLogicMock);
     }
 
     @Test
@@ -78,7 +78,7 @@ public class DataDefinitionsValuesMergingBusinessLogicTest {
                 .setValue("val1").build();
 
         testInstance.mergeInstanceDataDefinitions(Collections.singletonList(oldProp1), Collections.emptyList(), Collections.singletonList(newProp1), Collections.emptyList());
-        Mockito.verifyZeroInteractions(propertyDataValueMergeBusinessLogicMock);
+        Mockito.verifyNoInteractions(propertyDataValueMergeBusinessLogicMock);
     }
 
     @Test
@@ -120,7 +120,7 @@ public class DataDefinitionsValuesMergingBusinessLogicTest {
         PropertyDataDefinition oldProp = createPropertyDataDefinition("prop1", "oldVal1");
         PropertyDataDefinition newProp = createPropertyDataDefinition("prop2", null);
         testInstance.mergeInstanceDataDefinitions(Collections.singletonList(oldProp), Collections.emptyList(), Collections.singletonList(newProp), Collections.emptyList());
-        Mockito.verifyZeroInteractions(propertyDataValueMergeBusinessLogicMock);
+        Mockito.verifyNoInteractions(propertyDataValueMergeBusinessLogicMock);
     }
 
     private PropertyDataDefinition createPropertyDataDefinition(String name, String value) {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogicTest.java
index 7f47a01c0e..d44618e3a1 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogicTest.java
@@ -35,7 +35,7 @@ import org.openecomp.sdc.be.model.Resource;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -70,7 +70,7 @@ public class ResourceDataMergeBusinessLogicTest {
         when(mergeCommandsFactory.getMergeCommands(oldResource, newResource)).thenReturn(Either.right(ActionStatus.GENERAL_ERROR));
         ActionStatus actionStatus = testInstance.mergeResourceEntities(oldResource, newResource);
         assertEquals(ActionStatus.GENERAL_ERROR, actionStatus);
-        verifyZeroInteractions(commandA, commandB, commandC);
+        verifyNoInteractions(commandA, commandB, commandC);
     }
 
     @Test
@@ -88,7 +88,7 @@ public class ResourceDataMergeBusinessLogicTest {
         ActionStatus actionStatus = testInstance.mergeResourceEntities(oldResource, newResource);
         assertEquals(ActionStatus.GENERAL_ERROR, actionStatus);
         verify(commandA).description();
-        verifyZeroInteractions(commandB, commandC);
+        verifyNoInteractions(commandB, commandC);
     }
 
 }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java
index 5f0282b7d6..926522ecdc 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java
@@ -46,7 +46,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest {
 
     @BeforeAll
-    private static void setup() {
+    static void setup() {
         configurationManager =
             new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDeclaratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDeclaratorTest.java
index bcbd07db31..933d21db05 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDeclaratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDeclaratorTest.java
@@ -60,7 +60,7 @@ import java.util.stream.Stream;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.openecomp.sdc.be.components.property.CapabilityTestUtils.createCapabilityDefinition;
 import static org.openecomp.sdc.be.components.property.CapabilityTestUtils.createProperties;
@@ -91,7 +91,7 @@ public class ComponentInstancePropertyDeclaratorTest extends PropertyDeclaratorT
         Component cmpt = new Resource();
         Either<List<InputDefinition>, StorageOperationStatus> createdInputs = testInstance.declarePropertiesAsInputs(cmpt, "someCmptInstId", Collections.emptyList());
         assertEquals(StorageOperationStatus.NOT_FOUND, createdInputs.right().value());
-        verifyZeroInteractions(toscaOperationFacade);
+        verifyNoInteractions(toscaOperationFacade);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java
index 616e0babfa..a5214314e4 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java
@@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
@@ -86,7 +86,7 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     public void testDeclarePropertiesAsInputs_groupNotExist() {
         Either<List<InputDefinition>, StorageOperationStatus> declareResult = groupPropertyDeclarator.declarePropertiesAsInputs(resource, "nonExistingGroup", Collections.emptyList());
         assertEquals(StorageOperationStatus.NOT_FOUND, declareResult.right().value());
-        verifyZeroInteractions(groupOperation);
+        verifyNoInteractions(groupOperation);
     }
 
     @Test
@@ -113,14 +113,14 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(groupOperation);
+        verifyNoInteractions(groupOperation);
     }
 
     @Test
     public void testUnDeclareProperties_whenNoPropertiesFromGroupMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsInputs(createResourceWithGroup(), input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(groupOperation);
+        verifyNoInteractions(groupOperation);
     }
 
     @Test
@@ -163,14 +163,14 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsListInputs(resource, input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(groupOperation);
+        verifyNoInteractions(groupOperation);
     }
 
     @Test
     public void testUnDeclarePropertiesAsListInputs_whenNoPropertiesFromGroupMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsListInputs(createResourceWithGroup(), input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(groupOperation);
+        verifyNoInteractions(groupOperation);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java
index c029725dfe..2428985370 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java
@@ -49,7 +49,7 @@ import java.util.stream.Stream;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 
@@ -86,7 +86,7 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
     public void testDeclarePropertiesAsInputs_policyNotExist() {
         Either<List<InputDefinition>, StorageOperationStatus> declareResult = policyPropertyDeclarator.declarePropertiesAsInputs(resource, "nonExistingPolicy", Collections.emptyList());
         assertThat(declareResult.right().value()).isEqualTo(StorageOperationStatus.NOT_FOUND);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
@@ -113,14 +113,14 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
     public void testUnDeclareProperties_whenNoPropertiesFromPolicyMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(createResourceWithPolicy(), input);
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java
index c0b176a571..62b28a85e8 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java
@@ -49,7 +49,7 @@ import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
@@ -83,7 +83,7 @@ public class PolicyPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     public void testDeclarePropertiesAsInputs_policyNotExist() {
         Either<List<InputDefinition>, StorageOperationStatus> declareResult = policyPropertyDeclarator.declarePropertiesAsInputs(resource, "nonExistingPolicy", Collections.emptyList());
         assertEquals(StorageOperationStatus.NOT_FOUND, declareResult.right().value());
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
@@ -110,14 +110,14 @@ public class PolicyPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
     public void testUnDeclareProperties_whenNoPropertiesFromPolicyMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(createResourceWithPolicy(), input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
@@ -159,14 +159,14 @@ public class PolicyPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsListInputs(resource, input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
     public void testUnDeclarePropertiesAsListInputs_whenNoPropertiesFromPolicyMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsListInputs(createResourceWithPolicy(), input);
         assertEquals(StorageOperationStatus.OK, storageOperationStatus);
-        verifyZeroInteractions(policyOperation);
+        verifyNoInteractions(policyOperation);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTaskTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTaskTest.java
index 6d51c4dc0f..8d3e2146fb 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTaskTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTaskTest.java
@@ -37,7 +37,7 @@ class AsdcComponentsCleanerTaskTest extends BeConfDependentTest {
 
     // TODO - remove this setup after migration to Junit5 BeConfDependentTest
     @BeforeAll
-    private static void setup() {
+    static void setup() {
         configurationManager =
             new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidationTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidationTest.java
index 44e35fca06..0672ec3713 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidationTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidationTest.java
@@ -51,7 +51,7 @@ import org.openecomp.sdc.exception.ResponseFormat;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 public class ServiceDistributionValidationTest {
@@ -106,7 +106,7 @@ public class ServiceDistributionValidationTest {
         } catch(ByResponseFormatComponentException e){
             assertEquals(errResponse, e.getResponseFormat());
         }
-        verifyZeroInteractions(toscaOperationFacade, operationalEnvironmentDao, componentsUtils);
+        verifyNoInteractions(toscaOperationFacade, operationalEnvironmentDao, componentsUtils);
     }
 
     @Test
@@ -117,7 +117,7 @@ public class ServiceDistributionValidationTest {
         when(componentsUtils.getResponseFormat(ActionStatus.API_RESOURCE_NOT_FOUND, ApiResourceEnum.SERVICE_ID.getValue())).thenReturn(errResponse);
         Either<ActivationRequestInformation, ResponseFormat> activateServiceReq = testInstance.validateActivateServiceRequest(SERVICE_ID, ENV_ID, user, new ServiceDistributionReqInfo("distributionData"));
         assertEquals(errResponse, activateServiceReq.right().value());
-        verifyZeroInteractions(operationalEnvironmentDao);
+        verifyNoInteractions(operationalEnvironmentDao);
     }
 
     @Test
@@ -128,7 +128,7 @@ public class ServiceDistributionValidationTest {
         when(componentsUtils.getResponseFormat(eq(ActionStatus.INVALID_SERVICE_STATE))).thenReturn(errResponse);
         Either<ActivationRequestInformation, ResponseFormat> activateServiceReq = testInstance.validateActivateServiceRequest(SERVICE_ID, ENV_ID, user, new ServiceDistributionReqInfo("distributionData"));
         assertEquals(errResponse, activateServiceReq.right().value());
-        verifyZeroInteractions(operationalEnvironmentDao);
+        verifyNoInteractions(operationalEnvironmentDao);
     }
 
     @Test
@@ -181,4 +181,4 @@ public class ServiceDistributionValidationTest {
         assertEquals(service, activateServiceReq.left().value().getServiceToActivate());
         assertEquals("context", activateServiceReq.left().value().getWorkloadContext());
     }
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java
index c0d858a4e7..2b790a4137 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java
@@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.openecomp.sdc.common.api.Constants.GET_POLICY;
 
@@ -293,7 +294,7 @@ class PolicyServletTest extends JerseySpringBaseTest {
     void getPolicyProperties_wrongComponentType() {
         Response response = buildGetPropertiesRequest("unknownType").get();
         assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode());
-        //verifyZeroInteractions(businessLogic);
+        verifyNoInteractions(businessLogic);
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtilTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtilTest.java
index 3b8089e858..f5758e9d07 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtilTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtilTest.java
@@ -50,7 +50,7 @@ import org.openecomp.sdc.common.impl.FSConfigurationSource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 @SpringJUnitConfig(locations = "classpath:paths/path-context.xml")
-public class ForwardingPathToscaUtilTest extends BaseForwardingPathTest {
+class ForwardingPathToscaUtilTest extends BaseForwardingPathTest {
 
     private static final String NODE_NAME_1 = "nodeA-name";
     private static final String NODE_NAME_2 = "nodeB-name";
@@ -65,13 +65,13 @@ public class ForwardingPathToscaUtilTest extends BaseForwardingPathTest {
     private Map<String, Component> originComponents = new HashMap<>();
 
     @BeforeAll
-    private static void setup() {
+    static void setup() {
         configurationManager =
             new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
 
     @BeforeEach
-    public void setUpForwardingPath() {
+    void setUpForwardingPath() {
         service = initForwardPath();
         List<ComponentInstance> componentInstances = new ArrayList<>();
         componentInstances.add(generateComponentInstance(NODE_NAME_1, NODE_ID_1));
@@ -101,7 +101,7 @@ public class ForwardingPathToscaUtilTest extends BaseForwardingPathTest {
     }
 
     @Test
-    public void singleElementPath() {
+    void singleElementPath() {
         Assertions.assertDoesNotThrow(() -> {
             createPathSingleElement();
             Map<String, ToscaNodeTemplate> nodeTemplatesRes = new HashMap<>();