Bump to hoverfly v1.8.0

Author: tommysitu

gradle.properties

@@ -1,4 +1,4 @@
 version=0.16.3-SNAPSHOT
 title=Hoverfly Java
 description=Hoverfly for Java. Capture and simulate HTTP(S) services in JUnit tests.
-hoverfly_binary_version=v1.7.0
+hoverfly_binary_version=v1.8.0

src/test/java/io/specto/hoverfly/ruletest/HoverflyDslTest.java

@@ -1,6 +1,19 @@
 package io.specto.hoverfly.ruletest;
 
+import static io.specto.hoverfly.junit.core.SimulationSource.dsl;
+import static io.specto.hoverfly.junit.dsl.HoverflyDsl.service;
+import static io.specto.hoverfly.junit.dsl.HttpBodyConverter.jsonWithSingleQuotes;
+import static io.specto.hoverfly.junit.dsl.ResponseCreators.created;
+import static io.specto.hoverfly.junit.dsl.ResponseCreators.noContent;
+import static io.specto.hoverfly.junit.dsl.ResponseCreators.success;
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
 import io.specto.hoverfly.junit.rule.HoverflyRule;
+import java.net.URI;
+import java.net.URISyntaxException;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.http.HttpStatus;
@@ -10,18 +23,6 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import static io.specto.hoverfly.junit.core.SimulationSource.dsl;
-import static io.specto.hoverfly.junit.dsl.HoverflyDsl.service;
-import static io.specto.hoverfly.junit.dsl.HttpBodyConverter.jsonWithSingleQuotes;
-import static io.specto.hoverfly.junit.dsl.ResponseCreators.*;
-import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-
 public class HoverflyDslTest {
 
     @ClassRule
@@ -125,6 +126,4 @@ public void shouldBeAbleToPatchBookingsUsingHoverfly() throws Exception {
         assertThat(bookFlightResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
     }
 
-
-
 }

src/test/java/io/specto/hoverfly/ruletest/HoverflyMatchingPriorityTest.java

@@ -0,0 +1,60 @@
+package io.specto.hoverfly.ruletest;
+
+import io.specto.hoverfly.junit.core.SimulationSource;
+import io.specto.hoverfly.junit.dsl.HoverflyDsl;
+import io.specto.hoverfly.junit.dsl.HttpBodyConverter;
+import io.specto.hoverfly.junit.dsl.ResponseCreators;
+import io.specto.hoverfly.junit.dsl.matchers.HoverflyMatchers;
+import io.specto.hoverfly.junit.rule.HoverflyRule;
+import org.assertj.core.api.Assertions;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.client.RestTemplate;
+
+public class HoverflyMatchingPriorityTest {
+
+  @ClassRule
+  public static HoverflyRule hoverflyRule = HoverflyRule.inSimulationMode();
+
+  @Test
+  public void shouldPassWhenSpecificBodyMatcherDeclaredFirst() {
+    hoverflyRule.simulate(SimulationSource.dsl(
+        HoverflyDsl.service("https://test.com")
+            .post("/sameUrl")
+            .body(HoverflyMatchers.matchesPartialJson(HttpBodyConverter.jsonWithSingleQuotes("{'attr':'value'}")))
+            .willReturn(ResponseCreators.success())
+            .post("/sameUrl")
+            .anyBody()
+            .willReturn(ResponseCreators.badRequest())
+    ));
+    Assertions.assertThat(new RestTemplate().exchange("https://test.com/sameUrl", HttpMethod.POST, new HttpEntity<>(" {\n"
+            + "              \"test\": 1,\n"
+            + "              \"attr\": \"value\",\n"
+            + "              \"list\": [ \"A\", \"B\" ]\n"
+            + "            }"), String.class))
+        .isNotNull();
+  }
+
+  @Test
+  public void shouldPassWhenSpecificBodyMatcherDeclaredLast() {
+    hoverflyRule.simulate(SimulationSource.dsl(
+        HoverflyDsl.service("https://test.com")
+            .post("/sameUrl")
+            .anyBody()
+            .willReturn(ResponseCreators.badRequest())
+            .post("/sameUrl")
+            .body(HoverflyMatchers.matchesPartialJson(HttpBodyConverter.jsonWithSingleQuotes("{'attr':'value'}")))
+            .willReturn(ResponseCreators.success())
+
+    ));
+    Assertions.assertThat(new RestTemplate().exchange("https://test.com/sameUrl", HttpMethod.POST, new HttpEntity<>(" {\n"
+            + "              \"test\": 1,\n"
+            + "              \"attr\": \"value\",\n"
+            + "              \"list\": [ \"A\", \"B\" ]\n"
+            + "            }"), String.class))
+        .isNotNull();
+  }
+
+}