From 74b7cd15bc18252c0539a1e0181813512f67037e Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Tue, 17 Jan 2023 01:43:41 +0000 Subject: [PATCH] Excavator: Switch to JUnit 5 to parallelize tests and speed up CI --- client-config/build.gradle | 4 +++ .../config/ClientConfigurationsTest.java | 2 +- .../java/clients/ConjureClientsTest.java | 2 +- conjure-java-client-verifier/build.gradle | 4 +++ .../build.gradle | 4 +++ .../java/serialization/ObjectMappersTest.java | 2 +- .../serialization/ShimJdk7ModuleTest.java | 2 +- conjure-java-retrofit2-client/build.gradle | 5 ++++ ...rializableErrorCallAdapterFactoryTest.java | 11 +++++--- ...nalObjectToStringConverterFactoryTest.java | 2 +- ...ceptionThrowingCallAdapterFactoryTest.java | 6 ++--- .../retrofit2/Retrofit2ClientApiTest.java | 6 ++--- .../retrofit2/Retrofit2ClientBuilderTest.java | 2 +- .../Retrofit2ClientConfigRefreshTest.java | 2 +- .../retrofit2/Retrofit2ClientProxyTest.java | 2 +- ...Retrofit2ClientQueryParamHandlingTest.java | 6 ++--- .../java/client/retrofit2/TracerTest.java | 6 ++--- extras/refresh-utils/build.gradle | 4 +++ ...RefreshableProxyInvocationHandlerTest.java | 6 ++--- .../java/ext/refresh/RefreshableTest.java | 2 +- okhttp-clients/build.gradle | 5 ++++ .../okhttp/CatchThrowableInterceptorTest.java | 11 +++++--- .../java/okhttp/ConcurrencyLimitersTest.java | 2 +- .../ConcurrencyLimitingInterceptorTest.java | 15 ++++++----- .../DefaultConcurrencyLimitersTest.java | 2 +- .../java/okhttp/ExponentialBackoffTest.java | 13 +++++---- .../conjure/java/okhttp/FlowControlTest.java | 10 +++---- .../java/okhttp/HostMetricsRegistryTest.java | 6 ++--- .../conjure/java/okhttp/HostMetricsTest.java | 15 ++++++----- .../okhttp/InstrumentedInterceptorTest.java | 15 ++++++----- .../okhttp/KeepAliveSslSocketFactoryTest.java | 2 +- .../conjure/java/okhttp/LeakDetectorTest.java | 2 +- .../java/okhttp/MeshProxyInterceptorTest.java | 6 ++--- .../okhttp/OkHttpClientsRealServerTest.java | 2 +- .../java/okhttp/OkHttpClientsTest.java | 27 ++++++++++++------- .../QosExceptionResponseHandlerTest.java | 13 +++++---- .../RemoteExceptionResponseHandlerTest.java | 13 +++++---- .../java/okhttp/ThreadWorkQueueTests.java | 2 +- ...ownRemoteExceptionResponseHandlerTest.java | 11 +++++--- .../java/okhttp/UrlSelectorImplTest.java | 15 ++++++----- .../java/okhttp/UserAgentInterceptorTest.java | 6 ++--- versions.lock | 7 ++--- versions.props | 1 + 43 files changed, 173 insertions(+), 108 deletions(-) diff --git a/client-config/build.gradle b/client-config/build.gradle index 42e081ef49..f0a94b611d 100644 --- a/client-config/build.gradle +++ b/client-config/build.gradle @@ -20,4 +20,8 @@ dependencies { annotationProcessor "org.immutables:value" compileOnly 'org.immutables:value::annotations' implementation 'com.palantir.safe-logging:logger' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } } diff --git a/client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java b/client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java index a8f8c36906..b060381162 100644 --- a/client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java +++ b/client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java @@ -37,7 +37,7 @@ import java.util.List; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509TrustManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class ClientConfigurationsTest { diff --git a/client-config/src/test/java/com/palantir/conjure/java/clients/ConjureClientsTest.java b/client-config/src/test/java/com/palantir/conjure/java/clients/ConjureClientsTest.java index b78c5aa66a..3d3b237a7a 100644 --- a/client-config/src/test/java/com/palantir/conjure/java/clients/ConjureClientsTest.java +++ b/client-config/src/test/java/com/palantir/conjure/java/clients/ConjureClientsTest.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConjureClientsTest { diff --git a/conjure-java-client-verifier/build.gradle b/conjure-java-client-verifier/build.gradle index 9e39ea3a1b..9235b5dd58 100644 --- a/conjure-java-client-verifier/build.gradle +++ b/conjure-java-client-verifier/build.gradle @@ -15,4 +15,8 @@ dependencies { testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' testImplementation 'org.apache.commons:commons-lang3' testImplementation 'com.palantir.safe-logging:logger' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } } diff --git a/conjure-java-jackson-serialization/build.gradle b/conjure-java-jackson-serialization/build.gradle index 2c62e9b4a8..e9279be878 100644 --- a/conjure-java-jackson-serialization/build.gradle +++ b/conjure-java-jackson-serialization/build.gradle @@ -14,4 +14,8 @@ dependencies { testImplementation "junit:junit" testImplementation "org.assertj:assertj-core" + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } } diff --git a/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java b/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java index 1d88f93436..79a4b29a8d 100644 --- a/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java +++ b/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java @@ -44,7 +44,7 @@ import java.util.Optional; import java.util.OptionalInt; import java.util.OptionalLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class ObjectMappersTest { private static final JsonMapper MAPPER = ObjectMappers.newClientJsonMapper(); diff --git a/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ShimJdk7ModuleTest.java b/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ShimJdk7ModuleTest.java index c19a996b1b..6201385146 100644 --- a/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ShimJdk7ModuleTest.java +++ b/conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ShimJdk7ModuleTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class ShimJdk7ModuleTest { diff --git a/conjure-java-retrofit2-client/build.gradle b/conjure-java-retrofit2-client/build.gradle index 7016356cde..22834a147c 100644 --- a/conjure-java-retrofit2-client/build.gradle +++ b/conjure-java-retrofit2-client/build.gradle @@ -28,4 +28,9 @@ dependencies { annotationProcessor "org.immutables:value" compileOnly 'org.immutables:value::annotations' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } + testImplementation 'org.mockito:mockito-junit-jupiter' } diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/AsyncSerializableErrorCallAdapterFactoryTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/AsyncSerializableErrorCallAdapterFactoryTest.java index 57f6014651..4df3333d0a 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/AsyncSerializableErrorCallAdapterFactoryTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/AsyncSerializableErrorCallAdapterFactoryTest.java @@ -22,18 +22,21 @@ import com.palantir.conjure.java.client.retrofit2.AsyncSerializableErrorCallAdapterFactory.CompletableFutureBodyCallAdapter; import com.palantir.conjure.java.client.retrofit2.AsyncSerializableErrorCallAdapterFactory.ListenableFutureBodyCallAdapter; import java.util.concurrent.CompletableFuture; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class AsyncSerializableErrorCallAdapterFactoryTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Response response; diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/OptionalObjectToStringConverterFactoryTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/OptionalObjectToStringConverterFactoryTest.java index fd16b2520b..6094b98324 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/OptionalObjectToStringConverterFactoryTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/OptionalObjectToStringConverterFactoryTest.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import retrofit2.http.Header; import retrofit2.http.Path; import retrofit2.http.Query; diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/QosExceptionThrowingCallAdapterFactoryTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/QosExceptionThrowingCallAdapterFactoryTest.java index fb92518096..90cb7bf040 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/QosExceptionThrowingCallAdapterFactoryTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/QosExceptionThrowingCallAdapterFactoryTest.java @@ -34,8 +34,8 @@ import okhttp3.Protocol; import okhttp3.ResponseBody; import okio.BufferedSource; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.stubbing.Answer; import retrofit2.Call; @@ -74,7 +74,7 @@ public BufferedSource source() { private final CallAdapter.Factory factory = new QosExceptionThrowingCallAdapterFactory(delegateFactory); private Retrofit retrofit; - @Before + @BeforeEach public void before() { retrofit = new Retrofit.Builder() .baseUrl(url) diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientApiTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientApiTest.java index b100fb3c4a..b5c1ca00a9 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientApiTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientApiTest.java @@ -54,10 +54,10 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import okio.Buffer; -import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import retrofit2.Call; import retrofit2.Response; @@ -73,7 +73,7 @@ public final class Retrofit2ClientApiTest extends TestBase { private HttpUrl url; private TestService service; - @Before + @BeforeEach public void before() { url = server.url("/"); service = Retrofit2Client.create( diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientBuilderTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientBuilderTest.java index 3b6a524be2..c45331df32 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientBuilderTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientBuilderTest.java @@ -28,7 +28,7 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public final class Retrofit2ClientBuilderTest extends TestBase { diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientConfigRefreshTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientConfigRefreshTest.java index c5bbd1b23c..364a47e207 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientConfigRefreshTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientConfigRefreshTest.java @@ -24,7 +24,7 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class Retrofit2ClientConfigRefreshTest extends TestBase { diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientProxyTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientProxyTest.java index 8f9978c7c0..269c5a0397 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientProxyTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientProxyTest.java @@ -33,7 +33,7 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class Retrofit2ClientProxyTest extends TestBase { diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientQueryParamHandlingTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientQueryParamHandlingTest.java index 215d949098..49fe08ab36 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientQueryParamHandlingTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientQueryParamHandlingTest.java @@ -25,9 +25,9 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; @@ -39,7 +39,7 @@ public final class Retrofit2ClientQueryParamHandlingTest extends TestBase { private Service proxy; - @Before + @BeforeEach public void before() { HttpUrl url = server.url("/"); proxy = Retrofit2Client.create( diff --git a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/TracerTest.java b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/TracerTest.java index 222ea5dba6..cb46f906ec 100644 --- a/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/TracerTest.java +++ b/conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/TracerTest.java @@ -28,9 +28,9 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public final class TracerTest extends TestBase { @@ -42,7 +42,7 @@ public final class TracerTest extends TestBase { private TestService service; - @Before + @BeforeEach public void before() { String uri = "http://localhost:" + server.getPort(); service = Retrofit2Client.create(TestService.class, AGENT, new HostMetricsRegistry(), createTestConfig(uri)); diff --git a/extras/refresh-utils/build.gradle b/extras/refresh-utils/build.gradle index 5571bf6234..5737fa7091 100644 --- a/extras/refresh-utils/build.gradle +++ b/extras/refresh-utils/build.gradle @@ -10,4 +10,8 @@ dependencies { testImplementation "org.jmock:jmock" testImplementation "org.mockito:mockito-core" testImplementation 'io.reactivex.rxjava2:rxjava' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } } diff --git a/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableProxyInvocationHandlerTest.java b/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableProxyInvocationHandlerTest.java index e53e4ecf29..5f0181d183 100644 --- a/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableProxyInvocationHandlerTest.java +++ b/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableProxyInvocationHandlerTest.java @@ -25,8 +25,8 @@ import com.google.common.reflect.Reflection; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -46,7 +46,7 @@ interface Callable { @Mock private Callable delegate2; - @Before + @BeforeEach public void before() { MockitoAnnotations.initMocks(this); } diff --git a/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableTest.java b/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableTest.java index 04923cc621..626125ad41 100644 --- a/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableTest.java +++ b/extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableTest.java @@ -24,7 +24,7 @@ import io.reactivex.schedulers.Schedulers; import java.util.concurrent.TimeUnit; import org.jmock.lib.concurrent.DeterministicScheduler; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class RefreshableTest { diff --git a/okhttp-clients/build.gradle b/okhttp-clients/build.gradle index 6245dd6712..188f086484 100644 --- a/okhttp-clients/build.gradle +++ b/okhttp-clients/build.gradle @@ -32,4 +32,9 @@ dependencies { annotationProcessor "org.immutables:value" compileOnly 'org.immutables:value::annotations' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } + testImplementation 'org.mockito:mockito-junit-jupiter' } diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/CatchThrowableInterceptorTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/CatchThrowableInterceptorTest.java index becdc59165..6061de3a7e 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/CatchThrowableInterceptorTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/CatchThrowableInterceptorTest.java @@ -21,13 +21,16 @@ import java.io.IOException; import okhttp3.Interceptor; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class CatchThrowableInterceptorTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Interceptor.Chain chain; diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitersTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitersTest.java index 0b03b4576b..349e778af4 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitersTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitersTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import com.netflix.concurrency.limits.Limiter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConcurrencyLimitersTest { diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptorTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptorTest.java index ef6fa8a3a0..abf7179f16 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptorTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptorTest.java @@ -32,13 +32,16 @@ import okhttp3.Response; import okhttp3.ResponseBody; import okio.BufferedSource; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class ConcurrencyLimitingInterceptorTest { private static final ConcurrencyLimitingInterceptor interceptor = new ConcurrencyLimitingInterceptor(); @@ -54,7 +57,7 @@ public final class ConcurrencyLimitingInterceptorTest { private Request request; private Response response; - @Before + @BeforeEach public void before() { request = new Request.Builder() .url("https://localhost:1234/call") diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/DefaultConcurrencyLimitersTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/DefaultConcurrencyLimitersTest.java index 369c217350..6b4184c5ed 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/DefaultConcurrencyLimitersTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/DefaultConcurrencyLimitersTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class DefaultConcurrencyLimitersTest { private static final ConcurrencyLimiters.Key KEY = diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ExponentialBackoffTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ExponentialBackoffTest.java index fbae33a738..c8365487ae 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ExponentialBackoffTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ExponentialBackoffTest.java @@ -20,11 +20,14 @@ import com.google.common.util.concurrent.AtomicDouble; import java.time.Duration; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class ExponentialBackoffTest { private static final Duration ONE_SECOND = Duration.ofSeconds(1); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java index 6a41409050..5a2e5e83c8 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java @@ -39,9 +39,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,12 +67,12 @@ public final class FlowControlTest { FlowControlTest.class, true); - @BeforeClass + @BeforeAll public static void beforeClass() { executorService = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); } - @AfterClass + @AfterAll public static void afterClass() { executorService.shutdown(); } diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsRegistryTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsRegistryTest.java index aee2534f0f..5ce0aafaed 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsRegistryTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsRegistryTest.java @@ -19,14 +19,14 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.Iterables; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public final class HostMetricsRegistryTest { private HostMetricsRegistry hostRegistry; - @Before + @BeforeEach public void before() { hostRegistry = new HostMetricsRegistry(); } diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsTest.java index 228e77662f..87f541e6e4 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/HostMetricsTest.java @@ -23,13 +23,16 @@ import com.codahale.metrics.Timer; import java.time.Clock; import java.time.Instant; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class HostMetricsTest { private static final String SERVICE_NAME = "serviceName"; @@ -43,7 +46,7 @@ public final class HostMetricsTest { @Mock private Clock clock; - @Before + @BeforeEach public void before() { when(clock.millis()).thenReturn(firstInstant, secondInstant); hostMetrics = new DefaultHostMetrics(SERVICE_NAME, HOSTNAME, PORT, clock); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/InstrumentedInterceptorTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/InstrumentedInterceptorTest.java index 7ff9ec51ea..f4e88ecc70 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/InstrumentedInterceptorTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/InstrumentedInterceptorTest.java @@ -33,13 +33,16 @@ import okhttp3.Protocol; import okhttp3.Request; import okhttp3.Response; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class InstrumentedInterceptorTest { private static final int PORT = 8080; @@ -58,7 +61,7 @@ public final class InstrumentedInterceptorTest { private InstrumentedInterceptor interceptor; private HostMetricsRegistry hostMetrics; - @Before + @BeforeEach public void before() { registry = new DefaultTaggedMetricRegistry(); hostMetrics = new HostMetricsRegistry(); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/KeepAliveSslSocketFactoryTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/KeepAliveSslSocketFactoryTest.java index 3241e73cc2..608ea0604e 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/KeepAliveSslSocketFactoryTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/KeepAliveSslSocketFactoryTest.java @@ -24,7 +24,7 @@ import java.net.Socket; import java.nio.file.Paths; import javax.net.ssl.SSLSocketFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeepAliveSslSocketFactoryTest { diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/LeakDetectorTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/LeakDetectorTest.java index e7775afab1..c1f1529d19 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/LeakDetectorTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/LeakDetectorTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LeakDetectorTest { private final List> leaks = new ArrayList<>(); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/MeshProxyInterceptorTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/MeshProxyInterceptorTest.java index bef5ad1254..a44474da32 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/MeshProxyInterceptorTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/MeshProxyInterceptorTest.java @@ -25,8 +25,8 @@ import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.Request; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -42,7 +42,7 @@ public final class MeshProxyInterceptorTest { private MeshProxyInterceptor interceptor; - @Before + @BeforeEach public void before() throws Exception { MockitoAnnotations.initMocks(this); interceptor = new MeshProxyInterceptor(HostAndPort.fromString("localhost:456")); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsRealServerTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsRealServerTest.java index 6ad8b673de..3ce259aa9f 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsRealServerTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsRealServerTest.java @@ -42,7 +42,7 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OkHttpClientsRealServerTest extends TestBase { diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java index 9a0d5d100b..c6791aa117 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java @@ -72,13 +72,17 @@ import okio.BufferedSink; import okio.Okio; import okio.Source; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class OkHttpClientsTest extends TestBase { @Rule @@ -96,7 +100,7 @@ public final class OkHttpClientsTest extends TestBase { private String url2; private String url3; - @Before + @BeforeEach public void before() { url = "http://localhost:" + server.getPort(); url2 = "http://localhost:" + server2.getPort(); @@ -736,7 +740,8 @@ public void handlesTimeouts_withRetryOnTimeout() throws IOException, Interrupted assertThat(server2.takeRequest().getPath()).isEqualTo("/foo?bar"); } - @Test(timeout = 10_000) + @Test + @Timeout(value = 10000L, unit = TimeUnit.MILLISECONDS) public void handlesInterruptedThreads() throws Exception { server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.NO_RESPONSE)); @@ -852,7 +857,8 @@ public void sync_call_to_a_slow_endpoint_should_not_time_out_if_read_timeout_is_ assertThat(synchronousCall.body().string()).isEqualTo("Hello, world!"); } - @Test(timeout = 10_000) + @Test + @Timeout(value = 10000L, unit = TimeUnit.MILLISECONDS) public void randomizesUrls() throws IOException { boolean server2WasHit = false; server.shutdown(); @@ -903,7 +909,8 @@ public void meshProxyClientChangesTargetAndInjectHostHeader() throws Exception { assertThat(server.takeRequest().getHeader(HttpHeaders.HOST)).isEqualTo("foo.com"); } - @Test(timeout = 1000) + @Test + @Timeout(value = 1000L, unit = TimeUnit.MILLISECONDS) public void non_ioexceptions_dont_break_the_world() throws IOException { server.enqueue(new MockResponse().setBody("foo")); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/QosExceptionResponseHandlerTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/QosExceptionResponseHandlerTest.java index b8411feafc..8d917c11f8 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/QosExceptionResponseHandlerTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/QosExceptionResponseHandlerTest.java @@ -26,11 +26,14 @@ import okhttp3.Protocol; import okhttp3.Request; import okhttp3.Response; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class QosExceptionResponseHandlerTest extends TestBase { private static final Request REQUEST = diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/RemoteExceptionResponseHandlerTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/RemoteExceptionResponseHandlerTest.java index 314fe9479c..af2117f9eb 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/RemoteExceptionResponseHandlerTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/RemoteExceptionResponseHandlerTest.java @@ -42,11 +42,14 @@ import okhttp3.Protocol; import okhttp3.Request; import okhttp3.ResponseBody; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class RemoteExceptionResponseHandlerTest { private static final String message = "hello"; diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ThreadWorkQueueTests.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ThreadWorkQueueTests.java index dd6df3e988..edad2af8a7 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ThreadWorkQueueTests.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ThreadWorkQueueTests.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class ThreadWorkQueueTests { private final ThreadWorkQueue queue = new ThreadWorkQueue<>(); diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UnknownRemoteExceptionResponseHandlerTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UnknownRemoteExceptionResponseHandlerTest.java index 24d0b4bebf..4d20711ca9 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UnknownRemoteExceptionResponseHandlerTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UnknownRemoteExceptionResponseHandlerTest.java @@ -28,11 +28,14 @@ import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class UnknownRemoteExceptionResponseHandlerTest { private static final int STATUS_500 = 500; diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UrlSelectorImplTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UrlSelectorImplTest.java index 4fc35bf290..d4e6f89a22 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UrlSelectorImplTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UrlSelectorImplTest.java @@ -29,19 +29,22 @@ import java.util.List; import okhttp3.HttpUrl; import okhttp3.Request; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class UrlSelectorImplTest extends TestBase { @Mock Clock clock; - @Before + @BeforeEach public void before() { when(clock.instant()).thenReturn(Instant.EPOCH); } diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UserAgentInterceptorTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UserAgentInterceptorTest.java index 127112d433..dbc4e5fd0b 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UserAgentInterceptorTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UserAgentInterceptorTest.java @@ -28,9 +28,9 @@ import okhttp3.Request; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; public final class UserAgentInterceptorTest { @@ -41,7 +41,7 @@ public final class UserAgentInterceptorTest { @Rule public final MockWebServer server = new MockWebServer(); - @Before + @BeforeEach public void before() { server.enqueue(new MockResponse().setBody("\"foo\"")); } diff --git a/versions.lock b/versions.lock index 2b63f6a372..bdc38c34dc 100644 --- a/versions.lock +++ b/versions.lock @@ -103,13 +103,13 @@ io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b) io.undertow:undertow-core:2.2.20.Final (2 constraints: a219fde9) io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361) jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac) -junit:junit:4.13.2 (2 constraints: 43140975) +junit:junit:4.13.2 (3 constraints: 9124dbb8) net.bytebuddy:byte-buddy:1.12.22 (2 constraints: ee168c66) net.bytebuddy:byte-buddy-agent:1.12.22 (1 constraints: 720bace9) net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165) org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b) org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b) -org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac) +org.apiguardian:apiguardian-api:1.1.2 (6 constraints: 876453cc) org.assertj:assertj-core:3.24.2 (2 constraints: 9a1924df) org.conscrypt:conscrypt-openjdk-uber:1.4.1 (1 constraints: 0805fd35) org.glassfish.jersey.containers:jersey-container-servlet-core:3.0.6 (1 constraints: 0b050036) @@ -128,7 +128,8 @@ org.junit.jupiter:junit-jupiter-api:5.9.2 (4 constraints: 433ee403) org.junit.jupiter:junit-jupiter-engine:5.9.2 (1 constraints: 0d0ee23b) org.junit.jupiter:junit-jupiter-params:5.9.2 (1 constraints: 0d0ee23b) org.junit.platform:junit-platform-commons:1.9.2 (2 constraints: df20424b) -org.junit.platform:junit-platform-engine:1.9.2 (1 constraints: ac102ab4) +org.junit.platform:junit-platform-engine:1.9.2 (2 constraints: 2721f973) +org.junit.vintage:junit-vintage-engine:5.5.0 (1 constraints: 0c051336) org.mockito:mockito-core:5.0.0 (2 constraints: c6139264) org.mockito:mockito-junit-jupiter:5.0.0 (1 constraints: 07050436) org.objenesis:objenesis:3.3 (1 constraints: b20a14bd) diff --git a/versions.props b/versions.props index 660fce829a..aa0e1adce3 100644 --- a/versions.props +++ b/versions.props @@ -19,6 +19,7 @@ org.apache.commons:commons-lang3 = 3.12.0 org.assertj:assertj-core = 3.24.2 org.immutables:value = 2.9.3 org.jmock:jmock = 2.12.0 +org.junit.vintage:* = 5.5.0 org.mockito:* = 5.0.0 org.slf4j:* = 1.7.36 io.leangen.geantyref:geantyref = 1.3.4