Alter tests so that we actually resolve references

Author: Andy Raines

tests/JsonSchema/Tests/Constraints/BaseTestCase.php

@@ -9,6 +9,8 @@
 
 namespace JsonSchema\Tests\Constraints;
 
+use JsonSchema\RefResolver;
+use JsonSchema\Uri\UriRetriever;
 use JsonSchema\Validator;
 
 abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
@@ -18,9 +20,14 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidCases($input, $schema, $checkMode = Validator::CHECK_MODE_NORMAL, $errors = array())
     {
+        $schema = json_decode($schema);
+
+        $refResolver = new RefResolver(new UriRetriever);
+        $refResolver->resolve($schema);
+
         $validator = new Validator($checkMode);
 
-        $validator->check(json_decode($input), json_decode($schema));
+        $validator->check(json_decode($input), $schema);
 
         if (array() !== $errors) {
             $this->assertEquals($errors, $validator->getErrors(), print_r($validator->getErrors(),true));
@@ -33,13 +40,18 @@ public function testInvalidCases($input, $schema, $checkMode = Validator::CHECK_
      */
     public function testValidCases($input, $schema, $checkMode = Validator::CHECK_MODE_NORMAL)
     {
+        $schema = json_decode($schema);
+
+        $refResolver = new RefResolver(new UriRetriever);
+        $refResolver->resolve($schema);
+
         $validator = new Validator($checkMode);
 
-        $validator->check(json_decode($input), json_decode($schema));
+        $validator->check(json_decode($input), $schema);
         $this->assertTrue($validator->isValid(), print_r($validator->getErrors(), true));
     }
 
     abstract public function getValidTests();
 
     abstract public function getInvalidTests();
-}
+}

tests/JsonSchema/Tests/Drafts/Draft4Test.php

@@ -18,12 +18,12 @@ protected function getSkippedTests()
             // Not Yet Implemented
             'definitions.json',
             // Partially Implemented
-            'ref.json',
+            //'ref.json',
             'refRemote.json',
             // Optional
             'bignum.json',
             'zeroTerminatedFloats.json'
         );
     }
 
-}
+}