diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..bf828bc --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,30 @@ +name: CI +on: + push: + branches: + - step6 + pull_request: + branches: + - step6 +jobs: + test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'temurin' + + - name: Test consumer tests + run: ./gradlew consumer:test + - name: Test consumer pact tests + run: ./gradlew consumer:test --tests '*Pact*Test' + - name: Copy consumer pacts + run: ./gradlew consumer:copyPacts + - name: Test provider pact tests + run: ./gradlew provider:test --tests '*Pact*Test' || true \ No newline at end of file diff --git a/.gitignore b/.gitignore index bac6b3d..11ed8a5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,8 @@ build/ !../gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ - +consumer/bin +provider/bin provider/src/test/resources/pacts ### STS ### @@ -47,3 +48,7 @@ gradle-app.setting # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 # gradle/wrapper/gradle-wrapper.properties + +## MacOS + +.DS_Store \ No newline at end of file diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..03b6389 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17.0 diff --git a/README.md b/README.md index a49dbca..120f2b7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ step of the workshop just check out the branch for that step (i.e. `git checkout ## Requirements -* JDK 8+ +* JDK 17+ * Docker for step 11 ## Workshop outline: @@ -317,14 +317,14 @@ This test starts a mock server on a random port that acts as our provider servic To run only the Pact tests: ```console -> ./gradlew consumer:test --tests *PactTest +> ./gradlew consumer:test --tests '*PactTest' ``` Running this test still passes, but it creates a pact file which we can use to validate our assumptions on the provider side, and have conversation around. ```console -❯ ./gradlew consumer:test --tests *PactTest +❯ ./gradlew consumer:test --tests '*PactTest' BUILD SUCCESSFUL in 6s ``` @@ -386,13 +386,13 @@ public class ProductPactProviderTest { To run only the verification tests: ```console -> ./gradlew provider:test --tests *Pact*Test +> ./gradlew provider:test --tests '*Pact*Test' ``` We now need to validate the pact generated by the consumer is valid, by executing it against the running service provider, which should fail: ```console -❯ ./gradlew provider:test --tests *Pact*Test +❯ ./gradlew provider:test --tests '*Pact*Test' ... ... @@ -476,7 +476,7 @@ Copy the updated contract located in `consumer/build/pacts/FrontendApplication-P Run the command: ```console -❯ ./gradlew provider:test --tests *Pact*Test +❯ ./gradlew provider:test --tests '*Pact*Test' ... ... @@ -545,14 +545,14 @@ 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()); } ``` Notice that our new tests look almost identical to our previous tests, and only differ on the expectations of the _response_ - the HTTP request expectations are exactly the same. ```console -❯ ./gradlew consumer:test --tests *PactTest +❯ ./gradlew consumer:test --tests '*PactTest' BUILD SUCCESSFUL in 1s ``` @@ -568,7 +568,7 @@ What does our provider have to say about this new test. Again, copy the updated and run the command: ```console -❯ ./gradlew provider:test --tests *Pact*Test +❯ ./gradlew provider:test --tests '*Pact*Test' ... ... diff --git a/consumer/build.gradle b/consumer/build.gradle index 9b1beb4..6cfe016 100644 --- a/consumer/build.gradle +++ b/consumer/build.gradle @@ -1,11 +1,13 @@ plugins { - id 'org.springframework.boot' version '2.3.4.RELEASE' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + // Stopped from moving to 3.2.x due to wiremock issue + // https://github.com/wiremock/wiremock/issues/2395 + id 'org.springframework.boot' version '3.1.8' + id 'io.spring.dependency-management' version '1.1.4' } group = 'au.com.dius.pactworkshop' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '8' +sourceCompatibility = '17' dependencies { implementation 'org.springframework.boot:spring-boot-starter' @@ -14,9 +16,8 @@ dependencies { testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - testImplementation 'com.github.tomakehurst:wiremock:2.27.2' - testImplementation 'au.com.dius.pact.consumer:java8:4.1.7' - testImplementation 'au.com.dius.pact.consumer:junit5:4.1.7' + testImplementation 'com.github.tomakehurst:wiremock:3.0.1' + testImplementation 'au.com.dius.pact.consumer:junit5:4.6.5' } test { diff --git a/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java b/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java index 95a7c5a..011ea57 100644 --- a/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java +++ b/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java @@ -11,15 +11,15 @@ import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; - +import au.com.dius.pact.core.model.PactSpecVersion; // required for v4.6.x to set pactVersion import java.util.Collections; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import static io.pactfoundation.consumer.dsl.LambdaDsl.newJsonArrayMinLike; -import static io.pactfoundation.consumer.dsl.LambdaDsl.newJsonBody; +import static au.com.dius.pact.consumer.dsl.LambdaDsl.newJsonArrayMinLike; +import static au.com.dius.pact.consumer.dsl.LambdaDsl.newJsonBody; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -87,7 +87,7 @@ RequestResponsePact productDoesNotExist(PactDslWithProvider builder) { } @Test - @PactTestFor(pactMethod = "getAllProducts") + @PactTestFor(pactMethod = "getAllProducts", pactVersion = PactSpecVersion.V3) void getAllProducts_whenProductsExist(MockServer mockServer) { Product product = new Product(); product.setId("09"); @@ -104,7 +104,7 @@ void getAllProducts_whenProductsExist(MockServer mockServer) { } @Test - @PactTestFor(pactMethod = "noProductsExist") + @PactTestFor(pactMethod = "noProductsExist", pactVersion = PactSpecVersion.V3) void getAllProducts_whenNoProductsExist(MockServer mockServer) { RestTemplate restTemplate = new RestTemplateBuilder() .rootUri(mockServer.getUrl()) @@ -115,7 +115,7 @@ void getAllProducts_whenNoProductsExist(MockServer mockServer) { } @Test - @PactTestFor(pactMethod = "getOneProduct") + @PactTestFor(pactMethod = "getOneProduct", pactVersion = PactSpecVersion.V3) void getProductById_whenProductWithId10Exists(MockServer mockServer) { Product expected = new Product(); expected.setId("10"); @@ -131,7 +131,7 @@ void getProductById_whenProductWithId10Exists(MockServer mockServer) { } @Test - @PactTestFor(pactMethod = "productDoesNotExist") + @PactTestFor(pactMethod = "productDoesNotExist", pactVersion = PactSpecVersion.V3) void getProductById_whenProductWithId11DoesNotExist(MockServer mockServer) { RestTemplate restTemplate = new RestTemplateBuilder() .rootUri(mockServer.getUrl()) @@ -139,7 +139,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()); } private Map headers() { diff --git a/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductServiceTest.java b/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductServiceTest.java index d852e29..cf03384 100644 --- a/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductServiceTest.java +++ b/consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductServiceTest.java @@ -60,7 +60,7 @@ void getAllProducts() { @Test void getProductById() { - wireMockServer.stubFor(get(urlPathEqualTo("/products/50")) + wireMockServer.stubFor(get(urlPathEqualTo("/product/50")) .willReturn(aResponse() .withStatus(200) .withHeader("Content-Type", "application/json") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de..068cdb2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/provider/build.gradle b/provider/build.gradle index 97232cd..5b113d1 100644 --- a/provider/build.gradle +++ b/provider/build.gradle @@ -1,11 +1,11 @@ plugins { - id 'org.springframework.boot' version '2.3.4.RELEASE' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.2.2' + id 'io.spring.dependency-management' version '1.1.4' } group = 'au.com.dius.pactworkshop' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '8' +sourceCompatibility = '17' dependencies { implementation 'org.springframework.boot:spring-boot-starter' @@ -14,7 +14,7 @@ dependencies { testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - testImplementation("au.com.dius.pact.provider:junit5:4.1.7") + testImplementation("au.com.dius.pact.provider:junit5:4.6.5") } test { diff --git a/provider/src/test/java/au/com/dius/pactworkshop/provider/ProductPactProviderTest.java b/provider/src/test/java/au/com/dius/pactworkshop/provider/ProductPactProviderTest.java index f46d35c..5b783e9 100644 --- a/provider/src/test/java/au/com/dius/pactworkshop/provider/ProductPactProviderTest.java +++ b/provider/src/test/java/au/com/dius/pactworkshop/provider/ProductPactProviderTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.junit.jupiter.SpringExtension; @Provider("ProductService")