X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=spring-consumer%2Fsrc%2Ftest%2Fjava%2Fde%2Fjuplo%2Fdemos%2Fpact%2FContractTest.java;h=16c6815fadfd3c589f49a2323106e2471bfa8a65;hb=2faa2b692bd69773d5d60299b835de06c999991d;hp=d7358d85224b636209d2eb4d03df5bad47e79076;hpb=b01ab6860eb5ab3be5b04427924c1c44b1d0fc66;p=demos%2Fexample-siren

diff --git a/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java b/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java
index d7358d8..16c6815 100644
--- a/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java
+++ b/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java
@@ -1,8 +1,7 @@
 package de.juplo.demos.pact;
 
 import au.com.dius.pact.consumer.MockServer;
-import au.com.dius.pact.consumer.dsl.PactDslJsonBody;
-import au.com.dius.pact.consumer.dsl.PactDslWithProvider;
+import au.com.dius.pact.consumer.dsl.*;
 import au.com.dius.pact.consumer.junit5.PactConsumerTestExt;
 import au.com.dius.pact.consumer.junit5.PactTestFor;
 import au.com.dius.pact.core.model.RequestResponsePact;
@@ -18,19 +17,12 @@ import static org.assertj.core.api.Assertions.fail;
 
 
 @ExtendWith(PactConsumerTestExt.class)
-@PactTestFor(providerName = "Siren Order Provider")
+@PactTestFor(providerName = "SirenOrderProvider")
 public class ContractTest
 {
   @Pact(consumer="SpringConsumer")
-  public RequestResponsePact getOrders(PactDslWithProvider builder)
+  public RequestResponsePact getAllOrders(PactDslWithProvider builder)
   {
-    PactDslJsonBody body = new PactDslJsonBody()
-        .stringType("name")
-        .booleanType("happy")
-        .hexValue("hexCode")
-        .id()
-        .ipAddress("localAddress")
-        .numberValue("age", 100);
     return builder
           .uponReceiving("get all orders")
             .path("/orders")
@@ -38,12 +30,70 @@ public class ContractTest
           .willRespondWith()
             .status(200)
             .headers(Map.of("Content-Type", "application/vnd.siren+json"))
-            .body(body)
+            .body(LambdaDsl.newJsonBody(body ->
+            {
+              body.array("class", classArray ->
+              {
+                classArray.stringValue("entity");
+              });
+              body.eachLike("entities", entities ->
+              {
+                entities.arrayContaining("actions", actionsArray->
+                {
+                  actionsArray.object(object ->
+                  {
+                    object.stringType("name","update");
+                    object.stringType("method", "PUT");
+                    object.matchUrl2("href", "orders", Matchers.regexp("\\d+", "1234").getValue());
+                  });
+                  actionsArray.object(object ->
+                  {
+                    object.stringType("name","delete");
+                    object.stringType("method", "DELETE");
+                    object.matchUrl2("href", "orders", Matchers.regexp("\\d+", "1234").getValue());
+                  });
+                });
+                entities.array("class", classArray ->
+                {
+                  classArray.stringValue("entity");
+                });
+                entities.array("links", linksArray ->
+                {
+                  linksArray.object(object->
+                  {
+                    object.matchUrl2("href", "orders", Matchers.regexp("\\d+", "1234").getMatcher());
+                    object.array("rel", relArray ->
+                    {
+                      relArray.stringValue("self");
+                    });
+                  });
+                });
+                entities.object("properties", object->
+                {
+                  object.integerType("id", 1234);
+                });
+                entities.array("rel", relArray ->
+                {
+                  relArray.stringValue("item");
+                });
+              });
+              body.array("links", linksArray ->
+              {
+                linksArray.object(object->
+                {
+                  object.matchUrl2("href", "orders");
+                  object.array("rel", relArray ->
+                  {
+                    relArray.stringValue("self");
+                  });
+                });
+              });
+            }).build())
         .toPact();
   }
 
   @Test
-  @PactTestFor(pactMethod = "getOrders")
+  @PactTestFor(pactMethod = "getAllOrders")
   public void testGetExistingUserByEmail(MockServer mockServer)
   {
     RestTemplate restTemplate =