test: correct test regression due to newly introduced tests

Author: DannyvdSluijs

tests/Drafts/Draft3Test.php

@@ -28,6 +28,16 @@ protected function getFilePaths(): array
         ];
     }
 
+    public function getInvalidTests(): array
+    {
+        $tests = parent::getInvalidTests();
+        unset(
+            $tests['ref.json / $ref prevents a sibling id from changing the base uri / $ref resolves to /definitions/base_foo, data does not validate']
+        );
+
+        return $tests;
+    }
+
     public function getInvalidForAssocTests(): array
     {
         $tests = parent::getInvalidForAssocTests();
@@ -39,6 +49,17 @@ public function getInvalidForAssocTests(): array
         return $tests;
     }
 
+    public function getValidTests(): array
+    {
+        $tests = parent::getValidTests();
+        unset(
+            $tests['ref.json / $ref prevents a sibling id from changing the base uri / $ref resolves to /definitions/base_foo, data validates'],
+            $tests['ref.json / naive replacement of $ref with its destination is not correct / match the enum exactly']
+        );
+
+        return $tests;
+    }
+
     public function getValidForAssocTests(): array
     {
         $tests = parent::getValidForAssocTests();

tests/Drafts/Draft4Test.php

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

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 => [