cleanup

Author: YOU54F

.github/workflows/test.yml

@@ -1,11 +1,8 @@
-# FILEPATH: /Users/saf/dev/pact-foundation/pact-workshop-jvm-spring/.github/workflows/test.yml
-
 name: CI
 on:
     push:
         branches:
             - main
-            - dep_update
     pull_request:
         branches:
             - main
@@ -15,10 +12,10 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Set up JDK 17
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v4
               with:
                   java-version: 17
                   distribution: 'temurin'

README.md

@@ -545,7 +545,7 @@ In `consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPact
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getProduct("11"));
-        assertEquals(404, e.getRawStatusCode());
+        assertEquals(404, e.getStatusCode().value());
     }
 ```
 
@@ -818,7 +818,7 @@ public class ProductConsumerPactTest {
 
     HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
       () -> new ProductService(restTemplate).getAllProducts());
-    assertEquals(401, e.getRawStatusCode());
+    assertEquals(401, e.getStatusCode().value());
   }
 
   @Test
@@ -846,7 +846,7 @@ public class ProductConsumerPactTest {
 
     HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
       () -> new ProductService(restTemplate).getProduct("11"));
-    assertEquals(404, e.getRawStatusCode());
+    assertEquals(404, e.getStatusCode().value());
   }
 
   @Test
@@ -858,7 +858,7 @@ public class ProductConsumerPactTest {
 
     HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
       () -> new ProductService(restTemplate).getProduct("10"));
-    assertEquals(401, e.getRawStatusCode());
+    assertEquals(401, e.getStatusCode().value());
   }
 
   private Map<String, String> headers() {
@@ -1096,7 +1096,8 @@ Now run
 ❯ ./gradlew consumer:test --tests '*PactTest*' pactPublish
   
   > Task :consumer:pactPublish
-  Publishing 'FrontendApplication-ProductService.json' with tags step11, test, prod ... OK
+  Publishing 'FrontendApplication-ProductService.json'
+  OK
   
   BUILD SUCCESSFUL in 11s
 

consumer/build.gradle

@@ -29,7 +29,6 @@ dependencies {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
 	}
 	testImplementation 'com.github.tomakehurst:wiremock:3.0.1'
-	// testImplementation 'au.com.dius.pact.consumer:java8:4.6.5'
 	testImplementation 'au.com.dius.pact.consumer:junit5:4.6.5'
 }
 

consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java

@@ -149,7 +149,7 @@ void getAllProducts_whenNoAuth(MockServer mockServer) {
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getAllProducts());
-        assertEquals(401, e.getRawStatusCode());
+        assertEquals(401, e.getStatusCode().value());
     }
 
     @Test
@@ -177,7 +177,7 @@ void getProductById_whenProductWithId11DoesNotExist(MockServer mockServer) {
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getProduct("11"));
-        assertEquals(404, e.getRawStatusCode());
+        assertEquals(404, e.getStatusCode().value());
     }
 
     @Test
@@ -189,7 +189,7 @@ void getProductById_whenNoAuth(MockServer mockServer) {
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getProduct("10"));
-        assertEquals(401, e.getRawStatusCode());
+        assertEquals(401, e.getStatusCode().value());
     }
 
     private Map<String, String> headers() {

provider/src/test/java/au/com/dius/pactworkshop/provider/ProductPactProviderTest.java

@@ -8,7 +8,6 @@
 import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
 import au.com.dius.pact.provider.junitsupport.loader.PactBrokerAuth;
 import au.com.dius.pact.provider.junitsupport.loader.SelectorBuilder;
-// import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
 import org.apache.hc.core5.http.HttpRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
@@ -22,13 +21,11 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 import java.util.Optional;
 
 import static org.mockito.Mockito.when;
 
 @Provider("ProductService")
-//@PactFolder("pacts")
 @PactBroker(
         host = "localhost",
         port = "8000",
@@ -40,11 +37,12 @@
 public class ProductPactProviderTest {
     @au.com.dius.pact.provider.junitsupport.loader.PactBrokerConsumerVersionSelectors
     public static SelectorBuilder consumerVersionSelectors() {
-      // Select Pacts for consumers deployed to production with branch from CI build 
+      // Select Pacts for consumers deployed or released to production, those on the main branch
+      // and those on a named branch step11, for use in our workshop
       return new SelectorBuilder()
         .deployedOrReleased()
         .mainBranch()
-        .branch("dep_update");
+        .branch("step11");
     }
     @LocalServerPort
     int port;