Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit 8a189aa

Browse files
authored
Test: Upgrade Mickito version and replace deprecated methods. (#1922)
* Test: Upgrade Mickito version and replace deprecated methods. * More fix. * Add missing RunWith. * Skip tests that don't work with JDK 9+.
1 parent bfe1ad3 commit 8a189aa

32 files changed

Lines changed: 92 additions & 48 deletions

File tree

api/src/test/java/io/opencensus/trace/CurrentSpanUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.opencensus.trace;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.mockito.Matchers.same;
20+
import static org.mockito.ArgumentMatchers.same;
2121
import static org.mockito.Mockito.verify;
2222
import static org.mockito.Mockito.verifyZeroInteractions;
2323

api/src/test/java/io/opencensus/trace/SpanTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package io.opencensus.trace;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.mockito.Matchers.eq;
21-
import static org.mockito.Matchers.same;
20+
import static org.mockito.ArgumentMatchers.eq;
21+
import static org.mockito.ArgumentMatchers.same;
2222
import static org.mockito.Mockito.verify;
2323

2424
import java.util.Collections;

api/src/test/java/io/opencensus/trace/TracerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.opencensus.trace;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.mockito.Matchers.same;
20+
import static org.mockito.ArgumentMatchers.same;
2121
import static org.mockito.Mockito.verifyZeroInteractions;
2222
import static org.mockito.Mockito.when;
2323

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ subprojects {
227227
// Test dependencies.
228228
guava_testlib: "com.google.guava:guava-testlib:${guavaVersion}",
229229
junit: 'junit:junit:4.12',
230-
mockito: 'org.mockito:mockito-core:1.9.5',
230+
mockito: 'org.mockito:mockito-core:2.28.1',
231231
spring_test: "org.springframework:spring-test:${springVersion}",
232232
truth: 'com.google.truth:truth:0.44',
233233
spring_boot_test: "org.springframework.boot:spring-boot-starter-test:${springBootTestVersion}",

contrib/agent/src/test/java/io/opencensus/contrib/agent/ResourcesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.junit.rules.ExpectedException;
3232
import org.junit.runner.RunWith;
3333
import org.mockito.Mock;
34-
import org.mockito.runners.MockitoJUnitRunner;
34+
import org.mockito.junit.MockitoJUnitRunner;
3535

3636
/** Unit tests for {@link Resources}. */
3737
@RunWith(MockitoJUnitRunner.class)

contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/ContextTrampolineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junit.runner.RunWith;
2525
import org.mockito.Mock;
2626
import org.mockito.Mockito;
27-
import org.mockito.runners.MockitoJUnitRunner;
27+
import org.mockito.junit.MockitoJUnitRunner;
2828

2929
/** Unit tests for {@link ContextTrampoline}. */
3030
@RunWith(MockitoJUnitRunner.class)

contrib/agent/src/test/java/io/opencensus/contrib/agent/bootstrap/TraceTrampolineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.junit.rules.ExpectedException;
2626
import org.junit.runner.RunWith;
2727
import org.mockito.Mockito;
28-
import org.mockito.runners.MockitoJUnitRunner;
28+
import org.mockito.junit.MockitoJUnitRunner;
2929

3030
/** Unit tests for {@link TraceTrampoline}. */
3131
@RunWith(MockitoJUnitRunner.class)

contrib/agent/src/test/java/io/opencensus/contrib/agent/instrumentation/ExecutorInstrumentationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.bytebuddy.agent.builder.AgentBuilder;
2424
import org.junit.Test;
2525
import org.junit.runner.RunWith;
26-
import org.mockito.runners.MockitoJUnitRunner;
26+
import org.mockito.junit.MockitoJUnitRunner;
2727

2828
/** Unit tests for {@link ExecutorInstrumentation}. */
2929
@RunWith(MockitoJUnitRunner.class)

contrib/agent/src/test/java/io/opencensus/contrib/agent/instrumentation/ThreadInstrumentationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.bytebuddy.agent.builder.AgentBuilder;
2424
import org.junit.Test;
2525
import org.junit.runner.RunWith;
26-
import org.mockito.runners.MockitoJUnitRunner;
26+
import org.mockito.junit.MockitoJUnitRunner;
2727

2828
/** Unit tests for {@link ThreadInstrumentation}. */
2929
@RunWith(MockitoJUnitRunner.class)

contrib/agent/src/test/java/io/opencensus/contrib/agent/instrumentation/UrlInstrumentationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.bytebuddy.agent.builder.AgentBuilder;
2424
import org.junit.Test;
2525
import org.junit.runner.RunWith;
26-
import org.mockito.runners.MockitoJUnitRunner;
26+
import org.mockito.junit.MockitoJUnitRunner;
2727

2828
/** Unit tests for {@link UrlInstrumentation}. */
2929
@RunWith(MockitoJUnitRunner.class)

0 commit comments

Comments
 (0)