update for Junit RC2 (#1)

lanwen · Aug 15, 2017 · 4cbff2d · 4cbff2d
1 parent 3109584
commit 4cbff2d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -41,3 +41,8 @@ With `ru.lanwen.wiremock.config.WiremockCustomizer` and `ru.lanwen.wiremock.conf
 you can reuse logic of initial setup.
 
 Please look into test for example.
+
+## Compatibility with JUnit5
+
+*v1.0.1* `->` *M4*
+*v1.1.0* `->` *RC2*
diff --git a/pom.xml b/pom.xml
@@ -42,8 +42,8 @@
         <lombok.version>1.16.16</lombok.version>
         <logback.version>1.1.11</logback.version>
         <jacoco.version>0.7.7.201606060606</jacoco.version>
-        <junit.jupiter.version>5.0.0-M4</junit.jupiter.version>
-        <junit.platform.version>1.0.0-M4</junit.platform.version>
+        <junit.jupiter.version>5.0.0-RC2</junit.jupiter.version>
+        <junit.platform.version>1.0.0-RC2</junit.platform.version>
     </properties>
 
     <dependencyManagement>

diff --git a/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java b/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java
@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.api.extension.TestExtensionContext;
 import ru.lanwen.wiremock.config.WiremockConfigFactory;
 import ru.lanwen.wiremock.config.WiremockCustomizer;
 
@@ -30,7 +29,7 @@ public class WiremockResolver implements ParameterResolver, AfterEachCallback {
     private WireMockServer server;
 
     @Override
-    public void afterEach(TestExtensionContext testExtensionContext) throws Exception {
+    public void afterEach(ExtensionContext testExtensionContext) throws Exception {
         if (server == null || !server.isRunning()) {
             return;
         }
@@ -42,12 +41,12 @@ public void afterEach(TestExtensionContext testExtensionContext) throws Exceptio
     }
 
     @Override
-    public boolean supports(ParameterContext parameterContext, ExtensionContext context) {
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext context) {
         return parameterContext.getParameter().isAnnotationPresent(Wiremock.class);
     }
 
     @Override
-    public Object resolve(ParameterContext parameterContext, ExtensionContext context) {
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) {
         Validate.validState(
                 !Optional.ofNullable(server).map(WireMockServer::isRunning).orElse(false),
                 "Can't inject more than one server"

diff --git a/src/main/java/ru/lanwen/wiremock/ext/WiremockUriResolver.java b/src/main/java/ru/lanwen/wiremock/ext/WiremockUriResolver.java
@@ -15,13 +15,13 @@
  */
 public class WiremockUriResolver implements ParameterResolver {
     @Override
-    public boolean supports(ParameterContext parameterContext, ExtensionContext extensionContext) {
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
         return parameterContext.getParameter().isAnnotationPresent(WiremockUri.class)
                 && String.class.isAssignableFrom(parameterContext.getParameter().getType());
     }
 
     @Override
-    public Object resolve(ParameterContext parameterContext, ExtensionContext context) {
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) {
         ExtensionContext.Store store = context.getStore(ExtensionContext.Namespace.create(WiremockResolver.class));
 
         return "http://localhost:" + store.get(WiremockResolver.WIREMOCK_PORT);