Upgrade testing frameworks to latest not-vulnerable versions

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / impl / RequirementBusinessLogicTest.java

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 091d6f9..c9043e0 100644 (file)
--- 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
@@ -29,10 +29,8 @@ import org.mockito.MockitoAnnotations;
 import org.openecomp.sdc.be.auditing.impl.AuditingManager;
 import org.openecomp.sdc.be.components.validation.RequirementValidation;
 import org.openecomp.sdc.be.components.validation.UserValidations;
-import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphDao;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -45,21 +43,13 @@ import org.openecomp.sdc.be.model.RequirementDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.jsonjanusgraph.operations.InterfaceOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.RequirementOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.IElementOperation;
-import org.openecomp.sdc.be.model.operations.api.IGroupInstanceOperation;
-import org.openecomp.sdc.be.model.operations.api.IGroupOperation;
-import org.openecomp.sdc.be.model.operations.api.IGroupTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
-import org.openecomp.sdc.be.model.operations.impl.InterfaceLifecycleOperation;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
-import org.openecomp.sdc.common.api.ConfigurationSource;
 import org.openecomp.sdc.common.impl.ExternalConfiguration;
-import org.openecomp.sdc.common.impl.FSConfigurationSource;
 import org.openecomp.sdc.exception.ResponseFormat;
 
 import java.util.ArrayList;
@@ -73,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;
@@ -99,15 +88,9 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         ExternalConfiguration.setAppName("catalog-be");
 
-        // init Configuration
-        String appConfigDir = "src/test/resources/config/catalog-be";
-        ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration
-                .getChangeListener(), appConfigDir);
-        ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
-
         ComponentsUtils componentsUtils = new ComponentsUtils(Mockito.mock(AuditingManager.class));
         // User data and management
         user = new User();
@@ -116,24 +99,23 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
         user.setLastName("Hendrix");
         user.setRole(Role.ADMIN.name());
 
-        Either<User, ActionStatus> eitherGetUser = Either.left(user);
-        when(mockUserAdmin.getUser("jh0003", false)).thenReturn(eitherGetUser);
+        when(mockUserAdmin.getUser("jh0003", false)).thenReturn(user);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Resource)))
                 .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);
 
@@ -285,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));
@@ -308,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);
@@ -422,4 +404,4 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
         return service;
     }
 
-}
\ No newline at end of file
+}