aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/backend
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/backend')
-rw-r--r--openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/impl/ActionManagerImplTest.java39
-rw-r--r--openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java4
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/LimitTest.java44
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/FeatureGroupTest.java28
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseAgreementTest.java8
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseKeyGroupTest.java30
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseModelTest.java2
7 files changed, 77 insertions, 78 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/impl/ActionManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/impl/ActionManagerImplTest.java
index a2038206c2..db2a0df576 100644
--- a/openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/impl/ActionManagerImplTest.java
+++ b/openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/impl/ActionManagerImplTest.java
@@ -22,11 +22,10 @@ import org.junit.Assert;
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;
@@ -55,9 +54,9 @@ import java.util.HashMap;
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;
@@ -113,7 +112,7 @@ public class ActionManagerImplTest {
@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());
@@ -121,37 +120,37 @@ public class ActionManagerImplTest {
@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());
}
@@ -232,7 +231,7 @@ public class ActionManagerImplTest {
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));
}
@@ -270,16 +269,16 @@ public class ActionManagerImplTest {
@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");
@@ -287,18 +286,18 @@ public class ActionManagerImplTest {
@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");
diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java
index eb7afd6d1b..1b53266033 100644
--- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java
+++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java
@@ -18,6 +18,7 @@ package org.openecomp.sdc.itempermissions.dao.impl;
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;
@@ -38,7 +39,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
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;
@@ -133,7 +133,7 @@ class PermissionsManagerImplTest {
}
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();
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/LimitTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/LimitTest.java
index 52923877cf..046948223c 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/LimitTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/LimitTest.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
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;
@@ -102,9 +102,9 @@ public class LimitTest {
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);
@@ -112,11 +112,11 @@ public class LimitTest {
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
@@ -132,8 +132,8 @@ public class LimitTest {
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);
@@ -141,7 +141,7 @@ public class LimitTest {
limitEntity1.setId("1234");
limitEntity2.setId("9632");
doReturn(limitEntityList).when(vendorLicenseFacade)
- .listLimits(anyObject(), anyObject(), anyObject());
+ .listLimits(any(), any(), any());
vendorLicenseManagerImpl.updateLimit(limitEntity2);
Assert.fail();
@@ -160,9 +160,9 @@ public class LimitTest {
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);
@@ -170,7 +170,7 @@ public class LimitTest {
vendorLicenseManagerImpl.deleteLimit(limitEntity);
- verify(vendorLicenseManagerImpl).deleteLimit(anyObject());
+ verify(vendorLicenseManagerImpl).deleteLimit(any());
}
@Test
@@ -186,8 +186,8 @@ public class LimitTest {
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();
@@ -220,7 +220,7 @@ public class LimitTest {
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);
@@ -238,13 +238,13 @@ public class LimitTest {
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);
@@ -262,7 +262,7 @@ public class LimitTest {
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);
@@ -283,13 +283,13 @@ public class LimitTest {
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);
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/FeatureGroupTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/FeatureGroupTest.java
index 253337dc83..ef2910c4fd 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/FeatureGroupTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/FeatureGroupTest.java
@@ -37,7 +37,7 @@ import java.util.Collection;
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 {
@@ -137,11 +137,11 @@ 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
@@ -163,11 +163,11 @@ public class FeatureGroupTest {
"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
@@ -230,8 +230,8 @@ public class FeatureGroupTest {
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);
@@ -255,7 +255,7 @@ public class FeatureGroupTest {
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<>();
@@ -277,8 +277,8 @@ public class FeatureGroupTest {
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);
@@ -306,7 +306,7 @@ public class FeatureGroupTest {
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);
@@ -319,8 +319,8 @@ public class FeatureGroupTest {
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);
@@ -357,7 +357,7 @@ public class FeatureGroupTest {
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());
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseAgreementTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseAgreementTest.java
index 4e5045256c..78b4e0dc94 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseAgreementTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseAgreementTest.java
@@ -37,7 +37,7 @@ import java.util.Collection;
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 {
@@ -195,8 +195,8 @@ 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);
@@ -213,7 +213,7 @@ public class LicenseAgreementTest {
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());
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseKeyGroupTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseKeyGroupTest.java
index 96e78a450c..c7be4a933c 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseKeyGroupTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseKeyGroupTest.java
@@ -42,7 +42,7 @@ import java.util.Collection;
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 {
@@ -108,7 +108,7 @@ 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");
@@ -116,10 +116,10 @@ public class LicenseKeyGroupTest {
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);
@@ -141,7 +141,7 @@ public class LicenseKeyGroupTest {
vendorLicenseManagerImpl.deleteLicenseKeyGroup(licenseKeyGroup, USER);
- verify(limitDao).delete(anyObject());
+ verify(limitDao).delete(any());
}
@Test
@@ -160,7 +160,7 @@ 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");
@@ -168,9 +168,9 @@ public class LicenseKeyGroupTest {
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");
@@ -411,7 +411,7 @@ public class LicenseKeyGroupTest {
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);
@@ -438,12 +438,12 @@ public class LicenseKeyGroupTest {
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);
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseModelTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseModelTest.java
index 30c1c03322..7b0216d5b6 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseModelTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseModelTest.java
@@ -40,7 +40,7 @@ import java.util.Set;
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;