From 3f5798098af347bb9dc044af45384550e4a8ec2b Mon Sep 17 00:00:00 2001 From: Christophe Lallement Date: Thu, 29 Apr 2021 09:40:48 -0400 Subject: [PATCH 1/3] chore: Upgrade gradle, boot and cloud --- build.gradle | 53 +++++++++++-------- gradle.properties | 2 +- gradle/artifacts.gradle | 8 +-- gradle/coding.gradle | 43 +++++++-------- gradle/tests.gradle | 8 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../spring/cloud/ribbon/it/AbstractTest.java | 21 ++++---- .../cloud/ribbon/it/FavoriteZoneTest.java | 2 +- .../cloud/ribbon/it/StrictMatcherTest.java | 2 +- .../spring/cloud/ribbon/it/ZuulTest.java | 2 +- .../DiscoveryEnabledServerPredicate.java | 3 +- .../AbstractPreservesMessageProperties.java | 2 +- .../PreservesHeadersStompSessionAdapter.java | 5 ++ .../context/DefaultExecutionContextTest.java | 2 +- .../context/ExecutionContextHolderTest.java | 12 ++--- .../DiscoveryEnabledPredicateTest.java | 7 +-- .../predicate/DynamicMetadataMatcherTest.java | 10 ++-- .../predicate/DynamicZoneMatcherTest.java | 6 +-- .../predicate/InstanceIdMatcherTest.java | 6 +-- .../NullSafeServerPredicateTest.java | 7 +-- .../predicate/SingleMetadataMatcherTest.java | 10 ++-- .../SingleStaticMetadataMatcherTest.java | 10 ++-- .../predicate/StrictMetadataMatcherTest.java | 10 ++-- .../predicate/ZoneAffinityMatcherTest.java | 6 +-- .../AbstractExecutionContextCopyTest.java | 2 +- .../ribbon/propagator/PatternFilterTest.java | 31 +++++------ ...ractExecutionContextAwareExecutorTest.java | 4 +- ...TaskExecutionContextAwareExecutorTest.java | 2 +- .../ContextAwareAsyncTaskExecutorTest.java | 2 +- .../ExecutionContextAwareExecutorTest.java | 7 ++- .../ExecutorServicePropagatorTest.java | 19 ++++--- ...cheduledExecutorServicePropagatorTest.java | 13 +++-- ...TaskExecutionContextAwareExecutorTest.java | 2 +- .../TaskSchedulerPropagatorTest.java | 2 +- ...TaskExecutionContextAwareExecutorTest.java | 2 +- ...ThreadPoolTaskSchedulerPropagatorTest.java | 2 +- ...servesHttpHeadersFeignInterceptorTest.java | 28 ++++------ ...cutionContextAwareHystrixStrategyTest.java | 2 +- ...bstractPreservesMessagePropertiesTest.java | 29 +++++----- .../jms/EchoMessagePropertyEncoderTest.java | 2 +- ...essagePropertiesConnectionAdapterTest.java | 3 +- ...ropertiesConnectionFactoryAdapterTest.java | 2 +- ...ePropertiesMessageConsumerAdapterTest.java | 7 +-- ...sMessagePropertiesMessageListenerTest.java | 6 +-- ...ePropertiesMessageProducerAdapterTest.java | 2 +- ...esMessagePropertiesSessionAdapterTest.java | 18 ++----- .../jms/SimpleMessagePropertyEncoderTest.java | 31 +++++------ .../PreservesHttpHeadersInterceptorTest.java | 18 +++---- ...esHeadersStompFrameHandlerAdapterTest.java | 8 +-- ...eservesHeadersStompSessionAdapterTest.java | 12 ++--- .../zuul/ZuulHeadersEnricherTest.java | 2 +- .../rule/PredicateBasedRuleSupportTest.java | 19 +++---- .../ribbon/rule/RuleDescriptionTest.java | 17 +++--- .../ribbon/support/AbstractSupportTest.java | 17 +++--- .../support/EurekaInstancePropertiesTest.java | 17 +++--- ...ExecutionContextPropagationImportTest.java | 10 +--- .../support/PropagationPropertiesTest.java | 14 +++-- .../RibbonExtensionsConstantsTest.java | 2 +- .../support/affinity/ZoneAffinityTest.java | 6 +-- .../AbstractDynamicMatcherSupportTest.java | 6 +-- ...DynamicMatcherClientConfigurationTest.java | 6 +-- ...ynamicMatcherDefaultConfigurationTest.java | 6 +-- ...DynamicMatcherGlobalConfigurationTest.java | 6 +-- .../AbstractFavoriteZoneSupportTest.java | 2 +- .../FavoriteZoneClientConfigurationTest.java | 6 +-- .../FavoriteZoneClientDisabledTest.java | 14 ++--- .../FavoriteZoneDefaultConfigurationTest.java | 6 +-- .../FavoriteZoneGlobalConfigurationTest.java | 6 +-- .../FavoriteZoneGloballyDisabledTest.java | 14 ++--- ...sExecutionContextExecutorStrategyTest.java | 16 ++---- ...ervesJmsMessagePropertiesStrategyTest.java | 31 ++++++----- .../PreservesStompHeadersStrategyTest.java | 6 +-- ...rictMetadataMatcherClientDisabledTest.java | 13 ++--- ...ctMetadataMatcherGloballyDisabledTest.java | 13 ++--- .../strict/StrictMetadataMatcherTest.java | 8 +-- .../zuul/ContextPropagationZuulTest.java | 17 +++--- 76 files changed, 370 insertions(+), 405 deletions(-) diff --git a/build.gradle b/build.gradle index 432f5b7..875d433 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,15 @@ +import org.gradle.internal.jvm.Jvm + plugins { - id 'com.github.hierynomus.license' version '0.14.0' - id 'net.researchgate.release' version '2.6.0' + id 'com.github.hierynomus.license' version '0.15.0' + id 'net.researchgate.release' version '2.8.1' id 'org.sonarqube' version '2.6' - id 'org.unbroken-dome.test-sets' version '1.4.2' - id 'com.github.psxpaul.execfork' version '0.1.8' - id 'io.spring.dependency-management' version '1.0.3.RELEASE' - id 'com.dorongold.task-tree' version '1.3' + id 'org.unbroken-dome.test-sets' version '3.0.1' + id 'com.github.psxpaul.execfork' version '0.1.13' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'com.dorongold.task-tree' version '1.5' + id 'org.springframework.boot' version '2.4.5' + id "com.github.spotbugs" version "4.7.1" } archivesBaseName = 'spring-cloud-ribbon-extensions' @@ -13,13 +17,16 @@ group = 'com.github.enadim' sourceCompatibility = 1.8 targetCompatibility = 1.8 +tasks.bootJar {enabled = false} +tasks.jar {enabled = true} + ext { jcenterUrl = project.hasProperty('customJcenterUrl') ? project.customJcenterUrl : 'https://jcenter.bintray.com/' mavenUrl = project.hasProperty('customMavenUrl') ? project.customMavenUrl : 'https://repo.maven.apache.org/maven2/' customSpringMilestoneUrl = project.hasProperty('customSpringMilestoneUrl') ? project.customSpringMilestoneUrl : 'https://repo.spring.io/libs-milestone/' mavenPluginsUrl = project.hasProperty('customMavenPluginsUrl') ? project.customMavenPluginsUrl : 'https://plugins.gradle.org/m2/' - jvm = org.gradle.internal.jvm.Jvm.current() + jvm = Jvm.current() javaDescription = '' + jvm javaVersion = '' + JavaVersion.current() @@ -56,9 +63,9 @@ apply from: 'gradle/signing.gradle' apply from: 'gradle/release.gradle' apply plugin: 'com.dorongold.task-tree' -task wrapper(type: Wrapper) { - gradleVersion = '4.7' -} +//task wrapper(type: Wrapper) { +// gradleVersion = '5.6.4' +//} repositories { mavenLocal() @@ -75,34 +82,38 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Finchley.RELEASE' - mavenBom 'org.springframework.boot:spring-boot:2.0.3.RELEASE' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2020.0.2' +// mavenBom 'org.springframework.boot:spring-boot:2.4.5' } } dependencies { - compileOnly 'org.projectlombok:lombok:1.16.20' - compileOnly 'com.google.code.findbugs:annotations:3.0.1' + compileOnly 'org.projectlombok:lombok:1.18.20' + annotationProcessor 'org.projectlombok:lombok:1.18.20' + + testCompileOnly 'org.projectlombok:lombok:1.18.20' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.20' +// compileOnly 'com.google.code.findbugs:annotations:3.0.1' - compile("org.springframework.boot:spring-boot-starter-activemq") { ext.optional = true } - compile("org.apache.activemq:activemq-broker") { ext.optional = true } + compile("org.springframework.boot:spring-boot-starter-activemq:2.4.5") { ext.optional = true } + compile('com.netflix.ribbon:ribbon-eureka:2.7.18') {ext.optional = true } + compile("org.apache.activemq:activemq-broker:5.16.1") { ext.optional = true } compile("com.fasterxml.jackson.core:jackson-databind") { ext.optional = true } //compile('org.springframework.cloud:spring-cloud-starter-config') { ext.optional = true } - compile('org.springframework.cloud:spring-cloud-starter-netflix-ribbon') { ext.optional = true } + compile('org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.8.RELEASE') { ext.optional = true } compile('org.springframework.cloud:spring-cloud-starter-openfeign') { ext.optional = true } compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client') { ext.optional = true } - compile('org.springframework.cloud:spring-cloud-starter-netflix-zuul') { ext.optional = true } + compile('org.springframework.cloud:spring-cloud-starter-netflix-zuul:2.2.8.RELEASE') { ext.optional = true } compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-server') { exclude group: 'javax.servlet', module: 'servlet-api' ext.optional = true } - compile('org.apache.activemq:artemis-jms-server') { ext.optional = true } + compile('org.apache.activemq:artemis-jms-server:2.17.0') { ext.optional = true } compile("org.springframework.boot:spring-boot-starter-activemq") { ext.optional = true exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec' } - testCompileOnly 'org.projectlombok:lombok:1.16.20' testCompile 'org.springframework.boot:spring-boot-starter-web' testCompile 'org.springframework.boot:spring-boot-test' testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -110,7 +121,7 @@ dependencies { testCompile 'net.bytebuddy:byte-buddy:1.8.5' testCompile 'io.rest-assured:rest-assured:3.0.7' - examplesCompileOnly 'org.projectlombok:lombok:1.16.20' + examplesCompileOnly 'org.projectlombok:lombok:1.18.20' } compileJava { diff --git a/gradle.properties b/gradle.properties index 97d695b..6c470b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=2.0.0 +version=2.4.0 diff --git a/gradle/artifacts.gradle b/gradle/artifacts.gradle index 23d8f7e..36bafa1 100644 --- a/gradle/artifacts.gradle +++ b/gradle/artifacts.gradle @@ -34,10 +34,10 @@ task testSourcesJar(type: Jar, dependsOn: classes) { from sourceSets.test.allSource } -task testJar(type: Jar, dependsOn: testClasses) { - classifier = 'tests' - from sourceSets.test.output -} +//task testJar(type: Jar, dependsOn: testClasses) { +// classifier = 'tests' +// from sourceSets.test.output +//} assemble.dependsOn projectReport assemble.dependsOn testJar diff --git a/gradle/coding.gradle b/gradle/coding.gradle index e97c5b0..91e2fe7 100644 --- a/gradle/coding.gradle +++ b/gradle/coding.gradle @@ -1,24 +1,25 @@ apply plugin: 'checkstyle' -apply plugin: 'findbugs' -apply plugin: 'pmd' +//apply plugin: 'findbugs' -findbugs { - sourceSets = [sourceSets.main] - ignoreFailures = project.hasProperty('ignoreFailures') - reportLevel = 'low' -} +//apply plugin: 'pmd' -tasks.withType(FindBugs) { - reports { - xml.enabled = true - html.enabled = false - } -} +//findbugs { +// sourceSets = [sourceSets.main] +// ignoreFailures = project.hasProperty('ignoreFailures') +// reportLevel = 'low' +//} -pmd { - sourceSets = [sourceSets.main] - ignoreFailures = project.hasProperty('ignoreFailures') -} +//tasks.withType(FindBugs) { +// reports { +// xml.enabled = true +// html.enabled = false +// } +//} + +//pmd { +// sourceSets = [sourceSets.main] +// ignoreFailures = project.hasProperty('ignoreFailures') +//} checkstyle { sourceSets = [project.sourceSets.main] @@ -35,7 +36,7 @@ check.dependsOn checkstyleMain checkstyleMain.group 'coding' checkstyleTest.group 'coding' -findbugsMain.group 'coding' -findbugsTest.group 'coding' -pmdMain.group 'coding' -pmdTest.group 'coding' +//findbugsMain.group 'coding' +//findbugsTest.group 'coding' +//pmdMain.group 'coding' +//pmdTest.group 'coding' diff --git a/gradle/tests.gradle b/gradle/tests.gradle index 0893d83..11e9d54 100644 --- a/gradle/tests.gradle +++ b/gradle/tests.gradle @@ -255,10 +255,10 @@ compileIntegrationTestJava.group 'build' checkstyleIntegrationTest.group 'coding' checkstyleExamples.group 'coding' -findbugsExamples.group 'coding' -findbugsIntegrationTest.group 'coding' -pmdExamples.group 'coding' -pmdIntegrationTest.group 'coding' +//findbugsExamples.group 'coding' +//findbugsIntegrationTest.group 'coding' +//pmdExamples.group 'coding' +//pmdIntegrationTest.group 'coding' licenseExamples.group 'license' licenseFormatExamples.group 'license' licenseFormatIntegrationTest.group 'license' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc879f2..908f6fd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip diff --git a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/AbstractTest.java b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/AbstractTest.java index 7ac6ec0..e7cfa7f 100644 --- a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/AbstractTest.java +++ b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/AbstractTest.java @@ -16,9 +16,9 @@ package com.github.enadim.spring.cloud.ribbon.it; import io.restassured.RestAssured; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ public AbstractTest(String basePath, String applicationName) { this.applicationName = applicationName; } - @Before + @BeforeEach public final void abstractBefore() { RestAssured.baseURI = "http://localhost"; RestAssured.basePath = basePath; @@ -96,11 +96,14 @@ protected void parallelRun(Runnable r) { } } - @Test(expected = IllegalStateException.class) + @Test() public void parallelRunTest() { - parallelRun(Assert::fail); - if (!parrallelRunEnabled) { - throw new IllegalStateException(); - } + org.assertj.core.api.Assertions.assertThatThrownBy(() -> { + parallelRun(Assertions::fail); + if (!parrallelRunEnabled) { + throw new IllegalStateException(); + } + }).isInstanceOf(IllegalStateException.class); + } } diff --git a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/FavoriteZoneTest.java b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/FavoriteZoneTest.java index 2423939..be4a999 100644 --- a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/FavoriteZoneTest.java +++ b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/FavoriteZoneTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.it; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; diff --git a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/StrictMatcherTest.java b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/StrictMatcherTest.java index d8175e8..4c2ce2e 100644 --- a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/StrictMatcherTest.java +++ b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/StrictMatcherTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.it; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; diff --git a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/ZuulTest.java b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/ZuulTest.java index fcf65ff..e13b52e 100644 --- a/src/it/java/com/github/enadim/spring/cloud/ribbon/it/ZuulTest.java +++ b/src/it/java/com/github/enadim/spring/cloud/ribbon/it/ZuulTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.it; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; diff --git a/src/main/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledServerPredicate.java b/src/main/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledServerPredicate.java index 956b920..d7b4759 100644 --- a/src/main/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledServerPredicate.java +++ b/src/main/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledServerPredicate.java @@ -18,7 +18,6 @@ import com.netflix.loadbalancer.PredicateKey; import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Convenient class for predicates that are based on {@link DiscoveryEnabledServer} created by the {@link DiscoveryEnabledNIWSServerList}. @@ -33,7 +32,7 @@ public abstract class DiscoveryEnabledServerPredicate extends NullSafeServerPred * {@inheritDoc} */ @Override - @SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE") +// @SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE") protected boolean doApply(PredicateKey input) { return input.getServer() instanceof DiscoveryEnabledServer && doApply((DiscoveryEnabledServer) input.getServer()); diff --git a/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessageProperties.java b/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessageProperties.java index 7284dd8..283b135 100644 --- a/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessageProperties.java +++ b/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessageProperties.java @@ -59,7 +59,7 @@ protected Message copyFromMessage(Message message) { try { ExecutionContext context = current(); List eligiblePropertyNames = new ArrayList<>(); - list((Enumeration) message.getPropertyNames()).stream() + list((Enumeration) message.getPropertyNames()) .forEach(x -> copy(context, message, x, eligiblePropertyNames)); log.trace("Message Properties copied {}", eligiblePropertyNames); } catch (JMSException e) { diff --git a/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapter.java b/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapter.java index 0d03c68..010311c 100644 --- a/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapter.java +++ b/src/main/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapter.java @@ -136,5 +136,10 @@ public void disconnect() { delegate.disconnect(); } + @Override + public void disconnect(StompHeaders headers) { + delegate.disconnect(headers); + } + } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/context/DefaultExecutionContextTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/context/DefaultExecutionContextTest.java index c63e438..c3b9ee3 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/context/DefaultExecutionContextTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/context/DefaultExecutionContextTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.context; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/context/ExecutionContextHolderTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/context/ExecutionContextHolderTest.java index 6b13b09..d648707 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/context/ExecutionContextHolderTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/context/ExecutionContextHolderTest.java @@ -15,16 +15,14 @@ */ package com.github.enadim.spring.cloud.ribbon.context; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; -import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; -import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.switchTo; +import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.*; import static java.util.concurrent.Executors.newFixedThreadPool; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -78,8 +76,8 @@ public void inheritance_do_not_work_when_executor_created_elsewhere() throws Exc assertThat(future.get(), is(nullValue())); } - @After - public void after() { + @BeforeEach + public void before() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledPredicateTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledPredicateTest.java index 6c6344a..6737b3b 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledPredicateTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DiscoveryEnabledPredicateTest.java @@ -18,15 +18,12 @@ import com.netflix.loadbalancer.PredicateKey; import com.netflix.loadbalancer.Server; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.CALLS_REAL_METHODS; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.withSettings; +import static org.mockito.Mockito.*; public class DiscoveryEnabledPredicateTest { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicMetadataMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicMetadataMatcherTest.java index fd76f53..323f8f5 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicMetadataMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicMetadataMatcherTest.java @@ -18,9 +18,9 @@ import com.netflix.appinfo.InstanceInfo; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -41,12 +41,12 @@ public class DynamicMetadataMatcherTest { DiscoveryEnabledServer server = new DiscoveryEnabledServer(instanceInfo, true); DynamicMetadataMatcher predicate = new DynamicMetadataMatcher(dynamicAttributeKey, false); - @Before + @BeforeEach public void before() { when(instanceInfo.getMetadata()).thenReturn(metada); } - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicZoneMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicZoneMatcherTest.java index de117ad..5d5b026 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicZoneMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/DynamicZoneMatcherTest.java @@ -17,8 +17,8 @@ import com.netflix.loadbalancer.PredicateKey; import com.netflix.loadbalancer.Server; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; @@ -32,7 +32,7 @@ public class DynamicZoneMatcherTest { Server server = new Server("id"); PredicateKey predicateKey = new PredicateKey(server); - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/InstanceIdMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/InstanceIdMatcherTest.java index ff268e8..c6d7fbf 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/InstanceIdMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/InstanceIdMatcherTest.java @@ -18,8 +18,8 @@ import com.netflix.appinfo.InstanceInfo; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ public class InstanceIdMatcherTest { DiscoveryEnabledServer server = new DiscoveryEnabledServer(instanceInfo, true); InstanceIdMatcher predicate = new InstanceIdMatcher(expected); - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/NullSafeServerPredicateTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/NullSafeServerPredicateTest.java index 6a77ac4..898bcea 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/NullSafeServerPredicateTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/NullSafeServerPredicateTest.java @@ -17,15 +17,12 @@ import com.netflix.loadbalancer.PredicateKey; import com.netflix.loadbalancer.Server; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.CALLS_REAL_METHODS; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.withSettings; +import static org.mockito.Mockito.*; public class NullSafeServerPredicateTest { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleMetadataMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleMetadataMatcherTest.java index 6688a80..8224cfc 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleMetadataMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleMetadataMatcherTest.java @@ -18,9 +18,9 @@ import com.netflix.appinfo.InstanceInfo; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -39,12 +39,12 @@ public class SingleMetadataMatcherTest { Map metada = new HashMap<>(); DiscoveryEnabledServer server = new DiscoveryEnabledServer(instanceInfo, true); - @Before + @BeforeEach public void before() { when(instanceInfo.getMetadata()).thenReturn(metada); } - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleStaticMetadataMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleStaticMetadataMatcherTest.java index b1d1a59..ba34daa 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleStaticMetadataMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/SingleStaticMetadataMatcherTest.java @@ -17,9 +17,9 @@ import com.netflix.appinfo.InstanceInfo; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -38,12 +38,12 @@ public class SingleStaticMetadataMatcherTest { private Map metada = new HashMap<>(); private DiscoveryEnabledServer server = new DiscoveryEnabledServer(instanceInfo, true); - @Before + @BeforeEach public void before() { when(instanceInfo.getMetadata()).thenReturn(metada); } - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/StrictMetadataMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/StrictMetadataMatcherTest.java index 549f427..b99300e 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/StrictMetadataMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/StrictMetadataMatcherTest.java @@ -17,9 +17,9 @@ import com.netflix.appinfo.InstanceInfo; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -38,13 +38,13 @@ public class StrictMetadataMatcherTest { Map metada = new HashMap<>(); DiscoveryEnabledServer server = new DiscoveryEnabledServer(instanceInfo, true); - @Before + @BeforeEach public void before() { remove(); when(instanceInfo.getMetadata()).thenReturn(metada); } - @After + @AfterEach public void after() { remove(); metada.clear(); diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/ZoneAffinityMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/ZoneAffinityMatcherTest.java index b08268e..45469f7 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/ZoneAffinityMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/predicate/ZoneAffinityMatcherTest.java @@ -17,8 +17,8 @@ import com.netflix.loadbalancer.PredicateKey; import com.netflix.loadbalancer.Server; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; import static org.hamcrest.MatcherAssert.assertThat; @@ -31,7 +31,7 @@ public class ZoneAffinityMatcherTest { Server server = new Server("id"); PredicateKey predicateKey = new PredicateKey(server); - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/AbstractExecutionContextCopyTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/AbstractExecutionContextCopyTest.java index a88a6ea..e4ee93a 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/AbstractExecutionContextCopyTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/AbstractExecutionContextCopyTest.java @@ -16,7 +16,7 @@ package com.github.enadim.spring.cloud.ribbon.propagator; import com.github.enadim.spring.cloud.ribbon.propagator.AbstractExecutionContextCopy.ExecutionContextCopyFunction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.HashSet; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/PatternFilterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/PatternFilterTest.java index 6b73d56..6f2806a 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/PatternFilterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/PatternFilterTest.java @@ -15,8 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator; -import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.regex.Pattern; @@ -24,9 +23,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.regex.Pattern.compile; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class PatternFilterTest { String value1 = "12"; @@ -37,26 +34,26 @@ public class PatternFilterTest { @Test public void accept() throws Exception { - assertThat(new PatternFilter().accept(value1), Matchers.is(true)); - assertThat(new PatternFilter(singletonList(pattern1), emptyList()).accept(value1), Matchers.is(true)); - assertThat(new PatternFilter(singletonList(pattern1), emptyList()).accept(value2), Matchers.is(false)); - assertThat(new PatternFilter(singletonList(pattern1), singletonList(pattern2)).accept(value1), Matchers.is(true)); - assertThat(new PatternFilter(singletonList(pattern1), singletonList(pattern2)).accept(value2), Matchers.is(false)); - assertThat(new PatternFilter(singletonList(pattern1), singletonList(pattern2)).accept(value1 + value2), Matchers.is(false)); - assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(value1), Matchers.is(true)); - assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(value2), Matchers.is(true)); - assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(value1 + value2), Matchers.is(true)); - assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(""), Matchers.is(false)); + assertThat(new PatternFilter().accept(value1)).isTrue(); + assertThat(new PatternFilter(singletonList(pattern1), emptyList()).accept(value1)).isTrue(); + assertThat(new PatternFilter(singletonList(pattern1), emptyList()).accept(value2)).isFalse(); + assertThat(new PatternFilter(singletonList(pattern1), singletonList(pattern2)).accept(value1)).isTrue(); + assertThat(new PatternFilter(singletonList(pattern1), singletonList(pattern2)).accept(value2)).isFalse(); + assertThat(new PatternFilter(singletonList(pattern1), singletonList(pattern2)).accept(value1 + value2)).isFalse(); + assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(value1)).isTrue(); + assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(value2)).isTrue(); + assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept(value1 + value2)).isTrue(); + assertThat(new PatternFilter(asList(pattern1, pattern2), emptyList()).accept("")).isFalse(); } @Test public void getIncludes() throws Exception { - assertThat(new PatternFilter().getIncludes().size(), is(1)); + assertThat(new PatternFilter().getIncludes()).hasSize(1); } @Test public void getExcludes() throws Exception { - assertThat(new PatternFilter().getExcludes(), equalTo(emptyList())); + assertThat(new PatternFilter().getExcludes()).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AbstractExecutionContextAwareExecutorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AbstractExecutionContextAwareExecutorTest.java index ded9163..b5cc995 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AbstractExecutionContextAwareExecutorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AbstractExecutionContextAwareExecutorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import org.springframework.scheduling.Trigger; import java.util.Date; @@ -51,7 +51,7 @@ public abstract class AbstractExecutionContextAwareExecutorTest { protected final Date date = new Date(); protected final Trigger trigger = mock(Trigger.class); - @After + @AfterEach public void after() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AsyncListenableTaskExecutionContextAwareExecutorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AsyncListenableTaskExecutionContextAwareExecutorTest.java index b232a8c..49b4814 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AsyncListenableTaskExecutionContextAwareExecutorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/AsyncListenableTaskExecutionContextAwareExecutorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.task.AsyncListenableTaskExecutor; import static org.mockito.ArgumentMatchers.any; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ContextAwareAsyncTaskExecutorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ContextAwareAsyncTaskExecutorTest.java index f25e4d3..d7c67ce 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ContextAwareAsyncTaskExecutorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ContextAwareAsyncTaskExecutorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.task.AsyncTaskExecutor; import static org.mockito.ArgumentMatchers.any; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutionContextAwareExecutorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutionContextAwareExecutorTest.java index 6c107ef..cc68dc9 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutionContextAwareExecutorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutionContextAwareExecutorTest.java @@ -15,14 +15,13 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; import static java.util.concurrent.Executors.newSingleThreadExecutor; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; public class ExecutionContextAwareExecutorTest extends AbstractExecutionContextAwareExecutorTest { @@ -32,6 +31,6 @@ public class ExecutionContextAwareExecutorTest extends AbstractExecutionContextA public void testExecute() throws Exception { current().put(key, value); propagator.execute(runnable); - assertThat(signal.poll(5, TimeUnit.SECONDS), is(value)); + Assertions.assertThat(signal.poll(5, TimeUnit.SECONDS)).isEqualTo(value); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutorServicePropagatorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutorServicePropagatorTest.java index 2f26f09..80069ce 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutorServicePropagatorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ExecutorServicePropagatorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; @@ -24,8 +24,7 @@ import static java.util.Arrays.asList; import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -69,21 +68,21 @@ public void testAwaitTermination() throws Exception { @Test public void testSubmitCallable() throws Exception { current().put(key, value); - assertThat(propagator.submit(callable).get(), is(value)); + assertThat(propagator.submit(callable).get()).isEqualTo(value); } @Test public void testSubmitRunnable() throws Exception { current().put(key, value); propagator.submit(runnable).get(); - assertThat(signal.poll(1, SECONDS), is(value)); + assertThat(signal.poll(1, SECONDS)).isEqualTo(value); } @Test public void testSubmitRunnableWithResult() throws Exception { current().put(key, value); propagator.submit(runnable, true).get(); - assertThat(signal.poll(1, SECONDS), is(value)); + assertThat(signal.poll(1, SECONDS)).isEqualTo(value); } @Test @@ -93,7 +92,7 @@ public void testInvokeAll() throws Exception { .stream() .map(AbstractExecutionContextAwareExecutorTest::uncheck) .reduce((x, y) -> x + y) - .get(), is(value + value)); + .get()).isEqualTo(value + value); } @Test @@ -103,18 +102,18 @@ public void testInvokeAllWithTimeOut() throws Exception { .stream() .map(AbstractExecutionContextAwareExecutorTest::uncheck) .reduce((x, y) -> x + y) - .get(), is(value + value)); + .get()).isEqualTo(value + value); } @Test public void testInvokeAny() throws Exception { current().put(key, value); - assertThat(propagator.invokeAny(asList(callable, callable)), is(value)); + assertThat(propagator.invokeAny(asList(callable, callable))).isEqualTo(value); } @Test public void testInvokeAnyWithTimeOut() throws Exception { current().put(key, value); - assertThat(propagator.invokeAny(asList(callable, callable), 10, SECONDS), is(value)); + assertThat(propagator.invokeAny(asList(callable, callable), 10, SECONDS)).isEqualTo(value); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ScheduledExecutorServicePropagatorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ScheduledExecutorServicePropagatorTest.java index ddf91f1..3149d74 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ScheduledExecutorServicePropagatorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ScheduledExecutorServicePropagatorTest.java @@ -15,14 +15,13 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ScheduledExecutorServicePropagatorTest extends AbstractExecutionContextAwareExecutorTest { private final ContextAwareScheduledExecutorService propagator = new ContextAwareScheduledExecutorService(newScheduledThreadPool(4)); @@ -31,28 +30,28 @@ public class ScheduledExecutorServicePropagatorTest extends AbstractExecutionCon public void scheduleRunnable() throws Exception { current().put(key, value); propagator.schedule(runnable, 1, MILLISECONDS); - assertThat(signal.poll(1, SECONDS), is(value)); + assertThat(signal.poll(1, SECONDS)).isEqualTo(value); } @Test public void scheduleCallable() throws Exception { current().put(key, value); propagator.schedule(callable, 1, MILLISECONDS); - assertThat(signal.poll(1, SECONDS), is(value)); + assertThat(signal.poll(1, SECONDS)).isEqualTo(value); } @Test public void scheduleAtFixedRate() throws Exception { current().put(key, value); propagator.scheduleAtFixedRate(runnable, 1, 1000, MILLISECONDS); - assertThat(signal.poll(1, SECONDS), is(value)); + assertThat(signal.poll(1, SECONDS)).isEqualTo(value); } @Test public void scheduleWithFixedDelay() throws Exception { current().put(key, value); propagator.scheduleWithFixedDelay(runnable, 1, 1000, MILLISECONDS); - assertThat(signal.poll(1, SECONDS), is(value)); + assertThat(signal.poll(1, SECONDS)).isSameAs(value); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/SchedulingTaskExecutionContextAwareExecutorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/SchedulingTaskExecutionContextAwareExecutorTest.java index 4468305..7ebe580 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/SchedulingTaskExecutionContextAwareExecutorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/SchedulingTaskExecutionContextAwareExecutorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.scheduling.SchedulingTaskExecutor; import static org.mockito.Mockito.mock; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/TaskSchedulerPropagatorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/TaskSchedulerPropagatorTest.java index 2b72498..c48ca99 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/TaskSchedulerPropagatorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/TaskSchedulerPropagatorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.Trigger; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskExecutionContextAwareExecutorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskExecutionContextAwareExecutorTest.java index 56f55f8..1478f13 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskExecutionContextAwareExecutorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskExecutionContextAwareExecutorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.task.AsyncListenableTaskExecutor; import org.springframework.scheduling.SchedulingTaskExecutor; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskSchedulerPropagatorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskSchedulerPropagatorTest.java index a1d062a..5faba9e 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskSchedulerPropagatorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/concurrent/ThreadPoolTaskSchedulerPropagatorTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.concurrent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.task.AsyncListenableTaskExecutor; import org.springframework.scheduling.SchedulingTaskExecutor; import org.springframework.scheduling.TaskScheduler; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/feign/PreservesHttpHeadersFeignInterceptorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/feign/PreservesHttpHeadersFeignInterceptorTest.java index ceacdbe..91e4690 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/feign/PreservesHttpHeadersFeignInterceptorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/feign/PreservesHttpHeadersFeignInterceptorTest.java @@ -17,23 +17,17 @@ import com.github.enadim.spring.cloud.ribbon.propagator.PatternFilter; import feign.RequestTemplate; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.regex.Pattern; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class PreservesHttpHeadersFeignInterceptorTest { @@ -42,13 +36,13 @@ public class PreservesHttpHeadersFeignInterceptorTest { PreservesHttpHeadersFeignInterceptor propagator = new PreservesHttpHeadersFeignInterceptor(new PatternFilter(asList(Pattern.compile(".*")), asList(Pattern.compile(excludedUrl))), keys::contains, new HashMap<>()); RequestTemplate requestTemplate = new RequestTemplate(); - @Before + @BeforeEach public void before() { requestTemplate.append("http://google.com"); requestTemplate.method("GET"); } - @After + @AfterEach public void after() { remove(); } @@ -56,7 +50,7 @@ public void after() { @Test public void do_nothing_on_empty_context() throws Exception { propagator.apply(requestTemplate); - assertThat(requestTemplate.headers().size(), is(0)); + assertThat(requestTemplate.headers()).isEmpty(); } @Test @@ -64,7 +58,7 @@ public void do_nothing_on_excluded_url() throws Exception { asList("1", "3", "2").forEach(x -> current().put(x, x)); requestTemplate.append(excludedUrl); propagator.apply(requestTemplate); - assertThat(requestTemplate.headers().size(), is(0)); + assertThat(requestTemplate.headers()).isEmpty(); } @Test @@ -72,7 +66,7 @@ public void copy_headers() throws Exception { asList("1", "3", "2").forEach(x -> current().put(x, x)); propagator.apply(requestTemplate); Map> headers = requestTemplate.headers(); - asList("1", "2").forEach(x -> assertThat(headers.get(x), equalTo(asList(x)))); - assertThat(headers.containsKey("3"), is(false)); + asList("1", "2").forEach(x -> assertThat(headers.get(x)).hasSameElementsAs(asList(x))); + assertThat(headers.containsKey("3")).isFalse(); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/hystrix/ExecutionContextAwareHystrixStrategyTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/hystrix/ExecutionContextAwareHystrixStrategyTest.java index 5ba6f80..2b44c9d 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/hystrix/ExecutionContextAwareHystrixStrategyTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/hystrix/ExecutionContextAwareHystrixStrategyTest.java @@ -19,7 +19,7 @@ import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessagePropertiesTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessagePropertiesTest.java index f10bd58..b56e2eb 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessagePropertiesTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/AbstractPreservesMessagePropertiesTest.java @@ -15,9 +15,9 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import org.assertj.core.api.SoftAssertions; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import javax.jms.JMSException; import javax.jms.Message; @@ -28,13 +28,8 @@ import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.is; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.*; public class AbstractPreservesMessagePropertiesTest { private Set keys = new HashSet<>(asList("1", "2")); @@ -42,9 +37,10 @@ public class AbstractPreservesMessagePropertiesTest { }; private Message message = mock(Message.class); - @After + @AfterEach public void after() { remove(); + reset(message); } @Test @@ -55,15 +51,16 @@ public void copy_matching_properties() throws Exception { when(message.getStringProperty("3")).thenReturn("3"); propagator.copyFromMessage(message); verify(message, never()).getStringProperty(eq("3")); - keys.forEach(x -> Assert.assertThat(current().get(x), is(x))); - Assert.assertThat(current().containsKey("3"), is(false)); + SoftAssertions soft = new SoftAssertions(); + keys.forEach(x -> soft.assertThat(current().get(x)).isEqualTo(x)); + soft.assertThat(current().containsKey("3")).isFalse(); } @Test public void fail_on_get_property_names() throws Exception { when(message.getPropertyNames()).thenThrow(JMSException.class); propagator.copyFromMessage(message); - Assert.assertThat(current().entrySet(), empty()); + assertThat(current().entrySet()).isEmpty(); } @Test @@ -75,8 +72,8 @@ public void fail_on_get_property() throws Exception { verify(message).getStringProperty(eq("1")); verify(message).getStringProperty(eq("2")); verify(message, never()).getStringProperty(eq("3")); - Assert.assertThat(current().containsKey("1"), is(true)); - Assert.assertThat(current().entrySet().size(), is(1)); + assertThat(current().containsKey("1")).isTrue(); + assertThat(current().entrySet()).hasSize(1); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/EchoMessagePropertyEncoderTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/EchoMessagePropertyEncoderTest.java index 01aabb6..bd930b6 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/EchoMessagePropertyEncoderTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/EchoMessagePropertyEncoderTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionAdapterTest.java index 7871259..d7b5e99 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionAdapterTest.java @@ -15,7 +15,8 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import javax.jms.Connection; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionFactoryAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionFactoryAdapterTest.java index 544ecfb..e918830 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionFactoryAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesConnectionFactoryAdapterTest.java @@ -16,7 +16,7 @@ package com.github.enadim.spring.cloud.ribbon.propagator.jms; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.jms.ConnectionFactory; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageConsumerAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageConsumerAdapterTest.java index 29d4987..64e7553 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageConsumerAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageConsumerAdapterTest.java @@ -15,16 +15,13 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.jms.MessageConsumer; import javax.jms.MessageListener; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class PreservesMessagePropertiesMessageConsumerAdapterTest { MessageConsumer delegate = mock(MessageConsumer.class); diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageListenerTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageListenerTest.java index 9a74a58..0e086f2 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageListenerTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageListenerTest.java @@ -15,16 +15,14 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.jms.Message; import javax.jms.MessageListener; import java.util.Collections; import java.util.HashSet; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class PreservesMessagePropertiesMessageListenerTest { MessageListener delegate = mock(MessageListener.class); diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageProducerAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageProducerAdapterTest.java index 0de3124..bae68aa 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageProducerAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesMessageProducerAdapterTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.jms.Message; import javax.jms.MessageProducer; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesSessionAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesSessionAdapterTest.java index 6709ffe..e080d74 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesSessionAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/PreservesMessagePropertiesSessionAdapterTest.java @@ -15,16 +15,9 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; - -import javax.jms.BytesMessage; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.StreamMessage; -import javax.jms.TextMessage; +import org.junit.jupiter.api.Test; + +import javax.jms.*; import java.util.HashMap; import java.util.HashSet; import java.util.Set; @@ -32,10 +25,7 @@ import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.current; import static java.util.Arrays.asList; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class PreservesMessagePropertiesSessionAdapterTest { Set keys = new HashSet<>(asList("1")); diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/SimpleMessagePropertyEncoderTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/SimpleMessagePropertyEncoderTest.java index 18c866b..6ca1d63 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/SimpleMessagePropertyEncoderTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/jms/SimpleMessagePropertyEncoderTest.java @@ -15,46 +15,47 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.jms; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class SimpleMessagePropertyEncoderTest { SimpleMessagePropertyEncoder simple = new SimpleMessagePropertyEncoder(); - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_encoding_unsupported_value() { - simple.encode("*"); + assertThatThrownBy(() -> simple.encode("*")).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_decoding_unsupported_value1() { - simple.decode("" + (char) ('a' - 1)); + assertThatThrownBy(() -> simple.decode("" + (char) ('a' - 1))).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_decoding_unsupported_value2() { - simple.decode("" + (char) ('A' - 1)); + assertThatThrownBy(() -> simple.decode("" + (char) ('A' - 1))).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_decoding_unsupported_value3() { - simple.decode("" + (char) ('0' - 1)); + assertThatThrownBy(() -> simple.decode("" + (char) ('0' - 1))).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_decoding_unsupported_value4() { - simple.decode("" + (char) ('z' + 1)); + assertThatThrownBy(() -> simple.decode("" + (char) ('z' + 1))).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_decoding_unsupported_value5() { - simple.decode("" + (char) ('Z' + 1)); + assertThatThrownBy(() -> simple.decode("" + (char) ('Z' + 1))).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_decoding_unsupported_value6() { - simple.decode("" + (char) ('9' + 1)); + assertThatThrownBy(() -> simple.decode("" + (char) ('9' + 1))).isInstanceOf(IllegalArgumentException.class); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/servlet/PreservesHttpHeadersInterceptorTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/servlet/PreservesHttpHeadersInterceptorTest.java index dbba7e5..c1d8e3e 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/servlet/PreservesHttpHeadersInterceptorTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/servlet/PreservesHttpHeadersInterceptorTest.java @@ -15,8 +15,8 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.servlet; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; import java.util.HashSet; @@ -26,9 +26,7 @@ import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; import static java.util.Arrays.asList; import static java.util.Collections.enumeration; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -37,8 +35,8 @@ public class PreservesHttpHeadersInterceptorTest { PreservesHttpHeadersInterceptor propagator = new PreservesHttpHeadersInterceptor(attributes::contains); HttpServletRequest request = mock(HttpServletRequest.class); - @After - public void after() { + @BeforeEach + public void before() { remove(); } @@ -47,7 +45,7 @@ public void should_skip_propagate_request_headers() throws Exception { when(request.getHeaderNames()).thenReturn(enumeration(asList("1", "2", "3"))); attributes.forEach(x -> when(request.getHeader(x)).thenReturn(x)); propagator.preHandle(request, null, null); - attributes.forEach(x -> assertThat(current().get(x), equalTo(x))); + attributes.forEach(x -> assertThat(current().get(x)).isEqualTo(x)); } @Test @@ -55,7 +53,7 @@ public void should_skip_propagation_on_null_request_headers() throws Exception { when(request.getHeaderNames()).thenReturn(null); attributes.forEach(x -> when(request.getHeader(x)).thenReturn(x)); propagator.preHandle(request, null, null); - assertThat(current().entrySet().size(), equalTo(0)); + assertThat(current().entrySet()).isEmpty(); } @Test @@ -73,7 +71,7 @@ public void testPostHandle() throws Exception { public void testAfterCompletion() throws Exception { current().put("1", "1"); propagator.afterCompletion(null, null, null, null); - assertThat(current().entrySet().size(), is(0)); + assertThat(current().entrySet()).isEmpty(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompFrameHandlerAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompFrameHandlerAdapterTest.java index 8aca81a..1213222 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompFrameHandlerAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompFrameHandlerAdapterTest.java @@ -15,8 +15,8 @@ */ package com.github.enadim.spring.cloud.ribbon.propagator.stomp; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.messaging.simp.stomp.StompFrameHandler; import org.springframework.messaging.simp.stomp.StompHeaders; @@ -34,8 +34,8 @@ public class PreservesHeadersStompFrameHandlerAdapterTest { private StompFrameHandler delegate = mock(StompFrameHandler.class); private PreservesHeadersStompFrameHandlerAdapter propagator = new PreservesHeadersStompFrameHandlerAdapter(delegate, attributes::contains); - @After - public void After() { + @BeforeEach + public void before() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapterTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapterTest.java index d782235..ce88daf 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapterTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/stomp/PreservesHeadersStompSessionAdapterTest.java @@ -16,8 +16,8 @@ package com.github.enadim.spring.cloud.ribbon.propagator.stomp; import com.github.enadim.spring.cloud.ribbon.ArgumentHolder; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.messaging.simp.stomp.StompHeaders; import org.springframework.messaging.simp.stomp.StompSession; import org.springframework.messaging.simp.stomp.StompSessionHandler; @@ -30,9 +30,7 @@ import static com.github.enadim.spring.cloud.ribbon.context.ExecutionContextHolder.remove; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -47,8 +45,8 @@ public class PreservesHeadersStompSessionAdapterTest { private StompSessionHandler handler = mock(StompSessionHandler.class); private PreservesHeadersStompSessionAdapter propagator = new PreservesHeadersStompSessionAdapter(delegate, keysToCopy::contains, new HashMap<>()); - @After - public void after() { + @BeforeEach + public void before() { remove(); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/zuul/ZuulHeadersEnricherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/zuul/ZuulHeadersEnricherTest.java index 996ee72..41fb458 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/zuul/ZuulHeadersEnricherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/propagator/zuul/ZuulHeadersEnricherTest.java @@ -16,7 +16,7 @@ package com.github.enadim.spring.cloud.ribbon.propagator.zuul; import com.netflix.zuul.context.RequestContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/PredicateBasedRuleSupportTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/PredicateBasedRuleSupportTest.java index 3941c30..a0d5b56 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/PredicateBasedRuleSupportTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/PredicateBasedRuleSupportTest.java @@ -19,14 +19,13 @@ import com.netflix.loadbalancer.AbstractServerPredicate; import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.Server; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -39,15 +38,15 @@ public class PredicateBasedRuleSupportTest { @Test public void testConstructor() { PredicateBasedRuleSupport support = new PredicateBasedRuleSupport(predicate); - Assert.assertThat(support.getPredicate(), is(predicate)); + assertThat(support.getPredicate()).isSameAs(predicate); } @Test public void testSetPredicate() throws Exception { PredicateBasedRuleSupport support = new PredicateBasedRuleSupport(); - Assert.assertThat(support.getPredicate(), is(nullValue())); + assertThat(support.getPredicate()).isNull(); support.setPredicate(predicate); - Assert.assertThat(support.getPredicate(), is(predicate)); + assertThat(support.getPredicate()).isSameAs(predicate); } @Test @@ -57,16 +56,18 @@ public void shouldChooseServer() throws Exception { List servers = asList(server); when(loadBalancer.getAllServers()).thenReturn(servers); when(predicate.chooseRoundRobinAfterFiltering(servers, null)).thenReturn(Optional.of(server)); - Assert.assertThat(support.choose(null), is(server)); + assertThat(support.choose(null)).isSameAs(server); } - @Test(expected = ChooseServerException.class) + @Test() public void shouldNotChooseServer() throws Exception { + assertThatThrownBy(() -> { PredicateBasedRuleSupport support = new PredicateBasedRuleSupport(predicate); support.setLoadBalancer(loadBalancer); List servers = asList(server); when(loadBalancer.getAllServers()).thenReturn(servers); when(predicate.chooseRoundRobinAfterFiltering(servers, null)).thenReturn(Optional.fromNullable(null)); support.choose(null); + }).isInstanceOf(ChooseServerException.class); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/RuleDescriptionTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/RuleDescriptionTest.java index 002361d..e0f9edc 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/RuleDescriptionTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/rule/RuleDescriptionTest.java @@ -16,12 +16,11 @@ package com.github.enadim.spring.cloud.ribbon.rule; import com.netflix.loadbalancer.AbstractServerPredicate; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static com.github.enadim.spring.cloud.ribbon.rule.RuleDescription.from; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,29 +29,29 @@ public class RuleDescriptionTest { String description = "description"; String predicateDescription = "predicate"; - @Before + @BeforeEach public void before() { when(predicate.toString()).thenReturn(predicateDescription); } @Test public void from_string() { - assertThat(from(description).describe(), is(description)); + assertThat(from(description).describe()).isSameAs(description); } @Test public void from_predicate() throws Exception { - assertThat(from(predicate).describe(), is(predicateDescription)); + assertThat(from(predicate).describe()).isSameAs(predicateDescription); } @Test public void and() throws Exception { - assertThat(from(predicate).and(from(description)).describe(), is("(" + predicateDescription + " && " + description + ")")); + assertThat(from(predicate).and(from(description)).describe()).isEqualTo("(" + predicateDescription + " && " + description + ")"); } @Test public void fallback() throws Exception { - assertThat(from(predicate).fallback(from(description)).describe(), is(predicateDescription + " -> " + description)); + assertThat(from(predicate).fallback(from(description)).describe()).isEqualTo(predicateDescription + " -> " + description); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/AbstractSupportTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/AbstractSupportTest.java index 5e57d32..2b78f49 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/AbstractSupportTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/AbstractSupportTest.java @@ -21,17 +21,16 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; import io.restassured.RestAssured; import lombok.extern.slf4j.Slf4j; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.web.server.LocalServerPort; - import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseStatus; @@ -52,7 +51,7 @@ //import org.springframework.boot.web.server.LocalServerPort; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public abstract class AbstractSupportTest { @LocalServerPort @@ -70,7 +69,7 @@ public abstract class AbstractSupportTest { RestAssured.basePath = TestApplicationBase.TestControllerConstants.BASE_PATH; } - @Before + @BeforeEach public void before() { RestAssured.port = port; server1.setPort(port); @@ -83,7 +82,7 @@ public void reset(DiscoveryEnabledServer server) { server.getInstanceInfo().getMetadata().clear(); } - @After + @AfterEach public void after() { reset(server1); reset(server2); diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/EurekaInstancePropertiesTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/EurekaInstancePropertiesTest.java index cea9190..de919f6 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/EurekaInstancePropertiesTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/EurekaInstancePropertiesTest.java @@ -15,39 +15,38 @@ */ package com.github.enadim.spring.cloud.ribbon.support; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.assertj.core.api.Assertions.assertThat; public class EurekaInstancePropertiesTest { EurekaInstanceProperties properties = new EurekaInstanceProperties(); @Test public void metadata() throws Exception { - assertNull(properties.getMetadataMap().get("key")); + assertThat(properties.getMetadataMap().get("key")).isNull(); properties.setMetadataMap(new HashMap() { { put("key", "value"); } }); - assertEquals("value", properties.getMetadataMap().get("key")); + assertThat(properties.getMetadataMap().get("key")).isEqualTo("value"); } @Test public void getInstanceId() throws Exception { - assertNull(properties.getInstanceId()); + assertThat(properties.getInstanceId()).isNull(); properties.getMetadataMap().put("instanceId", "instanceId"); - assertEquals("instanceId", properties.getInstanceId()); + assertThat(properties.getInstanceId()).isEqualTo("instanceId"); } @Test public void getZone() throws Exception { - assertEquals("default", properties.getZone()); + assertThat(properties.getZone()).isEqualTo("default"); properties.getMetadataMap().put("zone", "zone"); - assertEquals("zone", properties.getZone()); + assertThat(properties.getZone()).isEqualTo("zone"); } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/ExecutionContextPropagationImportTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/ExecutionContextPropagationImportTest.java index 7f16a46..aa0b33b 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/ExecutionContextPropagationImportTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/ExecutionContextPropagationImportTest.java @@ -15,15 +15,9 @@ */ package com.github.enadim.spring.cloud.ribbon.support; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesExecutionContextExecutorStrategy; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesExecutionContextHystrixStrategy; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesHeadersInboundHttpRequestStrategy; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesHttpHeadersFeignStrategy; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesHttpHeadersZuulStrategy; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesJmsMessagePropertiesStrategy; -import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesStompHeadersStrategy; +import com.github.enadim.spring.cloud.ribbon.support.strategy.*; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/PropagationPropertiesTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/PropagationPropertiesTest.java index fc91475..4f1e27f 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/PropagationPropertiesTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/PropagationPropertiesTest.java @@ -15,11 +15,9 @@ */ package com.github.enadim.spring.cloud.ribbon.support; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class PropagationPropertiesTest { @@ -27,21 +25,21 @@ public class PropagationPropertiesTest { @Test public void buildEntriesFilter() throws Exception { PropagationProperties properties = new PropagationProperties(); - assertThat(properties.buildEntriesFilter().accept(""), is(false)); + assertThat(properties.buildEntriesFilter().accept("")).isFalse(); } @Test public void buildExtraStaticEntries() throws Exception { PropagationProperties properties = new PropagationProperties(); - assertThat(properties.buildExtraStaticEntries(new EurekaInstanceProperties()).get("upstream-zone"), is("default")); + assertThat(properties.buildExtraStaticEntries(new EurekaInstanceProperties()).get("upstream-zone")).isEqualTo("default"); properties = new PropagationProperties(); properties.getUpStreamZone().setKey("new"); - assertThat(properties.buildExtraStaticEntries(new EurekaInstanceProperties()).get("new"), is("default")); + assertThat(properties.buildExtraStaticEntries(new EurekaInstanceProperties()).get("new")).isEqualTo("default"); properties = new PropagationProperties(); properties.getUpStreamZone().setEnabled(false); - assertThat(properties.buildExtraStaticEntries(new EurekaInstanceProperties()).get("upstream-zone"), is(nullValue())); + assertThat(properties.buildExtraStaticEntries(new EurekaInstanceProperties()).get("upstream-zone")).isNull(); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/RibbonExtensionsConstantsTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/RibbonExtensionsConstantsTest.java index f89c7be..1ca841d 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/RibbonExtensionsConstantsTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/RibbonExtensionsConstantsTest.java @@ -15,7 +15,7 @@ */ package com.github.enadim.spring.cloud.ribbon.support; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/affinity/ZoneAffinityTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/affinity/ZoneAffinityTest.java index 7163958..87456a4 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/affinity/ZoneAffinityTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/affinity/ZoneAffinityTest.java @@ -22,8 +22,7 @@ import com.github.enadim.spring.cloud.ribbon.support.EnableRibbonZoneAffinity; import com.github.enadim.spring.cloud.ribbon.support.affinity.ZoneAffinityTest.ZoneAffinityApplication; import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesExecutionContextHystrixStrategy; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.netflix.ribbon.RibbonClient; @@ -31,7 +30,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -40,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.springframework.http.HttpStatus.OK; -@RunWith(SpringJUnit4ClassRunner.class) +//@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = {ZoneAffinityApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/AbstractDynamicMatcherSupportTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/AbstractDynamicMatcherSupportTest.java index d7b5906..b5d3ff8 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/AbstractDynamicMatcherSupportTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/AbstractDynamicMatcherSupportTest.java @@ -20,8 +20,8 @@ import com.github.enadim.spring.cloud.ribbon.support.EnableContextPropagation; import com.github.enadim.spring.cloud.ribbon.support.EnableHttpLogging; import com.github.enadim.spring.cloud.ribbon.support.EnableRibbonDynamicMetadataMatcher; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -47,7 +47,7 @@ public AbstractDynamicMatcherSupportTest(String dynamicAttributeKey, boolean mat } @Test - @Ignore("will fail") + @Disabled("will fail") @Override public void test_default() { } diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherClientConfigurationTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherClientConfigurationTest.java index c4221fb..2d89760 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherClientConfigurationTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherClientConfigurationTest.java @@ -15,11 +15,11 @@ */ package com.github.enadim.spring.cloud.ribbon.support.dynamic; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {AbstractDynamicMatcherSupportTest.DynamicMatcherApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherDefaultConfigurationTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherDefaultConfigurationTest.java index c8b6e56..2d9ff9d 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherDefaultConfigurationTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherDefaultConfigurationTest.java @@ -15,11 +15,11 @@ */ package com.github.enadim.spring.cloud.ribbon.support.dynamic; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {AbstractDynamicMatcherSupportTest.DynamicMatcherApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherGlobalConfigurationTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherGlobalConfigurationTest.java index 8edc489..61f7779 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherGlobalConfigurationTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/dynamic/DynamicMatcherGlobalConfigurationTest.java @@ -15,11 +15,11 @@ */ package com.github.enadim.spring.cloud.ribbon.support.dynamic; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {AbstractDynamicMatcherSupportTest.DynamicMatcherApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/AbstractFavoriteZoneSupportTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/AbstractFavoriteZoneSupportTest.java index 62b823e..2dfe4e3 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/AbstractFavoriteZoneSupportTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/AbstractFavoriteZoneSupportTest.java @@ -19,7 +19,7 @@ import com.github.enadim.spring.cloud.ribbon.support.EnableContextPropagation; import com.github.enadim.spring.cloud.ribbon.support.EnableHttpLogging; import com.github.enadim.spring.cloud.ribbon.support.EnableRibbonFavoriteZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClients; diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientConfigurationTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientConfigurationTest.java index 567397b..4aec9b1 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientConfigurationTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientConfigurationTest.java @@ -15,11 +15,11 @@ */ package com.github.enadim.spring.cloud.ribbon.support.favorite; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {AbstractFavoriteZoneSupportTest.FavoriteZoneApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientDisabledTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientDisabledTest.java index 4662e74..a01055b 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientDisabledTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneClientDisabledTest.java @@ -17,16 +17,17 @@ import com.github.enadim.spring.cloud.ribbon.rule.PredicateBasedRuleSupport; import com.github.enadim.spring.cloud.ribbon.support.FavoriteZoneConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.inject.Inject; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = FavoriteZoneConfig.class, properties = { "ribbon.client.name=application", "ribbon.extensions.client.application.rule.favorite-zone.enabled=false"}) @@ -35,8 +36,9 @@ public class FavoriteZoneClientDisabledTest { @Inject ApplicationContext applicationContext; - @Test(expected = NoSuchBeanDefinitionException.class) + @Test() public void should_not_be_instantiated() { - applicationContext.getBean(PredicateBasedRuleSupport.class); + Assertions.assertThatThrownBy(() -> + applicationContext.getBean(PredicateBasedRuleSupport.class)).isInstanceOf(NoSuchBeanDefinitionException.class); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneDefaultConfigurationTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneDefaultConfigurationTest.java index 381f6f3..900443e 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneDefaultConfigurationTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneDefaultConfigurationTest.java @@ -15,11 +15,11 @@ */ package com.github.enadim.spring.cloud.ribbon.support.favorite; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {AbstractFavoriteZoneSupportTest.FavoriteZoneApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGlobalConfigurationTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGlobalConfigurationTest.java index f12110c..a09b35b 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGlobalConfigurationTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGlobalConfigurationTest.java @@ -15,11 +15,11 @@ */ package com.github.enadim.spring.cloud.ribbon.support.favorite; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {AbstractFavoriteZoneSupportTest.FavoriteZoneApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGloballyDisabledTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGloballyDisabledTest.java index c1aa70f..f582df7 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGloballyDisabledTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/favorite/FavoriteZoneGloballyDisabledTest.java @@ -17,16 +17,17 @@ import com.github.enadim.spring.cloud.ribbon.rule.PredicateBasedRuleSupport; import com.github.enadim.spring.cloud.ribbon.support.FavoriteZoneConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.inject.Inject; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = FavoriteZoneConfig.class, properties = { "ribbon.extensions.rule.favorite-zone.enabled=false"}) public class FavoriteZoneGloballyDisabledTest { @@ -34,8 +35,9 @@ public class FavoriteZoneGloballyDisabledTest { @Inject ApplicationContext applicationContext; - @Test(expected = NoSuchBeanDefinitionException.class) + @Test() public void should_not_be_instantiated() { - applicationContext.getBean(PredicateBasedRuleSupport.class); + Assertions.assertThatThrownBy(() -> + applicationContext.getBean(PredicateBasedRuleSupport.class)).isInstanceOf(NoSuchBeanDefinitionException.class); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesExecutionContextExecutorStrategyTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesExecutionContextExecutorStrategyTest.java index 66d6b9a..db09ef4 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesExecutionContextExecutorStrategyTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesExecutionContextExecutorStrategyTest.java @@ -15,18 +15,10 @@ */ package com.github.enadim.spring.cloud.ribbon.support.strategy; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareAsyncListenableTaskExecutor; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareAsyncTaskExecutor; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareExecutor; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareExecutorService; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareScheduledExecutorService; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareSchedulingTaskExecutor; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareTaskScheduler; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareThreadPoolTaskExecutor; -import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.ContextAwareThreadPoolTaskScheduler; +import com.github.enadim.spring.cloud.ribbon.propagator.concurrent.*; import com.github.enadim.spring.cloud.ribbon.support.PropagationProperties; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.task.AsyncListenableTaskExecutor; import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.scheduling.SchedulingTaskExecutor; @@ -49,7 +41,7 @@ public class PreservesExecutionContextExecutorStrategyTest { String toBeExcluded = "toBeExcluded"; PreservesExecutionContextExecutorStrategy processor = new PreservesExecutionContextExecutorStrategy(); - @Before + @BeforeEach public void before() { PropagationProperties properties = new PropagationProperties(); properties.getExecutor().getExcludes().add(Pattern.compile(toBeExcluded)); diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesJmsMessagePropertiesStrategyTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesJmsMessagePropertiesStrategyTest.java index 01d8a7c..e25d581 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesJmsMessagePropertiesStrategyTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesJmsMessagePropertiesStrategyTest.java @@ -20,15 +20,14 @@ import com.github.enadim.spring.cloud.ribbon.propagator.stomp.PreservesHeadersStompSessionAdapter; import com.github.enadim.spring.cloud.ribbon.support.EurekaInstanceProperties; import com.github.enadim.spring.cloud.ribbon.support.PropagationProperties; -import org.junit.Test; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; import javax.jms.ConnectionFactory; import static java.util.regex.Pattern.compile; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.*; import static org.mockito.Mockito.mock; public class PreservesJmsMessagePropertiesStrategyTest { @@ -56,20 +55,24 @@ public void should_decorate() { processor.postProcessAfterInitialization(mock(ConnectionFactory.class), beanName); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_to_decorate_unaccessible_encoder_class() { - processor.setEncoderType(EchoMessagePropertyEncoder1.class); - processor.setProperties(new PropagationProperties()); - processor.setEurekaInstanceProperties(new EurekaInstanceProperties()); - processor.postProcessAfterInitialization(mock(ConnectionFactory.class), beanName); + Assertions.assertThatThrownBy(() -> { + processor.setEncoderType(EchoMessagePropertyEncoder1.class); + processor.setProperties(new PropagationProperties()); + processor.setEurekaInstanceProperties(new EurekaInstanceProperties()); + processor.postProcessAfterInitialization(mock(ConnectionFactory.class), beanName); + }).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test() public void should_fail_to_decorate_encoder_with_no_default_constructor() { - processor.setEncoderType(EchoMessagePropertyEncoder2.class); - processor.setProperties(new PropagationProperties()); - processor.setEurekaInstanceProperties(new EurekaInstanceProperties()); - processor.postProcessAfterInitialization(mock(ConnectionFactory.class), beanName); + Assertions.assertThatThrownBy(() -> { + processor.setEncoderType(EchoMessagePropertyEncoder2.class); + processor.setProperties(new PropagationProperties()); + processor.setEurekaInstanceProperties(new EurekaInstanceProperties()); + processor.postProcessAfterInitialization(mock(ConnectionFactory.class), beanName); + }).isInstanceOf(IllegalArgumentException.class); } @Test diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesStompHeadersStrategyTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesStompHeadersStrategyTest.java index 0275fcb..7573af3 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesStompHeadersStrategyTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strategy/PreservesStompHeadersStrategyTest.java @@ -18,14 +18,12 @@ import com.github.enadim.spring.cloud.ribbon.propagator.stomp.PreservesHeadersStompSessionAdapter; import com.github.enadim.spring.cloud.ribbon.support.EurekaInstanceProperties; import com.github.enadim.spring.cloud.ribbon.support.PropagationProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.messaging.simp.stomp.StompSession; import static java.util.regex.Pattern.compile; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.*; import static org.mockito.Mockito.mock; public class PreservesStompHeadersStrategyTest { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherClientDisabledTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherClientDisabledTest.java index a63c9b7..f129b93 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherClientDisabledTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherClientDisabledTest.java @@ -17,16 +17,17 @@ import com.github.enadim.spring.cloud.ribbon.rule.PredicateBasedRuleSupport; import com.github.enadim.spring.cloud.ribbon.support.StrictMetadataMatcherConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.inject.Inject; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = StrictMetadataMatcherConfig.class, properties = { "ribbon.client.name=application", "ribbon.extensions.client.application.rule.strict-metadata-matcher.enabled=false"}) @@ -35,8 +36,8 @@ public class StrictMetadataMatcherClientDisabledTest { @Inject ApplicationContext applicationContext; - @Test(expected = NoSuchBeanDefinitionException.class) + @Test() public void should_not_be_instantiated() { - applicationContext.getBean(PredicateBasedRuleSupport.class); + Assertions.assertThatThrownBy(() -> applicationContext.getBean(PredicateBasedRuleSupport.class)).isInstanceOf(NoSuchBeanDefinitionException.class); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherGloballyDisabledTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherGloballyDisabledTest.java index b17c2ef..7f593dd 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherGloballyDisabledTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherGloballyDisabledTest.java @@ -17,16 +17,17 @@ import com.github.enadim.spring.cloud.ribbon.rule.PredicateBasedRuleSupport; import com.github.enadim.spring.cloud.ribbon.support.StrictMetadataMatcherConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.inject.Inject; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = StrictMetadataMatcherConfig.class, properties = { "ribbon.extensions.rule.strict-metadata-matcher.enabled=false"}) public class StrictMetadataMatcherGloballyDisabledTest { @@ -34,8 +35,8 @@ public class StrictMetadataMatcherGloballyDisabledTest { @Inject ApplicationContext applicationContext; - @Test(expected = NoSuchBeanDefinitionException.class) + @Test() public void should_not_be_instantiated() { - applicationContext.getBean(PredicateBasedRuleSupport.class); + Assertions.assertThatThrownBy(() -> applicationContext.getBean(PredicateBasedRuleSupport.class)).isEqualTo(NoSuchBeanDefinitionException.class); } } \ No newline at end of file diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherTest.java index a183c33..929af5d 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/strict/StrictMetadataMatcherTest.java @@ -20,8 +20,8 @@ import com.github.enadim.spring.cloud.ribbon.support.EnableContextPropagation; import com.github.enadim.spring.cloud.ribbon.support.EnableRibbonStrictMetadataMatcher; import com.github.enadim.spring.cloud.ribbon.support.strategy.PreservesExecutionContextHystrixStrategy; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.netflix.ribbon.RibbonClient; @@ -29,7 +29,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -39,7 +39,7 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.OK; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {StrictMetadataMatcherTest.StrictMatcherApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { diff --git a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/zuul/ContextPropagationZuulTest.java b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/zuul/ContextPropagationZuulTest.java index ca27602..08f5da0 100644 --- a/src/test/java/com/github/enadim/spring/cloud/ribbon/support/zuul/ContextPropagationZuulTest.java +++ b/src/test/java/com/github/enadim/spring/cloud/ribbon/support/zuul/ContextPropagationZuulTest.java @@ -21,21 +21,20 @@ import com.github.enadim.spring.cloud.ribbon.support.PropagationProperties; import com.netflix.hystrix.strategy.HystrixPlugins; import feign.RequestInterceptor; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.netflix.zuul.EnableZuulProxy; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.bind.annotation.RequestMapping; import javax.inject.Inject; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.web.bind.annotation.RequestMethod.GET; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = {ContextPropagationZuulTest.Application.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {"eureka.client.enabled=false"} @@ -50,9 +49,9 @@ public class ContextPropagationZuulTest { @Test public void test_configuration() { - assertNotNull(properties); - assertNotNull(requestInterceptor); - assertEquals(HystrixPlugins.getInstance().getConcurrencyStrategy().getClass(), + assertThat(properties).isNotNull(); + assertThat(requestInterceptor).isNotNull(); + assertThat(HystrixPlugins.getInstance().getConcurrencyStrategy().getClass()).isExactlyInstanceOf( ExecutionContextAwareHystrixStrategy.class); } From b651df9d7edd55617a74b78e9e6521aef97130bf Mon Sep 17 00:00:00 2001 From: Christophe Lallement Date: Thu, 29 Apr 2021 09:46:12 -0400 Subject: [PATCH 2/3] chore: Upgrade jdk to 11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60fb4ea..79240be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ sudo: false language: java jdk: - - oraclejdk8 + - oraclejdk11 branches: #Don't build tags From 8548040946cf72c6085b47ca84b87843880e7101 Mon Sep 17 00:00:00 2001 From: Christophe Lallement Date: Thu, 29 Apr 2021 10:14:00 -0400 Subject: [PATCH 3/3] chore: remove spotbugs --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 875d433..d7ba108 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'com.dorongold.task-tree' version '1.5' id 'org.springframework.boot' version '2.4.5' - id "com.github.spotbugs" version "4.7.1" +// id "com.github.spotbugs" version "4.7.1" } archivesBaseName = 'spring-cloud-ribbon-extensions'