Add parameterization to torture tests

Author: sungshik

src/test/java/engineering/swat/watch/TestHelper.java

@@ -27,6 +27,9 @@
 package engineering.swat.watch;
 
 import java.time.Duration;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 public class TestHelper {
 
@@ -54,4 +57,21 @@ else if (os.contains("win")) {
         NORMAL_WAIT = Duration.ofSeconds(4 * delayFactor);
         LONG_WAIT = Duration.ofSeconds(8 * delayFactor);
     }
+
+    public static <T> Stream<T> streamOf(T[] values, int repetitions) {
+        return streamOf(values, repetitions, false);
+    }
+
+    public static <T> Stream<T> streamOf(T[] values, int repetitions, boolean sortByRepetition) {
+        if (sortByRepetition) {
+            return IntStream
+                .range(0, repetitions)
+                .boxed()
+                .flatMap(i -> Arrays.stream(values));
+        }
+        else { // Sort by value
+            return Arrays.stream(values).flatMap(v ->
+                IntStream.range(0, repetitions).mapToObj(i -> v));
+        }
+    }
 }

src/test/java/engineering/swat/watch/TortureTests.java

@@ -46,16 +46,18 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.RepeatedTest;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class TortureTests {
 
@@ -141,17 +143,18 @@ Set<Path> stop() throws InterruptedException {
 
     private static final int THREADS = 4;
 
-    @Test
-    void pressureOnFSShouldNotMissNewFilesAnything() throws InterruptedException, IOException {
+    @ParameterizedTest
+    @EnumSource(names = { "ALL", "DIRTY" })
+    void pressureOnFSShouldNotMissNewFilesAnything(OnOverflow whichFiles) throws InterruptedException, IOException {
         final var root = testDir.getTestDirectory();
         var pool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 4);
 
         var io = new IOGenerator(THREADS, root, pool);
 
-
         var seenCreates = ConcurrentHashMap.<Path>newKeySet();
         var watchConfig = Watcher.watch(testDir.getTestDirectory(), WatchScope.PATH_AND_ALL_DESCENDANTS)
             .withExecutor(pool)
+            .approximate(whichFiles)
             .on(ev -> {
                 var fullPath = ev.calculateFullPath();
                 switch (ev.getKind()) {
@@ -206,8 +209,14 @@ void pressureOnFSShouldNotMissNewFilesAnything() throws InterruptedException, IO
 
     private final int TORTURE_REGISTRATION_THREADS = THREADS * 500;
 
-    @RepeatedTest(failureThreshold=1, value = 20)
-    void manyRegistrationsForSamePath() throws InterruptedException, IOException {
+    static Stream<OnOverflow> manyRegistrationsForSamePathSource() {
+        OnOverflow[] values = { OnOverflow.ALL, OnOverflow.DIRTY };
+        return TestHelper.streamOf(values, 5);
+    }
+
+    @ParameterizedTest
+    @MethodSource("manyRegistrationsForSamePathSource")
+    void manyRegistrationsForSamePath(OnOverflow whichFiles) throws InterruptedException, IOException {
         var startRegistering = new Semaphore(0);
         var startedWatching = new Semaphore(0);
         var startDeregistring = new Semaphore(0);
@@ -220,6 +229,7 @@ void manyRegistrationsForSamePath() throws InterruptedException, IOException {
                 try {
                     var watcher = Watcher
                         .watch(testDir.getTestDirectory(), WatchScope.PATH_AND_CHILDREN)
+                        .approximate(whichFiles)
                         .on(e -> seen.add(e.calculateFullPath()));
                     startRegistering.acquire();
                     try (var c = watcher.start()) {
@@ -263,8 +273,14 @@ void manyRegistrationsForSamePath() throws InterruptedException, IOException {
         }
     }
 
-    @RepeatedTest(failureThreshold=1, value = 20)
-    void manyRegisterAndUnregisterSameTime() throws InterruptedException, IOException {
+    static Stream<OnOverflow> manyRegisterAndUnregisterSameTimeSource() {
+        OnOverflow[] values = { OnOverflow.ALL, OnOverflow.DIRTY };
+        return TestHelper.streamOf(values, 5);
+    }
+
+    @ParameterizedTest
+    @MethodSource("manyRegisterAndUnregisterSameTimeSource")
+    void manyRegisterAndUnregisterSameTime(OnOverflow whichFiles) throws InterruptedException, IOException {
         var startRegistering = new Semaphore(0);
         var startedWatching = new Semaphore(0);
         var stopAll = new Semaphore(0);
@@ -286,6 +302,7 @@ void manyRegisterAndUnregisterSameTime() throws InterruptedException, IOExceptio
                         for (int k = 0; k < 1000; k++) {
                             var watcher = Watcher
                                 .watch(testDir.getTestDirectory(), WatchScope.PATH_AND_CHILDREN)
+                                .approximate(whichFiles)
                                 .on(e -> {
                                     if (e.calculateFullPath().equals(target)) {
                                         seen.add(id);
@@ -328,13 +345,13 @@ void manyRegisterAndUnregisterSameTime() throws InterruptedException, IOExceptio
         finally {
             stopAll.release(amountOfWatchersActive);
         }
-
     }
 
-    @Test
+    @ParameterizedTest
+    @EnumSource(names = { "ALL", "DIRTY" })
     //Deletes can race the filesystem, so you might miss a few files in a dir, if that dir is already deleted
     @EnabledIfEnvironmentVariable(named="TORTURE_DELETE", matches="true")
-    void pressureOnFSShouldNotMissDeletes() throws InterruptedException, IOException {
+    void pressureOnFSShouldNotMissDeletes(OnOverflow whichFiles) throws InterruptedException, IOException {
         final var root = testDir.getTestDirectory();
         var pool = Executors.newCachedThreadPool();
 
@@ -350,6 +367,7 @@ void pressureOnFSShouldNotMissDeletes() throws InterruptedException, IOException
             final var happened = new Semaphore(0);
             var watchConfig = Watcher.watch(testDir.getTestDirectory(), WatchScope.PATH_AND_ALL_DESCENDANTS)
                 .withExecutor(pool)
+                .approximate(whichFiles)
                 .on(ev -> {
                     events.getAndIncrement();
                     happened.release();
@@ -393,8 +411,6 @@ void pressureOnFSShouldNotMissDeletes() throws InterruptedException, IOException
         }
     }
 
-
-
     private void waitForStable(final AtomicInteger events, final Semaphore happened) throws InterruptedException {
         int lastEventCount = events.get();
         int stableCount = 0;