Replace skip by whitelist/blacklist in draft test cases

Author: stefk

tests/JsonSchema/Tests/Drafts/BaseDraftTestCase.php

@@ -11,17 +11,27 @@ abstract class BaseDraftTestCase extends BaseTestCase
     private function setUpTests($isValid)
     {
         $filePaths = $this->getFilePaths();
-        $skippedTests = $this->getSkippedTests();
+        $whiteList = $this->getWhiteList();
+        $blackList = $this->getBlackList();
         $tests = array();
 
         foreach ($filePaths as $path) {
             foreach (glob($path . '/*.json') as $file) {
-                if (!in_array(basename($file), $skippedTests)) {
+                $name = basename($file);
+                $whiteListed = $whiteList && in_array($name, $whiteList);
+                $blackListed = !$whiteList && $blackList && in_array($name, $blackList);
+                $mustSkip = $whiteList && !$whiteListed || $blackListed;
+
+                if (!$mustSkip) {
                     $suites = json_decode(file_get_contents($file));
+
                     foreach ($suites as $suite) {
                         foreach ($suite->tests as $test) {
                             if ($isValid === $test->valid) {
-                                $tests[] = array(json_encode($test->data), json_encode($suite->schema));
+                                $tests[] = array(
+                                    json_encode($test->data),
+                                    json_encode($suite->schema)
+                                );
                            }
                         }
                     }
@@ -44,5 +54,26 @@ public function getValidTests()
 
     protected abstract function getFilePaths();
 
-    protected abstract function getSkippedTests();
+    /**
+     * Returns the list of tests to run, or false, if all
+     * the tests must be included in the suite by default.
+     *
+     * @return false|string[]
+     */
+    protected function getWhiteList()
+    {
+        return false;
+    }
+
+    /**
+     * Returns the list of tests not to run, or false, if no test
+     * should be excluded from the suite by default. Note that
+     * this list is ignored if a white list has been provided.
+     *
+     * @return false|string[]
+     */
+    protected function getBlackList()
+    {
+        return false;
+    }
 }

tests/JsonSchema/Tests/Drafts/Draft3Test.php

@@ -12,7 +12,7 @@ protected function getFilePaths()
         );
     }
 
-    protected function getSkippedTests()
+    protected function getBlackList()
     {
         return array(
             'ref.json',

tests/JsonSchema/Tests/Drafts/Draft4Test.php

@@ -12,7 +12,7 @@ protected function getFilePaths()
         );
     }
 
-    protected function getSkippedTests()
+    protected function getBlackList()
     {
         return array(
             // Not Yet Implemented
@@ -25,5 +25,4 @@ protected function getSkippedTests()
             'zeroTerminatedFloats.json'
         );
     }
-
 }