Use Before/AfterTestExecutionCallback

Use BeforeTestExecutionCallback and AfterTestExecutionCallback
instead of BeforeEachCallback and AfterEachCallback, respectively.

Author: asteffey

consumer/pact-jvm-consumer-junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt

@@ -21,9 +21,9 @@ import au.com.dius.pact.core.support.expressions.ExpressionParser.parseExpressio
 import mu.KLogging
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.extension.AfterAllCallback
-import org.junit.jupiter.api.extension.AfterEachCallback
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback
 import org.junit.jupiter.api.extension.BeforeAllCallback
-import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.BeforeTestExecutionCallback
 import org.junit.jupiter.api.extension.Extension
 import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.api.extension.ParameterContext
@@ -133,7 +133,7 @@ class JUnit5MockServerSupport(private val baseMockServer: BaseMockServer) : Mock
   }
 }
 
-class PactConsumerTestExt : Extension, BeforeEachCallback, BeforeAllCallback, ParameterResolver, AfterEachCallback, AfterAllCallback {
+class PactConsumerTestExt : Extension, BeforeTestExecutionCallback, BeforeAllCallback, ParameterResolver, AfterTestExecutionCallback, AfterAllCallback {
   override fun supportsParameter(parameterContext: ParameterContext, extensionContext: ExtensionContext): Boolean {
     val store = extensionContext.getStore(ExtensionContext.Namespace.create("pact-jvm"))
     if (store["providerInfo"] != null) {
@@ -189,7 +189,7 @@ class PactConsumerTestExt : Extension, BeforeEachCallback, BeforeAllCallback, Pa
     store.put("executedFragments", mutableListOf<Method>())
   }
 
-  override fun beforeEach(context: ExtensionContext) {
+  override fun beforeTestExecution(context: ExtensionContext) {
     val (providerInfo, pactMethod) = lookupProviderInfo(context)
 
     logger.debug { "providerInfo = $providerInfo" }
@@ -295,7 +295,7 @@ class PactConsumerTestExt : Extension, BeforeEachCallback, BeforeAllCallback, Pa
     return pact
   }
 
-  override fun afterEach(context: ExtensionContext) {
+  override fun afterTestExecution(context: ExtensionContext) {
     if (!context.executionException.isPresent) {
       val store = context.getStore(ExtensionContext.Namespace.create("pact-jvm"))
       val providerInfo = store["providerInfo"] as ProviderInfo

consumer/pact-jvm-consumer-junit5/src/test/java/au/com/dius/pact/consumer/junit5/BeforeEachTest.java

@@ -0,0 +1,58 @@
+package au.com.dius.pact.consumer.junit5;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import au.com.dius.pact.consumer.MockServer;
+import au.com.dius.pact.consumer.dsl.PactDslWithProvider;
+import au.com.dius.pact.core.model.RequestResponsePact;
+import au.com.dius.pact.core.model.annotations.Pact;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.fluent.Request;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(PactConsumerTestExt.class)
+@PactTestFor(providerName = "ArticlesProvider", port = "1234")
+public class BeforeEachTest {
+  private String response;
+  final private String EXPECTED_RESPONSE = "expected";
+
+  private Map<String, String> headers = MapUtils.putAll(new HashMap<>(), new String[] {
+    "Content-Type", "text/plain"
+  });
+  
+  @BeforeEach
+  void beforeEach() {
+      response = EXPECTED_RESPONSE;
+  }
+
+  @Pact(consumer = "Consumer")
+  public RequestResponsePact pactExecutedAfterBeforeEach(PactDslWithProvider builder) {
+    return builder
+      .given("provider state")
+      .uponReceiving("request")
+        .path("/")
+        .method("GET")
+      .willRespondWith()
+        .headers(headers)
+        .status(200)
+        .body(response)
+      .toPact();
+  }
+
+  @Test
+  @PactTestFor(pactMethod = "pactExecutedAfterBeforeEach")
+  void testPactExecutedAfterBeforeEach(MockServer mockServer) throws IOException {
+    HttpResponse httpResponse = Request.Get(mockServer.getUrl() + "/").execute().returnResponse();
+    assertThat(IOUtils.toString(httpResponse.getEntity().getContent()),
+      is(equalTo(EXPECTED_RESPONSE)));
+  }
+}