Another test made 3x faster

Author: DavyLandman

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

@@ -30,7 +30,7 @@
 import static engineering.swat.watch.WatchEvent.Kind.DELETED;
 import static engineering.swat.watch.WatchEvent.Kind.MODIFIED;
 import static engineering.swat.watch.WatchEvent.Kind.OVERFLOW;
-import static org.awaitility.Awaitility.await;
+import static engineering.swat.watch.util.WaitFor.await;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -45,6 +45,7 @@
 
 import engineering.swat.watch.WatchEvent.Kind;
 import engineering.swat.watch.impl.EventHandlingWatch;
+import engineering.swat.watch.util.WaitFor;
 
 class SingleDirectoryTests {
     private TestDirectory testDir;
@@ -63,7 +64,7 @@ void cleanup() {
 
     @BeforeAll
     static void setupEverything() {
-        Awaitility.setDefaultTimeout(TestHelper.NORMAL_WAIT);
+        WaitFor.setDefaultTimeout(TestHelper.NORMAL_WAIT);
     }
 
     @Test
@@ -85,12 +86,12 @@ void deleteOfFileInDirectoryShouldBeVisible() throws IOException {
             // Delete the file
             Files.delete(target);
             await("File deletion should generate delete event")
-                .untilTrue(seenDelete);
+                .until(seenDelete);
 
             // Re-create it again
             Files.writeString(target, "Hello World");
             await("File creation should generate create event")
-                .untilTrue(seenCreate);
+                .until(seenCreate);
         }
     }
 
@@ -116,12 +117,12 @@ public void onDeleted(WatchEvent ev) {
             // Delete the file
             Files.delete(target);
             await("File deletion should generate delete event")
-                .untilTrue(seenDelete);
+                .until(seenDelete);
 
             // Re-create it again
             Files.writeString(target, "Hello World");
             await("File creation should generate create event")
-                .untilTrue(seenCreate);
+                .until(seenCreate);
         }
     }
 
@@ -181,22 +182,23 @@ void indexingRescanOnOverflow() throws IOException, InterruptedException {
             // Perform some file operations (after a short wait to ensure a new
             // last-modified-time). No events should be observed (because the
             // overflow simulation is running).
-            Thread.sleep(TestHelper.SHORT_WAIT.toMillis());
+            Thread.sleep(100);
             Files.writeString(directory.resolve("a.txt"), "foo");
             Files.writeString(directory.resolve("b.txt"), "bar");
             Files.delete(directory.resolve("c.txt"));
             Files.createFile(directory.resolve("d.txt"));
 
             await("No events should have been triggered")
-                .pollDelay(TestHelper.SHORT_WAIT)
-                .until(() -> bookkeeper.events().none());
+                .time(TestHelper.SMALL_WAIT)
+                .holds(() -> bookkeeper.events().none());
 
             // End overflow simulation, and generate an `OVERFLOW` event.
             // Synthetic events should now be issued and observed.
             dropEvents.set(false);
             var overflow = new WatchEvent(WatchEvent.Kind.OVERFLOW, directory);
             ((EventHandlingWatch) watch).handleEvent(overflow);
 
+
             for (var e : new WatchEvent[] {
                 new WatchEvent(MODIFIED, directory, Path.of("a.txt")),
                 new WatchEvent(MODIFIED, directory, Path.of("b.txt")),
@@ -211,7 +213,7 @@ void indexingRescanOnOverflow() throws IOException, InterruptedException {
 
             // Perform some more file operations. All events should be observed
             // (because the overflow simulation is no longer running).
-            Thread.sleep(TestHelper.SHORT_WAIT.toMillis());
+            Thread.sleep(500);
             Files.delete(directory.resolve("a.txt"));
             Files.writeString(directory.resolve("b.txt"), "baz");
             Files.createFile(directory.resolve("c.txt"));
@@ -232,8 +234,8 @@ void indexingRescanOnOverflow() throws IOException, InterruptedException {
             ((EventHandlingWatch) watch).handleEvent(overflow);
 
             await("No events should have been triggered")
-                .pollDelay(TestHelper.SHORT_WAIT)
-                .until(() -> bookkeeper.events().kindNot(OVERFLOW).none());
+                .time(TestHelper.SMALL_WAIT)
+                .holds(() -> bookkeeper.events().kindNot(OVERFLOW).none());
         }
     }
 }

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

@@ -40,6 +40,7 @@
 public class TestHelper {
 
     public static final Duration TINY_WAIT;
+    public static final Duration SMALL_WAIT;
     public static final Duration SHORT_WAIT;
     public static final Duration NORMAL_WAIT;
     public static final Duration LONG_WAIT;
@@ -59,6 +60,7 @@ else if (os.contains("win")) {
             delayFactor *= 4;
         }
         TINY_WAIT = Duration.ofMillis(250 * delayFactor);
+        SMALL_WAIT = TINY_WAIT.multipliedBy(2);
         SHORT_WAIT = Duration.ofSeconds(1 * delayFactor);
         NORMAL_WAIT = Duration.ofSeconds(4 * delayFactor);
         LONG_WAIT = Duration.ofSeconds(8 * delayFactor);