diff options
author | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2018-11-28 09:15:09 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-11-28 09:15:09 +0000 |
commit | fa8462f2d91bdbfdb1b6cbe4376556b3133d8d02 (patch) | |
tree | dfce8f755244bff2d49de444505e6b276d234b68 /vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java | |
parent | fd3967c4f62910b4f25dc722e2b78f026844bb9f (diff) | |
parent | f22f824ea86725f85b2e1c3636b69489dee9943d (diff) |
Merge "Upgrade mockito to v2; drop incompatible powermock"
Diffstat (limited to 'vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java')
-rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java index 4e0e70e89..f281e84b6 100644 --- a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java @@ -21,20 +21,23 @@ package org.onap.vid.aai; import com.google.common.collect.ImmutableMap; -import java.util.Collections; -import java.util.Map; 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.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.vid.aai.model.AaiNodeQueryResponse; import org.onap.vid.aai.model.ResourceType; import org.onap.vid.client.SyncRestClient; import org.onap.vid.model.SubscriberList; +import java.util.Collections; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.ArgumentMatchers.eq; + @RunWith(MockitoJUnitRunner.class) public class AaiOverTLSClientTest { @@ -57,8 +60,8 @@ public class AaiOverTLSClientTest { mockPropertyReader(); aaiRestClient.searchNodeTypeByName("name", ResourceType.GENERIC_VNF); - Mockito.verify(syncRestClient).get(Matchers.contains(SEARCH_NODES_QUERY_SEARCH_NODE_TYPE), - Matchers.eq(getHeaders()), Matchers.eq(Collections.emptyMap()), Matchers.eq(AaiNodeQueryResponse.class)); + Mockito.verify(syncRestClient).get(contains(SEARCH_NODES_QUERY_SEARCH_NODE_TYPE), + eq(getHeaders()), eq(Collections.emptyMap()), eq(AaiNodeQueryResponse.class)); } @Test @@ -66,8 +69,8 @@ public class AaiOverTLSClientTest { mockPropertyReader(); aaiRestClient.getAllSubscribers(); - Mockito.verify(syncRestClient).get(Matchers.contains(SUBSCRIBERS), - Matchers.eq(getHeaders()), Matchers.eq(Collections.emptyMap()), Matchers.eq(SubscriberList.class)); + Mockito.verify(syncRestClient).get(contains(SUBSCRIBERS), + eq(getHeaders()), eq(Collections.emptyMap()), eq(SubscriberList.class)); } private void mockPropertyReader() { |