Bump hoverfly version to v1.3.0

Author: tommysitu

gradle.properties

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

junit5/src/test/java/io/specto/hoverfly/junit5/HoverflyDefaultCoreTest.java

@@ -19,7 +19,7 @@
 @ExtendWith(HoverflyExtension.class)
 class HoverflyDefaultCoreTest {
 
-    private OkHttpClient client = new OkHttpClient();
+    private final OkHttpClient client = new OkHttpClient();
 
     @Test
     void shouldBeAbleToSimulate(Hoverfly hoverfly) throws IOException {

src/main/java/io/specto/hoverfly/junit/core/model/HoverflyMetaData.java

@@ -26,12 +26,12 @@ public class HoverflyMetaData {
 
     private static final List<String> EXCLUDED_FIELDS = Arrays.asList("hoverflyVersion", "timeExported");
 
-    private String schemaVersion;
+    private final String schemaVersion;
     private String hoverflyVersion;
     private String timeExported;
 
     public HoverflyMetaData() {
-        schemaVersion = "v5";
+        schemaVersion = "v5.1";
     }
 
     @JsonCreator
@@ -69,4 +69,4 @@ public int hashCode() {
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
-}
+}

src/test/java/io/specto/hoverfly/junit/api/OkHttpHoverflyClientTest.java

@@ -281,6 +281,6 @@ private void assertSimulationIsSetAndUpgraded(String resourcePath) throws IOExce
 
         Simulation exportedSimulation = hoverfly.getSimulation();
         assertThat(exportedSimulation.getHoverflyData().getPairs()).hasSize(1);
-        assertThat(exportedSimulation.getHoverflyMetaData().getSchemaVersion()).isEqualTo("v5");
+        assertThat(exportedSimulation.getHoverflyMetaData().getSchemaVersion()).isEqualTo("v5.1");
     }
 }

src/test/java/io/specto/hoverfly/junit/core/SimulationSourceTest.java

@@ -141,7 +141,7 @@ public void shouldCreateSimulationFromSimulationObject() throws Exception {
     public void shouldCreateEmptySimulation() throws JSONException {
         JSONAssert.assertEquals(
                 SimulationSource.empty().getSimulation(),
-                "{\"data\":{\"pairs\":[],\"globalActions\":{\"delays\":[]}},\"meta\":{\"schemaVersion\":\"v5\"}}",
+                "{\"data\":{\"pairs\":[],\"globalActions\":{\"delays\":[]}},\"meta\":{\"schemaVersion\":\"v5.1\"}}",
                 false);
     }
 

src/test/java/io/specto/hoverfly/junit/core/model/SimulationTest.java

@@ -1,38 +1,31 @@
 package io.specto.hoverfly.junit.core.model;
 
 
+import static io.specto.hoverfly.junit.core.model.RequestFieldMatcher.newExactMatcher;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.io.Resources;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.Collections;
-
-import static io.specto.hoverfly.junit.core.model.RequestFieldMatcher.*;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class SimulationTest {
 
 
-    private ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
-    private URL v1Resource = Resources.getResource("simulations/v1-simulation.json");
-    private URL v1ResourceWithLooseMatching = Resources.getResource("simulations/v1-simulation-with-loose-matching.json");
-    private URL v1ResourceWithRecording = Resources.getResource("simulations/v1-simulation-with-recording.json");
-    private URL v2Resource = Resources.getResource("simulations/v2-simulation.json");
-    private URL v3Resource = Resources.getResource("simulations/v3-simulation.json");
-    private URL v4Resource = Resources.getResource("simulations/v4-simulation.json");
-    private URL v5Resource = Resources.getResource("simulations/v5-simulation.json");
-    private URL v5ResourceWithoutGlobalActions = Resources.getResource("simulations/v5-simulation-without-global-actions.json");
-    private URL v5ResourceWithUnknownFields = Resources.getResource("simulations/v5-simulation-with-unknown-fields.json");
+    private final URL v5Resource = Resources.getResource("simulations/v5-simulation.json");
+    private final URL v5ResourceWithoutGlobalActions = Resources.getResource("simulations/v5-simulation-without-global-actions.json");
+    private final URL v5ResourceWithUnknownFields = Resources.getResource("simulations/v5-simulation-with-unknown-fields.json");
 
 
     @Test
@@ -56,7 +49,7 @@ public void shouldSerialize() throws Exception {
         String actual = objectMapper.writeValueAsString(simulation);
 
         // then
-        String expected = Resources.toString(v5Resource, Charset.forName("UTF-8"));
+        String expected = Resources.toString(v5Resource, StandardCharsets.UTF_8);
         JSONAssert.assertEquals(expected, actual, JSONCompareMode.STRICT);
     }
 
@@ -74,7 +67,7 @@ public void shouldIgnoreUnknownPropertiesWhenDeserialize() throws Exception {
 
     @Test
     public void shouldNotIncludeNullGlobalActionsFieldWhenSerialize() throws Exception{
-        String expected = Resources.toString(v5ResourceWithoutGlobalActions, Charset.forName("UTF-8"));
+        String expected = Resources.toString(v5ResourceWithoutGlobalActions, StandardCharsets.UTF_8);
 
         Simulation simulation = objectMapper.readValue(expected, Simulation.class);
 
@@ -121,4 +114,4 @@ private HoverflyData getTestHoverflyData(Request.Builder testRequestBuilder, Res
             Sets.newHashSet(new RequestResponsePair(testRequestBuilder.build(), testResponseBuilder.build())),
             new GlobalActions(Collections.emptyList()));
     }
-}
+}

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

@@ -38,7 +38,7 @@ public class CaptureModeTest {
             localConfigs().captureAllHeaders().proxyLocalHost());
 
     private URI webServerBaseUrl;
-    private RestTemplate restTemplate = new RestTemplate();
+    private final RestTemplate restTemplate = new RestTemplate();
 
     // We have to assert after the rule has executed because that's when the classpath is written to the filesystem
     @AfterClass

src/test/resources/expected-simulation-other.json

@@ -55,6 +55,6 @@
 		}
 	},
 	"meta": {
-		"schemaVersion": "v5"
+		"schemaVersion": "v5.1"
 	}
 }

src/test/resources/expected-simulation.json

@@ -55,6 +55,6 @@
 		}
 	},
 	"meta": {
-		"schemaVersion": "v5"
+		"schemaVersion": "v5.1"
 	}
 }

src/test/resources/simulations/v5-simulation-with-unknown-fields.json

@@ -84,6 +84,6 @@
 		}
 	},
 	"meta": {
-		"schemaVersion": "v5"
+		"schemaVersion": "v5.1"
 	}
 }