diff options
| author | Stefan Schmidt <ubschmidt2@users.noreply.github.com> | 2017-11-01 11:08:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 11:08:37 +0100 |
| commit | 3f946d748ea171c70c297cf3188e4b0dbadab1ad (patch) | |
| tree | 80159ee80287bc1834f202b4ee1f380e1e4dfae3 /api/src/test | |
| parent | a43c8cc5104c34f46888fd4e6b4340ec28d27eba (diff) | |
| download | platform_external_opencensus-java-3f946d748ea171c70c297cf3188e4b0dbadab1ad.tar.gz platform_external_opencensus-java-3f946d748ea171c70c297cf3188e4b0dbadab1ad.tar.bz2 platform_external_opencensus-java-3f946d748ea171c70c297cf3188e4b0dbadab1ad.zip | |
Use the current release version of Mockito. (#751)
* Use the current release version of Mockito.
* Fix errorprone's warnings about NonCanonicalStaticMemberImport.
Diffstat (limited to 'api/src/test')
3 files changed, 4 insertions, 4 deletions
diff --git a/api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java b/api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java index a8c18819..36c8865d 100644 --- a/api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java +++ b/api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java @@ -17,7 +17,7 @@ package io.opencensus.trace; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.verify; import io.opencensus.common.Scope; diff --git a/api/src/test/java/io/opencensus/trace/SpanTest.java b/api/src/test/java/io/opencensus/trace/SpanTest.java index 327b9abe..5fce242e 100644 --- a/api/src/test/java/io/opencensus/trace/SpanTest.java +++ b/api/src/test/java/io/opencensus/trace/SpanTest.java @@ -17,8 +17,8 @@ package io.opencensus.trace; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.verify; import java.util.Collections; diff --git a/api/src/test/java/io/opencensus/trace/TracerTest.java b/api/src/test/java/io/opencensus/trace/TracerTest.java index 7c65742e..4edf377d 100644 --- a/api/src/test/java/io/opencensus/trace/TracerTest.java +++ b/api/src/test/java/io/opencensus/trace/TracerTest.java @@ -17,7 +17,7 @@ package io.opencensus.trace; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.when; import io.grpc.Context; |