From aedb9a7babe5ac8b9eb0b0bacc0909fe1b6e3abe Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 6 Nov 2017 21:02:00 +0000 Subject: [PATCH] Align with breaking API changes since JUnit 5.0 M4 Closes gh-451 --- build.gradle | 2 +- samples/junit5/build.gradle | 6 +++--- .../restdocs/RestDocumentationExtension.java | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 9283b530..7801b871 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ subprojects { dependency 'org.hibernate:hibernate-validator:5.4.1.Final' dependency 'org.jacoco:org.jacoco.agent:0.7.9' dependency 'org.jruby:jruby-complete:9.1.13.0' - dependency 'org.junit.jupiter:junit-jupiter-api:5.0.0-M4' + dependency 'org.junit.jupiter:junit-jupiter-api:5.0.0' dependency 'org.mockito:mockito-core:1.10.19' dependency 'org.springframework.hateoas:spring-hateoas:0.23.0.RELEASE' dependency 'org.synchronoss.cloud:nio-multipart-parser:1.1.0' diff --git a/samples/junit5/build.gradle b/samples/junit5/build.gradle index 3a6b886e..3322b651 100644 --- a/samples/junit5/build.gradle +++ b/samples/junit5/build.gradle @@ -3,8 +3,8 @@ buildscript { maven { url 'https://repo.spring.io/milestone' } } dependencies { - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M1' - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-M4' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6' + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.1' } } @@ -31,7 +31,7 @@ targetCompatibility = 1.8 ext { snippetsDir = file('build/generated-snippets') - junitJupiterVersion = '5.0.0-M4' + junitJupiterVersion = '5.0.0' } ext['spring-restdocs.version'] = '2.0.0.BUILD-SNAPSHOT' diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/RestDocumentationExtension.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/RestDocumentationExtension.java index 3a608d41..683390ca 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/RestDocumentationExtension.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/RestDocumentationExtension.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.extension.Extension; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolver; -import org.junit.jupiter.api.extension.TestExtensionContext; /** * A JUnit Jupiter {@link Extension} used to automatically manage the @@ -38,7 +37,7 @@ public class RestDocumentationExtension implements Extension, BeforeEachCallback private final ManualRestDocumentation delegate = new ManualRestDocumentation(); @Override - public void beforeEach(TestExtensionContext context) throws Exception { + public void beforeEach(ExtensionContext context) throws Exception { Class testClass = context.getTestClass().orElseThrow( () -> new IllegalStateException("No test class was available")); Method testMethod = context.getTestMethod().orElseThrow( @@ -47,7 +46,7 @@ public class RestDocumentationExtension implements Extension, BeforeEachCallback } @Override - public void afterEach(TestExtensionContext context) throws Exception { + public void afterEach(ExtensionContext context) throws Exception { this.delegate.afterTest(); } @@ -57,14 +56,14 @@ public class RestDocumentationExtension implements Extension, BeforeEachCallback } @Override - public boolean supports(ParameterContext parameterContext, + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { return RestDocumentationContextProvider.class .isAssignableFrom(parameterContext.getParameter().getType()); } @Override - public Object resolve(ParameterContext parameterContext, + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { return this; }