test: correct test regression due to newly introduced tests

Author: DannyvdSluijs

tests/Drafts/Draft3Test.php

@@ -75,6 +75,20 @@ protected function getFilePaths(): array
         ];
     }
 
+    public function getInvalidTests(): \Generator
+    {
+        $skip = [
+            'ref.json / $ref prevents a sibling id from changing the base uri / $ref resolves to /definitions/base_foo, data does not validate'
+        ];
+
+        foreach (parent::getInvalidTests() as $name => $testcase) {
+            if (in_array($name, $skip, true)) {
+                continue;
+            }
+            yield $name => $testcase;
+        }
+    }
+
     public function getInvalidForAssocTests(): \Generator
     {
         $skip = [

tests/Drafts/Draft4Test.php

@@ -20,9 +20,32 @@ protected function getFilePaths(): array
         ];
     }
 
+    public function getInvalidTests(): \Generator
+    {
+        $skip = [
+            'id.json / id inside an enum is not a real identifier / no match on enum or $ref to id',
+            'ref.json / $ref prevents a sibling id from changing the base uri / $ref resolves to /definitions/base_foo, data does not validate',
+            'ref.json / Recursive references between schemas / invalid tree',
+            'ref.json / refs with quote / object with strings is invalid',
+            'ref.json / Location-independent identifier / mismatch',
+            'ref.json / Location-independent identifier with base URI change in subschema / mismatch',
+            'ref.json / empty tokens in $ref json-pointer / non-number is invalid',
+            'ref.json / id must be resolved against nearest parent, not just immediate parent / non-number is invalid',
+            'refRemote.json / Location-independent identifier in remote ref / string is invalid',
+        ];
+
+        foreach (parent::getInvalidTests() as $name => $testcase) {
+            if (in_array($name, $skip, true)) {
+                continue;
+            }
+            yield $name => $testcase;
+        }
+    }
+
     public function getInvalidForAssocTests(): \Generator
     {
         $skip = [
+            'ref.json / Recursive references between schemas / valid tree',
             'type.json / object type matches objects / an array is not an object',
             'type.json / array type matches arrays / an object is not an array',
         ];
@@ -35,6 +58,27 @@ public function getInvalidForAssocTests(): \Generator
         }
     }
 
+    public function getValidTests(): \Generator
+    {
+        $skip = [
+            'ref.json / $ref prevents a sibling id from changing the base uri / $ref resolves to /definitions/base_foo, data validates',
+            'ref.json / Recursive references between schemas / valid tree',
+            'ref.json / refs with quote / object with numbers is valid',
+            'ref.json / Location-independent identifier / match',
+            'ref.json / Location-independent identifier with base URI change in subschema / match',
+            'ref.json / empty tokens in $ref json-pointer / number is valid',
+            'ref.json / naive replacement of $ref with its destination is not correct / match the enum exactly',
+            'refRemote.json / Location-independent identifier in remote ref / integer is valid',
+        ];
+
+        foreach (parent::getValidTests() as $name => $testcase) {
+            if (in_array($name, $skip, true)) {
+                continue;
+            }
+            yield $name => $testcase;
+        }
+    }
+
     public function getValidForAssocTests(): \Generator
     {
         $skip = [

tests/JsonSchemaTestSuite.php

@@ -36,29 +36,13 @@ public function testIt(
         self::assertEquals($expectedValidationResult, count($validator->getErrors()) === 0);
     }
 
-    public function testItOnce(): void
-    {
-        $schema = json_decode('{ "required": ["__proto__", "toString", "constructor"] }', false);
-        $data = [];
-
-        $schemaStorage = new SchemaStorage();
-        $schemaStorage->addSchema(SchemaStorage::INTERNAL_PROVIDED_SCHEMA_URI, $schema);
-        $this->loadRemotesIntoStorage($schemaStorage);
-        $validator = new Validator(new Factory($schemaStorage));
-
-        $result = $validator->validate($data, $schema);
-
-        self::assertEquals(true, count($validator->getErrors()) === 0);
-    }
-
-
     public function casesDataProvider(): \Generator
     {
         $testDir = __DIR__ . '/../vendor/json-schema/json-schema-test-suite/tests';
         $drafts = array_filter(glob($testDir . '/*'), static function (string $filename) {
             return is_dir($filename);
         });
-        $skippedDrafts = ['draft3', 'draft6', 'draft7', 'draft2019-09', 'draft2020-12', 'draft-next', 'latest'];
+        $skippedDrafts = ['draft6', 'draft7', 'draft2019-09', 'draft2020-12', 'draft-next', 'latest'];
 
         foreach ($drafts as $draft) {
             if (in_array(basename($draft), $skippedDrafts, true)) {
@@ -85,7 +69,7 @@ function ($file) {
                             $file->getBasename(),
                             $testCase->description,
                             $test->description,
-                            $test->valid ? 'valid' : 'invalid',
+                            $test->valid ? 'valid' : 'invalid'
                         );
 
                         yield $name => [