Merge pull request #156 from orionll/master

mperry · mperry · commit 589552bc8122 · 2015-06-20T12:48:52.000+10:00
Added possibility to run individual tests
diff --git a/quickcheck/src/main/java/fj/test/runner/PropertyTestRunner.java b/quickcheck/src/main/java/fj/test/runner/PropertyTestRunner.java
@@ -2,38 +2,45 @@
 
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Filter;
+import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
 
+import fj.P;
 import fj.P3;
+import fj.data.List;
 import fj.data.Option;
 import fj.test.CheckResult;
 import fj.test.Property;
 import fj.test.reflect.Check;
 import fj.test.reflect.CheckParams;
 
-public class PropertyTestRunner extends Runner {
+public class PropertyTestRunner extends Runner implements Filterable {
   private final Class<?> clas;
+  private final List<P3<Property, Option<CheckParams>, Description>> allTests;
+  private volatile List<P3<Property, Option<CheckParams>, Description>> filteredTests;
 
   public PropertyTestRunner(Class<?> clas) {
     this.clas = clas;
+    this.allTests = Check.properties(clas).map(p -> P.p(p._1(), p._3(), Description.createTestDescription(clas, p._2())));
+    this.filteredTests = allTests;
   }
 
   @Override
   public Description getDescription() {
     Description suite = Description.createSuiteDescription(clas);
-    for (P3<Property, String, Option<CheckParams>> p : Check.properties(clas)) {
-      suite.addChild(Description.createTestDescription(clas, p._2()));
-    }
+    filteredTests.foreachDoEffect(p -> suite.addChild(p._3()));
     return suite;
   }
 
   @Override
   public void run(RunNotifier notifier) {
-    for (P3<Property, String, Option<CheckParams>> p : Check.properties(clas)) {
-      Description desc = Description.createTestDescription(clas, p._2());
+    filteredTests.foreachDoEffect(p -> {
+      Description desc = p._3();
       notifier.fireTestStarted(desc);
-      CheckResult result = checkProperty(p._1(), p._3());
+      CheckResult result = checkProperty(p._1(), p._2());
 
       try {
         CheckResult.summaryEx.showS(result);
@@ -42,7 +49,7 @@ public void run(RunNotifier notifier) {
       }
 
       notifier.fireTestFinished(desc);
-    }
+    });
   }
 
   private static CheckResult checkProperty(Property prop, Option<CheckParams> params) {
@@ -52,4 +59,10 @@ private static CheckResult checkProperty(Property prop, Option<CheckParams> para
 
     return prop.check();
   }
+
+  @Override
+  public void filter(Filter filter) throws NoTestsRemainException {
+    filteredTests = allTests.filter(p -> filter.shouldRun(p._3()));
+    if (filteredTests.isEmpty()) { throw new NoTestsRemainException(); }
+  }
 }
