diff options
Diffstat (limited to 'ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceIntTest.java')
-rw-r--r-- | ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceIntTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceIntTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceIntTest.java index 61d68115..7882a221 100644 --- a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceIntTest.java +++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceIntTest.java @@ -39,7 +39,7 @@ import javax.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.onap.ccsdk.apps.ms.neng.core.exceptions.NengException; @@ -129,8 +129,8 @@ public class SpringServiceIntTest { public void testGenName_1() throws Exception { ResponseEntity<Object> resp = new ResponseEntity<Object>( getConfigResponse("JQINSRIOV.Config_MS_SriovBigJson.1.xml"), HttpStatus.OK); - Mockito.lenient().when(restTemplate.exchange(Matchers.any(RequestEntity.class), Matchers.any(Class.class))).thenReturn(resp); - Mockito.lenient().when(aaiServiceImpl.validate(Matchers.anyString(), Matchers.anyString())).thenReturn(true); + Mockito.lenient().when(restTemplate.exchange(ArgumentMatchers.any(RequestEntity.class), ArgumentMatchers.any(Class.class))).thenReturn(resp); + Mockito.lenient().when(aaiServiceImpl.validate(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(true); NameGenRequest request = nameGenRequest_1(); NameGenResponse genresp = springService.genNetworkElementName(request); assertTrue("vnf-name".equals(genresp.getElements().get(0).get("resource-name"))); @@ -180,8 +180,8 @@ public class SpringServiceIntTest { NameGenRequest request = nameGenRequest_1(); ResponseEntity<Object> resp = new ResponseEntity<Object>( getConfigResponse("JQINSRIOV.Config_MS_SriovBigJson.1.xml"), HttpStatus.OK); - Mockito.lenient().when(restTemplate.exchange(Matchers.any(RequestEntity.class), Matchers.any(Class.class))).thenReturn(resp); - Mockito.lenient().when(aaiServiceImpl.validate(Matchers.anyString(), Matchers.anyString())).thenReturn(true); + Mockito.lenient().when(restTemplate.exchange(ArgumentMatchers.any(RequestEntity.class), ArgumentMatchers.any(Class.class))).thenReturn(resp); + Mockito.lenient().when(aaiServiceImpl.validate(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(true); restServiceImpl.generateNetworkElementName(request); } @@ -262,7 +262,7 @@ public class SpringServiceIntTest { reqMap.put("resource-name", "vnf-name"); reqMap.put("resource-value", "DG001ESP1"); - Mockito.lenient().when(aaiServiceImpl.validate(Matchers.anyString(), Matchers.anyString())).thenReturn(true); + Mockito.lenient().when(aaiServiceImpl.validate(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(true); List<Map<String,String>> elList = new ArrayList<>(); elList.add(reqMap); |