Update third party versions in ccsdk/apps

[ccsdk/apps.git] / ms / neng / src / test / java / org / onap / ccsdk / apps / ms / neng / core / gen / NameGeneratorDependencyEarlierTest.java

diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorDependencyEarlierTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorDependencyEarlierTest.java
index 2925179..cdddada 100644 (file)
--- a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorDependencyEarlierTest.java
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorDependencyEarlierTest.java
@@ -21,8 +21,8 @@
 package org.onap.ccsdk.apps.ms.neng.core.gen;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -35,7 +35,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.ccsdk.apps.ms.neng.core.persistence.NamePersister;
 import org.onap.ccsdk.apps.ms.neng.core.policy.FilePolicyReader;
 import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyFinder;
@@ -103,9 +103,9 @@ public class NameGeneratorDependencyEarlierTest {
 
         Map<String, Object> policy = new FilePolicyReader("vnf_and_vm_policy.json").getPolicy();
         Mockito.lenient().when(policyFinder.findPolicy(policyName)).thenReturn(policy);
-        Mockito.lenient().when(aaiValidator.validate(anyObject(), anyObject())).thenReturn(true);
-        Mockito.lenient().when(dbValidator.validate(anyObject(), anyObject())).thenReturn(true);
-        Mockito.lenient().when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), anyInt())).thenReturn(1L);
+        Mockito.lenient().when(aaiValidator.validate(any(), any())).thenReturn(true);
+        Mockito.lenient().when(dbValidator.validate(any(), any())).thenReturn(true);
+        Mockito.lenient().when(sequenceGenerator.generate(any(), any(), any(), any(), anyInt())).thenReturn(1L);
 
         NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
                         namePresister, requestElement1, allElements, earlierNames, policyCache, new ArrayList<>());