Add enableIncrementalCapture in hoverfly-java-junit5

Author: patown

junit5/src/main/java/io/specto/hoverfly/junit5/HoverflyExtension.java

@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.extension.*;
 
 import java.lang.reflect.AnnotatedElement;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
 import static io.specto.hoverfly.junit.core.HoverflyMode.SIMULATE;
@@ -59,6 +60,9 @@ public void beforeEach(ExtensionContext context) {
                 hoverfly.simulate(source);
             }
         }
+        if (hoverfly.getHoverflyConfig().isIncrementalCapture() && capturePath != null && Files.isReadable(capturePath)) {
+            hoverfly.simulate(SimulationSource.file(capturePath));
+        }
     }
 
     @Override

junit5/src/main/java/io/specto/hoverfly/junit5/HoverflyExtensionUtils.java

@@ -53,7 +53,7 @@ static io.specto.hoverfly.junit.core.HoverflyConfig getHoverflyConfigs(HoverflyC
                     ((LocalHoverflyConfig) configs).addCommands(config.commands());
                 }
             }
-            fillHoverflyConfig(configs, config);
+            setCommonHoverflyConfig(configs, config);
             return configs;
 
         } else {
@@ -92,7 +92,7 @@ static Path getCapturePath(String path, String filename) {
         return Paths.get(path).resolve(filename);
     }
 
-    private static void fillHoverflyConfig(io.specto.hoverfly.junit.core.HoverflyConfig configs,
+    private static void setCommonHoverflyConfig(io.specto.hoverfly.junit.core.HoverflyConfig configs,
         HoverflyConfig configParams) {
         configs
             .adminPort(configParams.adminPort())
@@ -112,6 +112,9 @@ private static void fillHoverflyConfig(io.specto.hoverfly.junit.core.HoverflyCon
         if (configParams.statefulCapture()) {
             configs.enableStatefulCapture();
         }
+        if (configParams.enableIncrementalCapture()){
+            configs.enableIncrementalCapture();
+        }
     }
 
     private static SimulationPreprocessor getSimulationPreprocessor(HoverflyConfig configParams) {

junit5/src/main/java/io/specto/hoverfly/junit5/api/HoverflyConfig.java

@@ -85,7 +85,7 @@
     boolean plainHttpTunneling() default false;
 
     /**
-     * Configure Hoverfly to skip TLS verification. This option allows Hoverfly to perform “insecure” SSL connections to target server that uses invalid certificate (eg. self-signed certificate)
+     * Configure Hoverfly to skip TLS verification. This option allows Hoverfly to perform "insecure" SSL connections to target server that uses invalid certificate (eg. self-signed certificate)
      */
     boolean disableTlsVerification() default false;
 
@@ -135,4 +135,13 @@
      * Overrides the default path for Hoverfly binary and working directory.
      */
     String binaryLocation() default "";
+
+    /**
+     * By default Hoverfly exports the captured requests and responses to a new file by replacing any existing one. Enable this
+     * option to import any existing simulation file and append new requests to it in capture mode.
+     * @return the {@link io.specto.hoverfly.junit.core.HoverflyConfig} for further customizations
+     */
+
+    boolean enableIncrementalCapture() default false;
+
 }

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

@@ -59,7 +59,8 @@ void shouldUseDefaultValues(Hoverfly hoverfly) {
             webServer = true, statefulCapture = true,
             simulationPreprocessor = CustomSimulationPreprocessor.class,
             commands = { "-log-level", "error" },
-            logLevel = LogLevel.DEBUG
+            logLevel = LogLevel.DEBUG,
+            enableIncrementalCapture =true
     ))
     @ExtendWith(HoverflyExtension.class)
     class CustomizedSettings {
@@ -80,6 +81,7 @@ void shouldUseCustomizedValues(Hoverfly hoverfly) {
             assertThat(configs.getSimulationPreprocessor()).isPresent();
             assertThat(configs.getCommands()).containsExactly("-log-level", "error");
             assertThat(configs.getLogLevel()).isEqualTo(Optional.of(LogLevel.DEBUG));
+            assertThat(configs.isIncrementalCapture()).isTrue();
         }
 
     }