X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ms%2Fneng%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fccsdk%2Fapps%2Fms%2Fneng%2Fcore%2Fgen%2FNameGeneratorSeqGenErrorsTest.java;h=d5ba85b200f6d617368e4fea430c42ecf54cf5e8;hb=c2556dd48738b43e91e27a57df60c3ec347c5ac0;hp=bf8e9b35bb7f45b6d88fff43b7d6c6ed0154f478;hpb=7ae63cbdf21b06e0234d51a3200f9ebbf393f8eb;p=ccsdk%2Fapps.git

diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorSeqGenErrorsTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorSeqGenErrorsTest.java
index bf8e9b35..d5ba85b2 100644
--- a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorSeqGenErrorsTest.java
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGeneratorSeqGenErrorsTest.java
@@ -22,7 +22,7 @@ package org.onap.ccsdk.apps.ms.neng.core.gen;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.onap.ccsdk.apps.ms.neng.core.persistence.NamePersister;
 import org.onap.ccsdk.apps.ms.neng.core.policy.FilePolicyReader;
@@ -108,13 +108,13 @@ public class NameGeneratorSeqGenErrorsTest {
         Mockito.lenient().when(policyParams.getMaxGenAttempt()).thenReturn(100);
         Mockito.lenient().when(policyFinder.findPolicy(policyName)).thenReturn(policy);
 
-        Mockito.lenient().when(aaiValidator.validate(anyObject(), anyObject())).thenReturn(true);
-        Mockito.lenient().when(aaiValidator.validate(eq("VNF"), anyObject())).thenReturn(true);
+        Mockito.lenient().when(aaiValidator.validate(any(), any())).thenReturn(true);
+        Mockito.lenient().when(aaiValidator.validate(eq("VNF"), any())).thenReturn(true);
         Mockito.lenient().when(aaiValidator.validate(eq("VNF"), eq("abcde001ve1"))).thenReturn(false);
 
-        Mockito.lenient().when(dbValidator.validate(anyObject(), anyObject())).thenReturn(true);
-        Mockito.lenient().when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), eq(1))).thenReturn(1L);
-        Mockito.lenient().when(sequenceGenerator.generate(eq("abcde"), anyObject(), anyObject(), anyObject(), eq(2))).thenReturn(2L);
+        Mockito.lenient().when(dbValidator.validate(any(), any())).thenReturn(true);
+        Mockito.lenient().when(sequenceGenerator.generate(any(), any(), any(), any(), eq(1))).thenReturn(1L);
+        Mockito.lenient().when(sequenceGenerator.generate(eq("abcde"), any(), any(), any(), eq(2))).thenReturn(2L);
 
         final List<Object> savedNames = new ArrayList<>();
         doAnswer(new Answer<Void>() {
@@ -123,7 +123,7 @@ public class NameGeneratorSeqGenErrorsTest {
                 savedNames.add(invocation.getArguments()[0]);
                 return null;
             }
-        }).when(namePresister).persist(anyObject());
+        }).when(namePresister).persist(any());
 
         NameGenerator gen2 = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
                         namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
@@ -180,10 +180,10 @@ public class NameGeneratorSeqGenErrorsTest {
         Map<String, Object> policy = new FilePolicyReader("vnf_and_vm_policy.json").getPolicy();
         Mockito.lenient().when(policyParams.getMaxGenAttempt()).thenReturn(3);
         Mockito.lenient().when(policyFinder.findPolicy(policyName)).thenReturn(policy);
-        Mockito.lenient().when(dbValidator.validate(anyObject(), anyObject())).thenReturn(false);
-        Mockito.lenient().when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), eq(1))).thenReturn(1L);
-        Mockito.lenient().when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), eq(2))).thenReturn(2L);
-        Mockito.lenient().when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), eq(3))).thenReturn(3L);
+        Mockito.lenient().when(dbValidator.validate(any(), any())).thenReturn(false);
+        Mockito.lenient().when(sequenceGenerator.generate(any(), any(), any(), any(), eq(1))).thenReturn(1L);
+        Mockito.lenient().when(sequenceGenerator.generate(any(), any(), any(), any(), eq(2))).thenReturn(2L);
+        Mockito.lenient().when(sequenceGenerator.generate(any(), any(), any(), any(), eq(3))).thenReturn(3L);
 
         NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
                         namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
@@ -210,7 +210,7 @@ public class NameGeneratorSeqGenErrorsTest {
         Map<String, Object> policy = new FilePolicyReader("vnf_policy_no_seq.json").getPolicy();
         Mockito.lenient().when(policyParams.getMaxGenAttempt()).thenReturn(3);
         Mockito.lenient().when(policyFinder.findPolicy(policyName)).thenReturn(policy);
-        Mockito.lenient().when(dbValidator.validate(anyObject(), anyObject())).thenReturn(false);
+        Mockito.lenient().when(dbValidator.validate(any(), any())).thenReturn(false);
 
         NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
                         namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());