diff options
| author |   Stern, Ittay (is9613) <ittay.stern@att.com> | 2018-11-27 13:22:35 +0200 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2018-11-27 18:53:16 +0200 |
| commit | f22f824ea86725f85b2e1c3636b69489dee9943d (patch) | |
| tree | ec21d6ac6c6734d975c5d26481c65b52c75e3cb8 /vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java | |
| parent | d0e33a075713cb711d97a4186f858b931ff793ef (diff) | |
Upgrade mockito to v2; drop incompatible powermock
Note that anyString() is not matching null values, therefore replaced
with any() where relevant.
Change-Id: If64944e1edc62013953e41b2645a2b78c578bbe8
Issue-ID: VID-359
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java')
| -rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java index 7ae8ac832..d4f59e7da 100644 --- a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientServerTest.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.xebialabs.restito.semantics.Action; import io.joshworks.restclient.http.HttpResponse; import io.joshworks.restclient.http.mapper.ObjectMapper; -import java.io.IOException; import org.assertj.core.api.Assertions; import org.glassfish.grizzly.http.util.HttpStatus; import org.json.simple.parser.JSONParser; @@ -34,13 +33,15 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -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 org.onap.vid.testUtils.StubServerUtil; +import java.io.IOException; + @RunWith(MockitoJUnitRunner.class) public class AaiOverTLSClientServerTest { |