diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index d64a7490..d48d8be4 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -149,11 +149,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - org.springframework.cloud spring-cloud-test-support diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptorTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptorTests.java index bdc7770a..57ffbf65 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptorTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptorTests.java @@ -58,8 +58,6 @@ public class OAuth2FeignRequestInterceptorTests { oAuth2FeignRequestInterceptor.apply(requestTemplate); Map> headers = requestTemplate.headers(); - assertThat(headers.containsKey("Authorization")).describedAs("RequestTemplate must have a Authorization header") - .isTrue(); assertThat(headers.containsKey("Authorization")).describedAs("RequestTemplate must have a Authorization header") .isTrue(); Assertions.assertThat(headers.get("Authorization")).describedAs("Authorization must have a extract of Fancy") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java index fbff0769..145ac5b8 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java @@ -64,7 +64,7 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; import static feign.CollectionFormat.SSV; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * @author chadjaros @@ -457,7 +457,7 @@ public class SpringMvcContractTests { Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTestFallback", String.class, String.class, Integer.class); - assumeTrue("does not have java 8 parameter names", hasJava8ParameterNames(method)); + assumeTrue(hasJava8ParameterNames(method), "does not have java 8 parameter names"); MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);