Disable spurious notifies for testWaitWithoutNotify.

Author: aoli-al

core/src/test/java/org/pastalab/fray/core/test/FrayRunner.java

@@ -14,18 +14,18 @@
 
 public class FrayRunner {
     public Throwable runWithFifo(Function0<Unit> exec) {
-        return runWithScheduler(exec, new FifoScheduler(), 1);
+        return runWithScheduler(exec, new FifoScheduler(), 1, new ControlledRandom());
     }
 
     public Throwable runWithPOS(Function0<Unit> exec) {
-        return runWithScheduler(exec, new POSScheduler(), 10000);
+        return runWithScheduler(exec, new POSScheduler(), 10000, new ControlledRandom());
     }
 
-    public Throwable runWithScheduler(Function0<Unit> exec, Scheduler scheduler, int iter) {
-        return buildRunner(exec, scheduler, iter).run();
+    public Throwable runWithScheduler(Function0<Unit> exec, Scheduler scheduler, int iter, ControlledRandom random) {
+        return buildRunner(exec, scheduler, iter, random).run();
     }
 
-    public TestRunner buildRunner(Function0<Unit> exec, Scheduler scheduler, int iter) {
+    public TestRunner buildRunner(Function0<Unit> exec, Scheduler scheduler, int iter, ControlledRandom random) {
         Configuration config = new Configuration(
                 new ExecutionInfo(
                         new LambdaExecutor(() -> {
@@ -40,7 +40,7 @@ public TestRunner buildRunner(Function0<Unit> exec, Scheduler scheduler, int ite
                 "/tmp/report",
                 iter,
                 scheduler,
-                new ControlledRandom(),
+                random,
                 true,
                 false,
                 true,

core/src/test/java/org/pastalab/fray/core/test/primitives/ConcurrentHashmapTest.java

@@ -50,7 +50,7 @@ public void testConcurrentHashMapDifferentExecutionPath() {
             map.put(new DeterministicHashCodeObject(1014958949), i.getAndIncrement());
             return null;
         };
-        TestRunner runner = buildRunner(task, new FifoScheduler(), 1);
+        TestRunner runner = buildRunner(task, new FifoScheduler(), 1, new ControlledRandom());
         ScheduleRecorder recorder = new ScheduleRecorder();
         runner.getConfig().getScheduleObservers().add(recorder);
         runner.run();
@@ -65,7 +65,7 @@ public void testConcurrentHashMapDifferentExecutionPath() {
             map.put(new DeterministicHashCodeObject(-507498936), i.getAndIncrement());
             return null;
         };
-        TestRunner runner2 = buildRunner(task, new FifoScheduler(), 1);
+        TestRunner runner2 = buildRunner(task, new FifoScheduler(), 1, new ControlledRandom());
         ScheduleRecorder recorder2 = new ScheduleRecorder();
         runner2.getConfig().getScheduleObservers().add(recorder2);
         runner2.run();
@@ -90,7 +90,7 @@ public void testConcurrentHashMapSameExecutionPath() {
                 map.put(o, i.getAndIncrement());
                 return null;
             };
-            TestRunner runner = buildRunner(task, new FifoScheduler(), 1);
+            TestRunner runner = buildRunner(task, new FifoScheduler(), 1, new ControlledRandom());
             ScheduleRecorder recorder = new ScheduleRecorder();
             runner.getConfig().getScheduleObservers().add(recorder);
             runner.run();
@@ -112,7 +112,7 @@ public void testConcurrentHashMapSameExecutionPath() {
                 map.put(o, i.getAndIncrement());
                 return null;
             };
-            TestRunner runner2 = buildRunner(task, new FifoScheduler(), 1);
+            TestRunner runner2 = buildRunner(task, new FifoScheduler(), 1, new ControlledRandom());
             runner2.getConfig()
                     .setRandomnessProvider(new ControlledRandom(randomSource.getIntegers(),
                             randomSource.getDoubles(), new Random()));

core/src/test/java/org/pastalab/fray/core/test/primitives/IntStreamTest.java

@@ -1,6 +1,7 @@
 package org.pastalab.fray.core.test.primitives;
 
 import org.junit.jupiter.api.Test;
+import org.pastalab.fray.core.randomness.ControlledRandom;
 import org.pastalab.fray.core.scheduler.POSScheduler;
 import org.pastalab.fray.core.test.FrayRunner;
 
@@ -19,7 +20,7 @@ public void test() {
             assert(x.get() != 10);
             return null;
         }, new POSScheduler(),
-                1000000).run();
+                1000000, new ControlledRandom()).run();
         assertTrue(result instanceof AssertionError);
     }
 

core/src/test/java/org/pastalab/fray/core/test/primitives/WaitTest.java

@@ -1,9 +1,13 @@
 package org.pastalab.fray.core.test.primitives;
 
 import org.junit.jupiter.api.Test;
+import org.pastalab.fray.core.randomness.ControlledRandom;
+import org.pastalab.fray.core.scheduler.FifoScheduler;
 import org.pastalab.fray.core.test.FrayRunner;
 import org.pastalab.fray.runtime.DeadlockException;
 
+import java.util.ArrayList;
+import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -26,7 +30,11 @@ public void testWaitWithoutMonitorLock() {
 
     @Test
     public void testWaitWithoutNotify() {
-        Throwable result = runWithFifo(() -> {
+        ArrayList<Integer> randInts = new ArrayList<>();
+        randInts.add(1);
+        randInts.add(1);
+        randInts.add(1);
+        Throwable result = runWithScheduler(() -> {
             try {
                 synchronized (this) {
                     wait();
@@ -35,7 +43,7 @@ public void testWaitWithoutNotify() {
                 throw new RuntimeException(e);
             }
             return null;
-        });
+        }, new FifoScheduler(), 1, new ControlledRandom(randInts, new ArrayList<>(), new Random()));
         assertInstanceOf(DeadlockException.class, result);
     }