aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorKristen Kozak <sebright@google.com>2017-11-10 15:45:55 -0800
committerKristen Kozak <sebright@google.com>2017-11-10 15:53:57 -0800
commit0e514f9d1fa7fcfddb984a64e52cc1af52f73976 (patch)
treed2190ce4bfad17177ee5471260d5ceba0903ccb4 /contrib
parent23be8f0f3228c5c1142291a0dd779666793f47b6 (diff)
downloadplatform_external_opencensus-java-0e514f9d1fa7fcfddb984a64e52cc1af52f73976.tar.gz
platform_external_opencensus-java-0e514f9d1fa7fcfddb984a64e52cc1af52f73976.tar.bz2
platform_external_opencensus-java-0e514f9d1fa7fcfddb984a64e52cc1af52f73976.zip
Use Mockito API from Mockito 1.9.5.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/agent/src/test/java/io/opencensus/contrib/agent/ResourcesTest.java2
-rw-r--r--contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/ContextTrampolineTest.java2
-rw-r--r--contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/TraceTrampolineTest.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/agent/src/test/java/io/opencensus/contrib/agent/ResourcesTest.java b/contrib/agent/src/test/java/io/opencensus/contrib/agent/ResourcesTest.java
index 33bc7ddf..26eb696b 100644
--- a/contrib/agent/src/test/java/io/opencensus/contrib/agent/ResourcesTest.java
+++ b/contrib/agent/src/test/java/io/opencensus/contrib/agent/ResourcesTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
/** Unit tests for {@link Resources}. */
@RunWith(MockitoJUnitRunner.class)
diff --git a/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/ContextTrampolineTest.java b/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/ContextTrampolineTest.java
index f693dc3b..4ed7120f 100644
--- a/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/ContextTrampolineTest.java
+++ b/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/ContextTrampolineTest.java
@@ -24,7 +24,7 @@ import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
/** Unit tests for {@link ContextTrampoline}. */
@RunWith(MockitoJUnitRunner.class)
diff --git a/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/TraceTrampolineTest.java b/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/TraceTrampolineTest.java
index 7519fc1d..f1ca3500 100644
--- a/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/TraceTrampolineTest.java
+++ b/contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/TraceTrampolineTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
/** Unit tests for {@link TraceTrampoline}. */
@RunWith(MockitoJUnitRunner.class)