aboutsummaryrefslogtreecommitdiffstats
path: root/api/src/test
diff options
context:
space:
mode:
authorKristen Kozak <sebright@google.com>2017-11-10 15:01:23 -0800
committerKristen Kozak <sebright@google.com>2017-11-10 15:01:23 -0800
commit23be8f0f3228c5c1142291a0dd779666793f47b6 (patch)
tree5d59b3210bc15fb313df212a1a808c2b7d93434b /api/src/test
parentf8e33e302547d209290611d00ea17b922c225375 (diff)
downloadplatform_external_opencensus-java-23be8f0f3228c5c1142291a0dd779666793f47b6.tar.gz
platform_external_opencensus-java-23be8f0f3228c5c1142291a0dd779666793f47b6.tar.bz2
platform_external_opencensus-java-23be8f0f3228c5c1142291a0dd779666793f47b6.zip
Revert "Use the current release version of Mockito. (#751)"
This reverts commit 3f946d748ea171c70c297cf3188e4b0dbadab1ad. Reverting due to integration issues.
Diffstat (limited to 'api/src/test')
-rw-r--r--api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java2
-rw-r--r--api/src/test/java/io/opencensus/trace/SpanTest.java4
-rw-r--r--api/src/test/java/io/opencensus/trace/TracerTest.java2
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 36c8865d..a8c18819 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.ArgumentMatchers.same;
+import static org.mockito.Matchers.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 5fce242e..327b9abe 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.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.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 4edf377d..7c65742e 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.ArgumentMatchers.same;
+import static org.mockito.Matchers.same;
import static org.mockito.Mockito.when;
import io.grpc.Context;