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;
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());
// 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"));
}
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{
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
// 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"));
}
}
@BeforeEach
- private void beforeTest() {
+ void beforeTest() {
when(dmaapProducerHealth.getHealthCheckInfo())
.thenReturn(dmaapProducerHealthCheckInfo);
}
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;
.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);
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));
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));
.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);
return service;
}
-}
\ No newline at end of file
+}
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;
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, () -> {
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");
Assertions.assertEquals(10, result);
}
-}
\ No newline at end of file
+}
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;
.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);
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));
.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);
return service;
}
-}
\ No newline at end of file
+}
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)
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
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
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
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
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;
ComponentInstance newVersion = new ComponentInstanceBuilder().setId("newVersion").build();
ActionStatus operationStatus = policyTargetsUpdateOperation.onChangeVersion(container, prevVersion, newVersion);
assertThat(operationStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(toscaOperationFacade);
+ verifyNoInteractions(toscaOperationFacade);
}
@Test
ComponentInstance newVersion = new ComponentInstanceBuilder().setId("newVersion").build();
ActionStatus operationStatus = policyTargetsUpdateOperation.onChangeVersion(container, prevVersion, newVersion);
assertThat(operationStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(toscaOperationFacade);
+ verifyNoInteractions(toscaOperationFacade);
}
@Test
ComponentInstance newVersion = new ComponentInstanceBuilder().setId("newVersion").build();
ActionStatus operationStatus = policyTargetsUpdateOperation.onChangeVersion(container, prevVersion, newVersion);
assertThat(operationStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(toscaOperationFacade);
+ verifyNoInteractions(toscaOperationFacade);
}
@Test
Component container = new Resource();
ActionStatus operationStatus = policyTargetsUpdateOperation.onDelete(container, "instToDel");
assertThat(operationStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(toscaOperationFacade);
+ verifyNoInteractions(toscaOperationFacade);
}
@Test
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
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;
public void onDeleteInstance_whenNoPolicies_returnActionOk() {
Component container = new Resource();
testInstance.removePoliciesTargets(container, "groupToDel", PolicyTargetType.GROUPS);
- verifyZeroInteractions(toscaOperationFacade);
+ verifyNoInteractions(toscaOperationFacade);
}
@Test
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
Stream.of(groupId).forEach(policyDefinitionBuilder::addGroupTarget);
return policyDefinitionBuilder.setUniqueId(uniqueId).build();
}
-}
\ No newline at end of file
+}
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 {
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) {
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)
actionStatus = testInstance.mergeComponents(prevResource, DONT_CARE);
assertThat(actionStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(groupsOperation);
+ verifyNoInteractions(groupsOperation);
}
@Test
Resource prevResource = createResourceWithGroups(group1, group2);
ActionStatus actionStatus = testInstance.mergeComponents(prevResource, DONT_CARE);
assertThat(actionStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(groupsOperation);
+ verifyNoInteractions(groupsOperation);
}
@Test
Resource currResource = createResourceWithGroups(group1, group2, group3);
ActionStatus actionStatus = testInstance.mergeComponents(prevResource, currResource);
assertThat(actionStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(groupsOperation);
+ verifyNoInteractions(groupsOperation);
}
@Test
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)
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
Resource newResource = createResourceWithGroups(newGrpWithProps, newGrpNoProps);
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+ verifyNoInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
Resource newResource = createResourceWithGroups(newUserDefinedGrp);
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+ verifyNoInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
Resource newResource = createResourceWithGroups(newGrp);
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
+ verifyNoInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
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)
when(toscaOperationFacade.updateComponentCalculatedCapabilitiesProperties(newResource)).thenReturn(StorageOperationStatus.OK);
ActionStatus actionStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(actionStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(dataDefinitionsValuesMergingBusinessLogic);
+ verifyNoInteractions(dataDefinitionsValuesMergingBusinessLogic);
}
@Test
verifyNoMoreInteractions(toscaOperationFacade);
ActionStatus actionStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(actionStatus).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(dataDefinitionsValuesMergingBusinessLogic);
+ verifyNoInteractions(dataDefinitionsValuesMergingBusinessLogic);
}
@Test
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
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);
}
}
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;
assertThrows(ComponentException.class, () -> {
testInstance.mergeDataAfterCreate(USER, dataHolder, service, "inst1");
});
- verifyZeroInteractions(componentInstanceInputsRedeclareHandler, componentInstancePropertiesMergeBL, toscaOperationFacade);
+ verifyNoInteractions(componentInstanceInputsRedeclareHandler, componentInstancePropertiesMergeBL, toscaOperationFacade);
}
@Test
assertThrows(ComponentException.class, () -> {
testInstance.mergeDataAfterCreate(USER, dataHolder, service, "inst1");
});
- verifyZeroInteractions(componentInstanceInputsRedeclareHandler, toscaOperationFacade);
+ verifyNoInteractions(componentInstanceInputsRedeclareHandler, toscaOperationFacade);
}
@Test
assertThrows(ComponentException.class, () -> {
testInstance.mergeDataAfterCreate(USER, dataHolder, service, "inst1");
});
- verifyZeroInteractions(componentInstanceInputsRedeclareHandler);
+ verifyNoInteractions(componentInstanceInputsRedeclareHandler);
}
private void assertComponentFilter(ComponentParametersView value) {
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)
containerComponent.setComponentInstances(Collections.singletonList(ci));
DataForMergeHolder dataForMergeHolder = new DataForMergeHolder();
externalRefsMergeBL.mergeDataAfterCreate(new User(), dataForMergeHolder, containerComponent, NEW_INSTANCE_ID);
- verifyZeroInteractions(externalReferencesOperation);
+ verifyNoInteractions(externalReferencesOperation);
}
@Test
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)
public void whenPreviousComponentHasNoPolicies_returnOk() {
ActionStatus mergeResult = testInstance.mergeComponents(new Resource(), DONT_CARE);
assertThat(mergeResult).isEqualTo(ActionStatus.OK);
- verifyZeroInteractions(toscaOperationFacade, componentsUtils);
+ verifyNoInteractions(toscaOperationFacade, componentsUtils);
}
@Test
newProp1.setType("int");
testInstance.mergeInstanceDataDefinitions(Collections.singletonList(oldProp1), Collections.emptyList(), Collections.singletonList(newProp1), Collections.emptyList());
- Mockito.verifyZeroInteractions(propertyDataValueMergeBusinessLogicMock);
+ Mockito.verifyNoInteractions(propertyDataValueMergeBusinessLogicMock);
}
@Test
.setValue("val1").build();
testInstance.mergeInstanceDataDefinitions(Collections.singletonList(oldProp1), Collections.emptyList(), Collections.singletonList(newProp1), Collections.emptyList());
- Mockito.verifyZeroInteractions(propertyDataValueMergeBusinessLogicMock);
+ Mockito.verifyNoInteractions(propertyDataValueMergeBusinessLogicMock);
}
@Test
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) {
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)
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
ActionStatus actionStatus = testInstance.mergeResourceEntities(oldResource, newResource);
assertEquals(ActionStatus.GENERAL_ERROR, actionStatus);
verify(commandA).description();
- verifyZeroInteractions(commandB, commandC);
+ verifyNoInteractions(commandB, commandC);
}
}
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"));
}
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;
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
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)
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
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
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
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;
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
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
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)
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
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
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
// 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"));
}
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 {
} catch(ByResponseFormatComponentException e){
assertEquals(errResponse, e.getResponseFormat());
}
- verifyZeroInteractions(toscaOperationFacade, operationalEnvironmentDao, componentsUtils);
+ verifyNoInteractions(toscaOperationFacade, operationalEnvironmentDao, componentsUtils);
}
@Test
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
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
assertEquals(service, activateServiceReq.left().value().getServiceToActivate());
assertEquals("context", activateServiceReq.left().value().getWorkloadContext());
}
-}
\ No newline at end of file
+}
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;
void getPolicyProperties_wrongComponentType() {
Response response = buildGetPropertiesRequest("unknownType").get();
assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode());
- //verifyZeroInteractions(businessLogic);
+ verifyNoInteractions(businessLogic);
}
@Test
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";
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));
}
@Test
- public void singleElementPath() {
+ void singleElementPath() {
Assertions.assertDoesNotThrow(() -> {
createPathSingleElement();
Map<String, ToscaNodeTemplate> nodeTemplatesRes = new HashMap<>();
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)
JanusGraphOperationStatus.NOT_FOUND));
StorageOperationStatus storageOperationStatus = testInstance.updatePolicyProperties(component, POLICY_ID, Collections.emptyList());
assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.NOT_FOUND);
- verifyZeroInteractions(topologyTemplateOperation);
+ verifyNoInteractions(topologyTemplateOperation);
}
@Test
*/
package org.openecomp.sdc.be.model.operations.impl;
-import org.janusgraph.core.JanusGraphVertex;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
import fj.data.Either;
+import java.util.ArrayList;
+import java.util.List;
+import org.janusgraph.core.JanusGraphVertex;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
import org.openecomp.sdc.be.resources.data.ComponentInstanceData;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
@RunWith(MockitoJUnitRunner.class)
public class ComponentInstanceOperationTest {
- @InjectMocks
- private ComponentInstanceOperation componentInstanceOperation;
-
- @Mock
- protected HealingJanusGraphGenericDao janusGraphGenericDao;
-
-
- @Test
- public void testSetJanusGraphGenericDao() {
- componentInstanceOperation.setJanusGraphGenericDao(janusGraphGenericDao);
- }
-
-
- @Test
- public void testUpdateInputValueInResourceInstance() {
- ComponentInstanceInput input = null;
- String resourceInstanceId = "";
- boolean b = false;
- Either<ComponentInstanceInput, StorageOperationStatus> result;
-
- result = componentInstanceOperation.updateInputValueInResourceInstance(input, resourceInstanceId, b);
- assertNull(result);
- }
-
- @Test
- public void testUpdateCustomizationUUID() {
- StorageOperationStatus result;
- String componentInstanceId = "instanceId";
- JanusGraphVertex janusGraphVertex = Mockito.mock(JanusGraphVertex.class);
- when(janusGraphGenericDao.getVertexByProperty(GraphPropertiesDictionary.UNIQUE_ID.getProperty(),componentInstanceId)).thenReturn(Either.left(janusGraphVertex));
- result = componentInstanceOperation.updateCustomizationUUID(componentInstanceId);
- assertEquals(StorageOperationStatus.OK, result);
- }
-
- @Test
- public void testupdateComponentInstanceModificationTimeAndCustomizationUuidOnGraph_CatchException() throws Exception {
+ @InjectMocks
+ private ComponentInstanceOperation componentInstanceOperation;
+
+ @Mock
+ protected HealingJanusGraphGenericDao janusGraphGenericDao;
+
+
+ @Test
+ public void testSetJanusGraphGenericDao() {
+ componentInstanceOperation.setJanusGraphGenericDao(janusGraphGenericDao);
+ }
+
+
+ @Test
+ public void testUpdateInputValueInResourceInstance() {
+ ComponentInstanceInput input = null;
+ String resourceInstanceId = "";
+ boolean b = false;
+ Either<ComponentInstanceInput, StorageOperationStatus> result;
+
+ result = componentInstanceOperation.updateInputValueInResourceInstance(input, resourceInstanceId, b);
+ assertNull(result);
+ }
+
+ @Test
+ public void testUpdateCustomizationUUID() {
+ StorageOperationStatus result;
+ String componentInstanceId = "instanceId";
+ JanusGraphVertex janusGraphVertex = Mockito.mock(JanusGraphVertex.class);
+ when(janusGraphGenericDao.getVertexByProperty(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), componentInstanceId)).thenReturn(
+ Either.left(janusGraphVertex));
+ result = componentInstanceOperation.updateCustomizationUUID(componentInstanceId);
+ assertEquals(StorageOperationStatus.OK, result);
+ }
+
+ @Test
+ public void testupdateComponentInstanceModificationTimeAndCustomizationUuidOnGraph_CatchException() throws Exception {
ComponentInstance componentInstance = new ComponentInstance();
- GroupInstance groupInstance=new GroupInstance();
+ GroupInstance groupInstance = new GroupInstance();
groupInstance.setCreationTime(23234234234L);
groupInstance.setCustomizationUUID("CUSTUUID0.1");
groupInstance.setGroupUid("GRP0.1");
componentInstance.setUniqueId("INST0.1");
componentInstance.setComponentUid("RES0.1");
componentInstance.setGroupInstances(gilist);
- Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, NodeTypeEnum.Component,234234545L,false);
+ Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(
+ componentInstance, NodeTypeEnum.Component, 234234545L, false);
assertEquals(StorageOperationStatus.GENERAL_ERROR, result.right().value());
- }
+ }
@Test
public void testupdateComponentInstanceModificationTimeAndCustomizationUuidOnGraph_GENERAL_ERROR() throws Exception {
ComponentInstance componentInstance = new ComponentInstance();
- GroupInstance groupInstance=new GroupInstance();
+ GroupInstance groupInstance = new GroupInstance();
groupInstance.setCreationTime(23234234234L);
groupInstance.setCustomizationUUID("CUSTUUID0.1");
groupInstance.setGroupUid("GRP0.1");
componentInstance.setUniqueId("INST0.1");
componentInstance.setComponentUid("RES0.1");
componentInstance.setGroupInstances(gilist);
- when(janusGraphGenericDao.updateNode(anyObject(),eq(ComponentInstanceData.class))).thenReturn(Either.right(
+ when(janusGraphGenericDao.updateNode(any(), eq(ComponentInstanceData.class))).thenReturn(Either.right(
JanusGraphOperationStatus.GENERAL_ERROR));
- Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, NodeTypeEnum.Component,234234545L,false);
+ Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(
+ componentInstance, NodeTypeEnum.Component, 234234545L, false);
assertEquals(StorageOperationStatus.GENERAL_ERROR, result.right().value());
}
@Test
public void testupdateComponentInstanceModificationTimeAndCustomizationUuidOnGraph() throws Exception {
ComponentInstance componentInstance = new ComponentInstance();
- GroupInstance groupInstance=new GroupInstance();
+ GroupInstance groupInstance = new GroupInstance();
groupInstance.setCreationTime(23234234234L);
groupInstance.setCustomizationUUID("CUSTUUID0.1");
groupInstance.setGroupUid("GRP0.1");
componentInstance.setComponentUid("RES0.1");
componentInstance.setGroupInstances(gilist);
ComponentInstanceData componentInstanceData = new ComponentInstanceData();
- when(janusGraphGenericDao.updateNode(anyObject(),eq(ComponentInstanceData.class))).thenReturn(Either.left(componentInstanceData));
- Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, NodeTypeEnum.Component,234234545L,false);
+ when(janusGraphGenericDao.updateNode(any(), eq(ComponentInstanceData.class))).thenReturn(Either.left(componentInstanceData));
+ Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(
+ componentInstance, NodeTypeEnum.Component, 234234545L, false);
assertEquals(componentInstanceData, result.left().value());
}
-
+
}
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.openecomp.core.dao.UniqueValueDao;
import org.openecomp.sdc.action.ActionConstants;
import org.openecomp.sdc.action.dao.ActionArtifactDao;
import java.util.List;
import java.util.Map;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@Test
public void testGetFilteredActionsShouldPassForFilterTypeName() {
- Mockito.when(actionDao.getFilteredActions(Matchers.anyString(), Matchers.anyString()))
+ Mockito.when(actionDao.getFilteredActions(anyString(), anyString()))
.thenReturn(mockActionsToReturn());
List<Action> actions = actionManager.getFilteredActions("NAME", ActionConstants.FILTER_TYPE_NAME );
Assert.assertEquals(1, actions.size());
@Test(expected = ActionException.class)
public void testGetFilteredActionsShouldThrowExceptionForFilterTypeNameWhenReturnedActionsOrEmptyOrNull() {
- Mockito.when(actionDao.getFilteredActions(Matchers.anyString(), Matchers.anyString()))
+ Mockito.when(actionDao.getFilteredActions(anyString(), anyString()))
.thenReturn(new ArrayList<>());
actionManager.getFilteredActions("NAME", ActionConstants.FILTER_TYPE_NAME );
}
@Test
public void testGetFilteredActionsByMajorMinorVersionShouldPassWithActiveVersion() {
- Mockito.when(actionDao.getFilteredActions(Matchers.anyString(), Matchers.anyString()))
+ Mockito.when(actionDao.getFilteredActions(anyString(), anyString()))
.thenReturn(mockActionsToReturn());
Map<String, VersionInfo> actionVersionMap = new HashMap<>();
VersionInfo versionInfo = createVersionInfo();
actionVersionMap.put("uuid", versionInfo);
- Mockito.when(versioningManager.listEntitiesVersionInfo(Matchers.anyString(),
- Matchers.anyString(), Matchers.any())).thenReturn(actionVersionMap);
+ Mockito.when(versioningManager.listEntitiesVersionInfo(anyString(),
+ anyString(), any())).thenReturn(actionVersionMap);
List<Action> actions = actionManager.getFilteredActions("type", ActionConstants.FILTER_TYPE_NAME );
Assert.assertEquals(1, actions.size());
}
@Test
public void testGetFilteredActionsByMajorMinorVersionShouldPassWithLatestFinalVersion() {
- Mockito.when(actionDao.getFilteredActions(Matchers.anyString(), Matchers.anyString()))
+ Mockito.when(actionDao.getFilteredActions(anyString(), anyString()))
.thenReturn(mockActionsToReturn());
Map<String, VersionInfo> actionVersionMap = new HashMap<>();
VersionInfo versionInfo = createVersionInfo();
actionVersionMap.put("uuid", versionInfo);
- Mockito.when(versioningManager.listEntitiesVersionInfo(Matchers.anyString(),
- Matchers.anyString(), Matchers.any())).thenReturn(actionVersionMap);
+ Mockito.when(versioningManager.listEntitiesVersionInfo(anyString(),
+ anyString(), any())).thenReturn(actionVersionMap);
List<Action> actions = actionManager.getFilteredActions("type", ActionConstants.FILTER_TYPE_NAME );
Assert.assertEquals(1, actions.size());
}
Mockito.when(versioningManager.checkout(anyString(), anyString(),anyString())).thenReturn(createVersion());
Action action = actionManager.checkout(invariantUuId, "user");
Assert.assertNotNull(action);
- Mockito.verify(actionDao, times(1)).update(Matchers.any(ActionEntity.class));
+ Mockito.verify(actionDao, times(1)).update(any(ActionEntity.class));
}
@Test
public void testCheckinShouldPassForHappyScenario() {
- when(versioningManager.checkin(anyString(), anyString(), anyString(), Matchers.any()))
+ when(versioningManager.checkin(anyString(), anyString(), anyString(), any()))
.thenReturn(createVersion());
when(actionDao.get(any(ActionEntity.class))).thenReturn(createActionEntity());
Assert.assertNotNull(actionManager.checkin("invariantUuid", "user"));
- Mockito.verify(actionDao, times(1)).update(Matchers.any(ActionEntity.class));
+ Mockito.verify(actionDao, times(1)).update(any(ActionEntity.class));
}
@Test(expected = ActionException.class)
public void testCheckinShouldShouldThrowExceptionInCaseOfAnyException() {
- when(versioningManager.checkin(anyString(), anyString(), anyString(), Matchers.any()))
+ when(versioningManager.checkin(anyString(), anyString(), anyString(), any()))
.thenThrow((new CoreException(new ErrorCode.ErrorCodeBuilder()
.withId(VersioningErrorCodes.CHECKIN_ON_UNLOCKED_ENTITY).build())));
actionManager.checkin("invariantUuid", "user");
@Test
public void testSubmitShouldPassForHappyScenario() {
- when(versioningManager.submit(anyString(), anyString(), anyString(), Matchers.any()))
+ when(versioningManager.submit(anyString(), anyString(), anyString(), any()))
.thenReturn(createVersion());
when(actionDao.get(any(ActionEntity.class))).thenReturn(createActionEntity());
Assert.assertNotNull( actionManager.submit("invariantUuid", "user"));
- Mockito.verify(actionDao, times(1)).update(Matchers.any(ActionEntity.class));
+ Mockito.verify(actionDao, times(1)).update(any(ActionEntity.class));
}
@Test(expected = ActionException.class)
public void testSubmitShouldThrowExceptionForAnyException() {
- when(versioningManager.submit(anyString(), anyString(), anyString(), Matchers.any()))
+ when(versioningManager.submit(anyString(), anyString(), anyString(), any()))
.thenThrow((new CoreException(new ErrorCode.ErrorCodeBuilder()
.withId(VersioningErrorCodes.SUBMIT_FINALIZED_ENTITY_NOT_ALLOWED).build())));
actionManager.submit("invariantUuid", "user");
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.ITEM_ID_PROP;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.jupiter.MockitoExtension;
}
private void verifyDirectNotificationCallParameters(String affectedUser, boolean permissionGranted) {
- verify(notifierMock).directNotification(eventArgumentCaptor.capture(), Matchers.eq(affectedUser));
+ verify(notifierMock).directNotification(eventArgumentCaptor.capture(), eq(affectedUser));
Event event = eventArgumentCaptor.getValue();
assertTrue(event.getEventType().equals(PERMISSION_CHANGED));
Map<String, Object> attributes = event.getAttributes();
import java.util.Collection;
import java.util.List;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
info.getViewableVersions().add(version);
info.setActiveVersion(version);
- /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(), anyObject(), anyObject());*/
- doReturn(true).when(limitDao).isLimitPresent(anyObject());
- doReturn(limitEntity1).when(limitDao).get(anyObject());
+ /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(), any(), any());*/
+ doReturn(true).when(limitDao).isLimitPresent(any());
+ doReturn(limitEntity1).when(limitDao).get(any());
List<LimitEntity> limitEntityList = new ArrayList<>();
limitEntityList.add(limitEntity1);
limitEntity1.setId("1234");
limitEntity2.setId("1234");
doReturn(limitEntityList).when(vendorLicenseFacade)
- .listLimits(anyObject(), anyObject(), anyObject());
+ .listLimits(any(), any(), any());
vendorLicenseManagerImpl.updateLimit(limitEntity2);
- verify(vendorLicenseFacade).updateLimit(anyObject());
+ verify(vendorLicenseFacade).updateLimit(any());
}
@Test
info.setActiveVersion(version);
/* doReturn(info).when(vendorLicenseFacade)
- .getVersionInfo(anyObject(), anyObject(), anyObject());*/
- doReturn(limitEntity1).when(limitDao).get(anyObject());
+ .getVersionInfo(any(), any(), any());*/
+ doReturn(limitEntity1).when(limitDao).get(any());
List<LimitEntity> limitEntityList = new ArrayList<>();
limitEntityList.add(limitEntity1);
limitEntity1.setId("1234");
limitEntity2.setId("9632");
doReturn(limitEntityList).when(vendorLicenseFacade)
- .listLimits(anyObject(), anyObject(), anyObject());
+ .listLimits(any(), any(), any());
vendorLicenseManagerImpl.updateLimit(limitEntity2);
Assert.fail();
info.getViewableVersions().add(version);
info.setActiveVersion(version);
- /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(), anyObject(), anyObject());*/
- doReturn(true).when(limitDao).isLimitPresent(anyObject());
- doReturn(limitEntity).when(limitDao).get(anyObject());
+ /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(), any(), any());*/
+ doReturn(true).when(limitDao).isLimitPresent(any());
+ doReturn(limitEntity).when(limitDao).get(any());
List<LimitEntity> limitEntityList = new ArrayList<>();
limitEntityList.add(limitEntity);
vendorLicenseManagerImpl.deleteLimit(limitEntity);
- verify(vendorLicenseManagerImpl).deleteLimit(anyObject());
+ verify(vendorLicenseManagerImpl).deleteLimit(any());
}
@Test
info.setActiveVersion(version);
/* doReturn(info).when(vendorLicenseFacade)
- .getVersionInfo(anyObject(), anyObject(), anyObject());*/
- doReturn(null).when(limitDao).get(anyObject());
+ .getVersionInfo(any(), any(), any());*/
+ doReturn(null).when(limitDao).get(any());
vendorLicenseManagerImpl.updateLimit(limitEntity2);
Assert.fail();
info.getViewableVersions().add(VERSION);
info.setActiveVersion(VERSION);
- /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(), anyObject(), anyObject());*/
+ /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(), any(), any());*/
vendorLicenseManagerImpl.createLimit(expected);
verify(vendorLicenseFacade).createLimit(expected);
List<LimitEntity> vfcImageList = new ArrayList<LimitEntity>();
vfcImageList.add(expectedDiffName);
doReturn(vfcImageList).when(vendorLicenseFacade)
- .listLimits(anyObject(), anyObject(), anyObject());
+ .listLimits(any(), any(), any());
VersionInfo info = new VersionInfo();
info.getViewableVersions().add(VERSION);
info.setActiveVersion(VERSION);
-/* doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(), anyObject(), anyObject());*/
+/* doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(), any(), any());*/
try {
vendorLicenseManagerImpl.createLimit(expected);
info.getViewableVersions().add(VERSION);
info.setActiveVersion(VERSION);
- /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(), anyObject(), anyObject());*/
+ /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(), any(), any());*/
try {
vendorLicenseManagerImpl.getLimit(limit);
expected.setMetric("BWTH");
expected.setTime("Day");
- doReturn(true).when(limitDao).isLimitPresent(anyObject());
- doReturn(expected).when(limitDao).get(anyObject());
+ doReturn(true).when(limitDao).isLimitPresent(any());
+ doReturn(expected).when(limitDao).get(any());
VersionInfo info = new VersionInfo();
info.getViewableVersions().add(VERSION);
info.setActiveVersion(VERSION);
- /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(), anyObject(), anyObject());*/
+ /*doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(), any(), any());*/
LimitEntity actual = createLimit(VLM_ID, VERSION, EPLKG_ID, LIMIT1_ID);
vendorLicenseManagerImpl.getLimit(actual);
import java.util.HashSet;
import java.util.Set;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
public class FeatureGroupTest {
"partNumber", "MRN", licenseKeyGroupIds, entitlementPoolIds,
referencingLicenseAgreements);
- doReturn(featureGroupEntity).when(featureGroupDao).get(anyObject());
+ doReturn(featureGroupEntity).when(featureGroupDao).get(any());
/*if(featureGroupEntity.getManufacturerReferenceNumber() != null)
featureGroupDao.update(featureGroupEntity);
- verify(featureGroupDao).update(anyObject());*/
+ verify(featureGroupDao).update(any());*/
}
@Test
"partNumber", null, licenseKeyGroupIds, entitlementPoolIds,
referencingLicenseAgreements);
- doReturn(featureGroupEntity).when(featureGroupDao).get(anyObject());
+ doReturn(featureGroupEntity).when(featureGroupDao).get(any());
/*if(featureGroupEntity.getManufacturerReferenceNumber() != null)
featureGroupDao.update(featureGroupEntity);
- verify(featureGroupDao, never()).update(anyObject());*/
+ verify(featureGroupDao, never()).update(any());*/
}
@Test
doReturn(lkg1).when(licenseKeyGroupDao).get(lkg1);
doReturn(lkg2).when(licenseKeyGroupDao).get(lkg2);
- doNothing().when(vendorLicenseManagerImpl).updateUniqueName(anyObject(), anyObject(),
- anyObject(), anyObject(), anyObject());
+ doNothing().when(vendorLicenseManagerImpl).updateUniqueName(any(), any(),
+ any(), any(), any());
vendorLicenseManagerImpl.updateFeatureGroup(existingFG, addedLKGs, removedLKGs, addedEPs,
removedEPs);
existingFG.setEntitlementPoolIds(new HashSet<String>());
existingFG.setLicenseKeyGroupIds(new HashSet<String>());
- doReturn(existingFG).when(featureGroupDao).get(anyObject());
+ doReturn(existingFG).when(featureGroupDao).get(any());
Set<String> removedEPs = new HashSet<>();
Set<String> addedEPs = new HashSet<>();
doReturn(lkg1).when(licenseKeyGroupDao).get(lkg1);
doReturn(lkg2).when(licenseKeyGroupDao).get(lkg2);
- doNothing().when(vendorLicenseManagerImpl).updateUniqueName(anyObject(), anyObject(),
- anyObject(),anyObject(), anyObject());
+ doNothing().when(vendorLicenseManagerImpl).updateUniqueName(any(), any(),
+ any(),any(), any());
FeatureGroupEntity fg = new FeatureGroupEntity(vlm1_id, VERSION01, fg1_id);
existingFG.setEntitlementPoolIds(epSet);
existingFG.setLicenseKeyGroupIds(lkgSet);
- doReturn(existingFG).when(featureGroupDao).get(anyObject());
+ doReturn(existingFG).when(featureGroupDao).get(any());
EntitlementPoolEntity ep1 = new EntitlementPoolEntity(vlm1_id, VERSION01, ep1_id);
doReturn(ep1).when(entitlementPoolDao).get(ep1);
Set<String> removedLKGs = new HashSet<>();
Set<String> addedLKGs = new HashSet<>();
- doNothing().when(vendorLicenseManagerImpl).updateUniqueName(anyObject(), anyObject(),
- anyObject(),anyObject(), anyObject());
+ doNothing().when(vendorLicenseManagerImpl).updateUniqueName(any(), any(),
+ any(),any(), any());
FeatureGroupEntity fg = new FeatureGroupEntity(vlm1_id, VERSION01, fg1_id);
existingFG.setEntitlementPoolIds(new HashSet<String>());
existingFG.setLicenseKeyGroupIds(new HashSet<String>());
- doReturn(existingFG).when(featureGroupDao).get(anyObject());
+ doReturn(existingFG).when(featureGroupDao).get(any());
doNothing().when(vendorLicenseManagerImpl).deleteUniqueName(VendorLicenseConstants
.UniqueValues.FEATURE_GROUP_NAME, vlm1_id, VERSION01.toString(), existingFG.getName());
import java.util.HashSet;
import java.util.Set;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
public class LicenseAgreementTest {
FeatureGroupEntity fg2 = new FeatureGroupEntity(vlm1_id, VERSION01, fg2_id);
doReturn(fg1).when(featureGroupDaoMcok).get(fg1);
doReturn(fg2).when(featureGroupDaoMcok).get(fg2);
- doNothing().when(vendorLicenseManager).updateUniqueName(anyObject(), anyObject(), anyObject(),
- anyObject(), anyObject());
+ doNothing().when(vendorLicenseManager).updateUniqueName(any(), any(), any(),
+ any(), any());
vendorLicenseManager.updateLicenseAgreement(existingLA, addedFGs, removedFGs);
existingLA.setName("LA");
existingLA.setFeatureGroupIds(new HashSet<>());
- doReturn(existingLA).when(licenseAgreementDaoMcok).get(anyObject());
+ doReturn(existingLA).when(licenseAgreementDaoMcok).get(any());
doNothing().when(vendorLicenseManager).deleteUniqueName(VendorLicenseConstants.UniqueValues
.LICENSE_AGREEMENT_NAME, vlm1_id, VERSION01.toString(), existingLA.getName());
import java.util.HashSet;
import java.util.Set;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
public class LicenseKeyGroupTest {
Version version = new Version();
info.getViewableVersions().add(version);
info.setActiveVersion(version);
- doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(),anyObject(),anyObject());
+ doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(),any(),any());
LimitEntity limitEntity = LimitTest.createLimitEntity(LT_NAME,LimitType.Vendor,"string",version,
"Core",AggregationFunction.Average,10,"Hour");
ArrayList<LimitEntity> limitEntityList = new ArrayList();
limitEntityList.add(limitEntity);
- doReturn(licenseKeyGroup).when(licenseKeyGroupDao).get(anyObject());
- doReturn(limitEntityList).when(vendorLicenseFacade).listLimits(anyObject(), anyObject(), anyObject(), anyObject());
- doReturn(true).when(limitDao).isLimitPresent(anyObject());
- doReturn(limitEntity).when(limitDao).get(anyObject());
+ doReturn(licenseKeyGroup).when(licenseKeyGroupDao).get(any());
+ doReturn(limitEntityList).when(vendorLicenseFacade).listLimits(any(), any(), any(), any());
+ doReturn(true).when(limitDao).isLimitPresent(any());
+ doReturn(limitEntity).when(limitDao).get(any());
try {
Field limitField = VendorLicenseManagerImpl.class.getDeclaredField("limitDao");
limitField.setAccessible(true);
vendorLicenseManagerImpl.deleteLicenseKeyGroup(licenseKeyGroup, USER);
- verify(limitDao).delete(anyObject());
+ verify(limitDao).delete(any());
}
@Test
Version version = new Version();
info.getViewableVersions().add(version);
info.setActiveVersion(version);
- doReturn(info).when(vendorLicenseFacade).getVersionInfo(anyObject(),anyObject(),anyObject());
+ doReturn(info).when(vendorLicenseFacade).getVersionInfo(any(),any(),any());
LimitEntity limitEntity = LimitTest.createLimitEntity(LT_NAME,LimitType.Vendor,"string",version,
"Core",AggregationFunction.Average,10,"Hour");
ArrayList<LimitEntity> limitEntityList = new ArrayList();
limitEntityList.add(limitEntity);
- doReturn(licenseKeyGroup).when(licenseKeyGroupDao).get(anyObject());
- doReturn(limitEntityList).when(vendorLicenseFacade).listLimits(anyObject(), anyObject(), anyObject(), anyObject());
- doReturn(false).when(limitDao).isLimitPresent(anyObject());
+ doReturn(licenseKeyGroup).when(licenseKeyGroupDao).get(any());
+ doReturn(limitEntityList).when(vendorLicenseFacade).listLimits(any(), any(), any(), any());
+ doReturn(false).when(limitDao).isLimitPresent(any());
try {
Field limitField = VendorLicenseManagerImpl.class.getDeclaredField("limitDao");
LicenseKeyGroupEntity lkg = createLicenseKeyGroup(vlm1_id, VERSION01, lkg1_id, LKG1_NAME,
"LKG1 dec", LicenseKeyType.Universal, multiChoiceOrOther);
- doReturn(lkg).when(licenseKeyGroupDao).get(anyObject());
+ doReturn(lkg).when(licenseKeyGroupDao).get(any());
LicenseKeyGroupEntity lkgRetrived = vendorLicenseManagerImpl.getLicenseKeyGroup(lkg);
verify(licenseKeyGroupDao).get(lkg);
lkg.setReferencingFeatureGroups(new HashSet<>());
- doReturn(lkg).when(licenseKeyGroupDao).get(anyObject());
+ doReturn(lkg).when(licenseKeyGroupDao).get(any());
doNothing().when(vendorLicenseManagerImpl).deleteChildLimits(vlm1_id, VERSION01, lkg1_id);
- doNothing().when(vendorLicenseManagerImpl).deleteUniqueName(anyObject(), anyObject(),
- anyObject(), anyObject());
+ doNothing().when(vendorLicenseManagerImpl).deleteUniqueName(any(), any(),
+ any(), any());
vendorLicenseManagerImpl.deleteLicenseKeyGroup(lkg);
import java.util.List;
import java.util.ArrayList;
import java.util.HashSet;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.hamcrest.MatcherAssert.assertThat;
package org.openecomp.sdc.itempermissions.dao.impl;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
public void testListItemPermissions() {
doReturn(Arrays.asList(createPermissionEntity(ITEM1_ID, USER1_ID, PERMISSION),
createPermissionEntity(ITEM1_ID, USER2_ID, PERMISSION))).when(permissionsDaoMock)
- .listItemPermissions(anyObject());
+ .listItemPermissions(any());
Collection<ItemPermissionsEntity> actual = permissionsServices.listItemPermissions(ITEM1_ID);
Assert.assertEquals(2, actual.size());
package org.openecomp.sdc.enrichment.impl.external.artifact;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.times;
"pd_server"));
returnedComponents.add(getComponentEntity(vspId, version, componentId2,
"pd_server"));
- Mockito.when(componentDaoMock.list(anyObject()))
+ Mockito.when(componentDaoMock.list(any()))
.thenReturn(returnedComponents);
setMockToEnrichComponent(vspId, version, componentId1);
returnedArtifact.setArtifactName("mib.zip");
returnedArtifact.setArtifact(getMibByteBuffer("/mock/enrichMib/MIB.zip"));
- Mockito.when(componentArtifactDaoMock.getByType(anyObject()))
+ Mockito.when(componentArtifactDaoMock.getByType(any()))
.thenReturn(Optional.of(returnedArtifact));
- Mockito.doNothing().when(enrichedServiceModelDaoMock).storeExternalArtifact(anyObject());
+ Mockito.doNothing().when(enrichedServiceModelDaoMock).storeExternalArtifact(any());
}
private ComponentEntity getComponentEntity(String vspId,
package org.openecomp.sdc.enrichment.impl.external.artifact;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.when;
Collection<ComponentEntity> componentList = new ArrayList<>();
componentList.add(componentEntity);
- when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+ when(componentDaoMock.list(any())).thenReturn(componentList);
Collection<ProcessEntity> list = new ArrayList<>();
list.add(processEntity);
when(processDaoMock.list(entity)).thenReturn(list);
- when(processDaoMock.getArtifact(anyObject())).thenReturn(processEntity);
+ when(processDaoMock.getArtifact(any())).thenReturn(processEntity);
EnrichmentInfo info = new EnrichmentInfo();
info.setVersion(version);
Collection<ComponentEntity> componentList = new ArrayList<>();
componentList.add(componentEntity);
- when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+ when(componentDaoMock.list(any())).thenReturn(componentList);
Collection<ProcessEntity> list = new ArrayList<>();
list.add(processEntity);
when(processDaoMock.list(entity)).thenReturn(list);
- when(processDaoMock.getArtifact(anyObject())).thenReturn(processEntity);
+ when(processDaoMock.getArtifact(any())).thenReturn(processEntity);
EnrichmentInfo info = new EnrichmentInfo();
info.setVersion(version);
Collection<ComponentEntity> componentList = new ArrayList<>();
componentList.add(componentEntity);
- when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+ when(componentDaoMock.list(any())).thenReturn(componentList);
Collection<ProcessEntity> list = new ArrayList<>();
list.add(processEntity);
when(processDaoMock.list(entity)).thenReturn(list);
- when(processDaoMock.getArtifact(anyObject())).thenReturn(null);
+ when(processDaoMock.getArtifact(any())).thenReturn(null);
EnrichmentInfo info = new EnrichmentInfo();
info.setVersion(version);
Collection<ComponentEntity> componentList = new ArrayList<>();
componentList.add(componentEntity);
- when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+ when(componentDaoMock.list(any())).thenReturn(componentList);
Collection<ProcessEntity> list = new ArrayList<>();
list.add(processEntity);
when(processDaoMock.list(entity)).thenReturn(list);
- when(processDaoMock.getArtifact(anyObject())).thenReturn(processEntity);
+ when(processDaoMock.getArtifact(any())).thenReturn(processEntity);
EnrichmentInfo info = new EnrichmentInfo();
info.setVersion(version);
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
/**
import org.openecomp.sdc.notification.services.PropagationService;
import org.openecomp.sdc.notification.services.SubscriptionService;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
public void shouldCallPropagationServiceNotifyWithMulticastDestinationWhenNotifySubscribers()
throws Exception {
notificationPropagationManager.notifySubscribers(eventMock);
- verify(propagationServiceMock).notify(Matchers.eq(eventMock), destinationProviderCaptor
+ verify(propagationServiceMock).notify(eq(eventMock), destinationProviderCaptor
.capture());
Assert.assertTrue(destinationProviderCaptor.getValue() instanceof MulticastDestination);
public void shouldCallPropagationServiceNotifyWithUnicastDestinationWhenDirectNotification()
throws Exception {
notificationPropagationManager.directNotification(eventMock, "aaa");
- verify(propagationServiceMock).notify(Matchers.eq(eventMock), destinationProviderCaptor
+ verify(propagationServiceMock).notify(eq(eventMock), destinationProviderCaptor
.capture());
Assert.assertTrue(destinationProviderCaptor.getValue() instanceof UnicastDestination);
}
import java.util.UUID;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
/**
import java.util.HashMap;
import java.util.List;
-import static org.mockito.Matchers.anyList;
+import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.*;
/**
import java.net.URISyntaxException;
import java.util.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
package org.openecomp.sdc.translator.services.heattotosca;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
unifiedCompositionDataList.add(unifiedCompositionData);
Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
unifiedCompositionService
unifiedCompositionDataList.add(unifiedCompositionData);
Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
unifiedCompositionService
List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
unifiedCompositionDataList.add(unifiedCompositionData);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
.put(FSB1, abstractNodeTemplate);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
unifiedCompositionService.
inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
.put(FSB1, abstractNodeTemplate);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
anyString());
unifiedCompositionService.
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import java.io.IOException;
package org.openecomp.sdc.versioning.dao.impl.zusammen;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.openecomp.sdc.versioning.dao.impl.zusammen.ItemZusammenDaoImpl.ItemInfoProperty.ITEM_TYPE;
package org.openecomp.sdc.versioning.dao.impl.zusammen;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
String versionId = "versionId";
doReturn(new Id(versionId)).when(zusammenAdaptorMock)
.createVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)),
- baseId == null ? isNull(Id.class) : eq(new Id(baseId)),
+ baseId == null ? isNull(/*Id.class*/) : eq(new Id(baseId)),
capturedZusammenVersion.capture());
Assert.assertEquals(revision.getUser(), zusammenRevision.getUser());
Assert.assertEquals(revision.getTime(), zusammenRevision.getTime());
}
-}
\ No newline at end of file
+}
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
assertEquals(actual.getName(), expected.getName());
assertEquals(actual.getType(), expected.getType());
}
-}
\ No newline at end of file
+}
package org.openecomp.sdc.versioning.impl;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.onap.sdc.tosca.datatypes.model.AttributeDefinition;
import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition;
import org.onap.sdc.tosca.datatypes.model.EntrySchema;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition;
import org.onap.sdc.tosca.datatypes.model.CapabilityType;
import org.onap.sdc.tosca.datatypes.model.Constraint;
<commons-jci-core.version>1.1</commons-jci-core.version>
<!--TESTING-->
- <mockito.version>3.7.7</mockito.version>
+ <mockito.version>4.10.0</mockito.version>
<mockitoJupiter.version>${mockito.version}</mockitoJupiter.version>
<jmockit.version>1.35</jmockit.version>
- <junit.platform.version>1.7.1</junit.platform.version>
- <junitJupiter.version>5.7.2</junitJupiter.version>
+ <junit.platform.version>1.9.1</junit.platform.version>
+ <junitJupiter.version>5.9.1</junitJupiter.version>
<assertj.version>3.16.0</assertj.version>
- <testng.version>7.4.0</testng.version>
- <cucumber.version>6.8.1</cucumber.version>
+ <testng.version>7.7.0</testng.version>
+ <cucumber.version>7.10.1</cucumber.version>
<bean-matchers.version>0.11</bean-matchers.version>
<hamcrest.version>2.2</hamcrest.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
Code Review / sdc.git / commitdiff