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/services/AsyncInstantiationBaseTest.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/services/AsyncInstantiationBaseTest.java')
| -rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBaseTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBaseTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBaseTest.java index 7ad49a968..5ead3fce4 100644 --- a/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBaseTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBaseTest.java @@ -23,7 +23,6 @@ package org.onap.vid.services; import com.google.common.collect.ImmutableMap; import io.joshworks.restclient.http.HttpResponse; -import java.io.UnsupportedEncodingException; import jersey.repackaged.com.google.common.collect.ImmutableList; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; @@ -45,9 +44,10 @@ import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; import org.togglz.core.manager.FeatureManager; import javax.inject.Inject; +import java.io.UnsupportedEncodingException; import java.util.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; public class AsyncInstantiationBaseTest extends AbstractTestNGSpringContextTests { |