Added Tests for array assoc json decode

Author: boekkooi-fresh

tests/Constraints/BaseTestCase.php

@@ -9,6 +9,7 @@
 
 namespace JsonSchema\Tests\Constraints;
 
+use JsonSchema\Constraints\Constraint;
 use JsonSchema\RefResolver;
 use JsonSchema\Uri\UriResolver;
 use JsonSchema\Validator;
@@ -28,8 +29,10 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider getInvalidTests
      */
-    public function testInvalidCases($input, $jsonSchema, $checkMode = Validator::CHECK_MODE_NORMAL, $errors = array())
+    public function testInvalidCases($input, $jsonSchema, $checkMode = Constraint::CHECK_MODE_NORMAL, $errors = array())
     {
+        $checkMode = $checkMode === null ? Constraint::CHECK_MODE_NORMAL : $checkMode;
+
         $schema = json_decode($jsonSchema);
         if (is_object($schema)) {
             $schema = $this->resolveSchema($schema);
@@ -46,10 +49,36 @@ public function testInvalidCases($input, $jsonSchema, $checkMode = Validator::CH
         $this->assertFalse($validator->isValid(), print_r($validator->getErrors(), true));
     }
 
+    /**
+     * @dataProvider getInvalidForAssocTests
+     */
+    public function testInvalidCasesUsingAssoc($input, $jsonSchema, $checkMode = Constraint::CHECK_MODE_TYPE_CAST, $errors = array())
+    {
+        $checkMode = $checkMode === null ? Constraint::CHECK_MODE_TYPE_CAST : $checkMode;
+        if ($checkMode !== Constraint::CHECK_MODE_TYPE_CAST) {
+            $this->markTestSkipped('Test indicates that it is not for "CHECK_MODE_TYPE_CAST"');
+        }
+
+        $schema = json_decode($jsonSchema);
+        if (is_object($schema)) {
+            $schema = $this->resolveSchema($schema);
+        }
+
+        $value = json_decode($input, true);
+
+        $validator = new Validator($checkMode);
+        $validator->check($value, $schema);
+
+        if (array() !== $errors) {
+            $this->assertEquals($errors, $validator->getErrors(), print_r($validator->getErrors(), true));
+        }
+        $this->assertFalse($validator->isValid(), print_r($validator->getErrors(), true));
+    }
+
     /**
      * @dataProvider getValidTests
      */
-    public function testValidCases($input, $schema, $checkMode = Validator::CHECK_MODE_NORMAL)
+    public function testValidCases($input, $schema, $checkMode = Constraint::CHECK_MODE_NORMAL)
     {
         $schema = json_decode($schema);
         if (is_object($schema)) {
@@ -63,16 +92,53 @@ public function testValidCases($input, $schema, $checkMode = Validator::CHECK_MO
         $this->assertTrue($validator->isValid(), print_r($validator->getErrors(), true));
     }
 
+    /**
+     * @dataProvider getValidForAssocTests
+     */
+    public function testValidCasesUsingAssoc($input, $schema, $checkMode = Constraint::CHECK_MODE_TYPE_CAST)
+    {
+        if ($checkMode !== Constraint::CHECK_MODE_TYPE_CAST) {
+            $this->markTestSkipped('Test indicates that it is not for "CHECK_MODE_TYPE_CAST"');
+        }
+
+        $schema = json_decode($schema);
+        if (is_object($schema)) {
+            $schema = $this->resolveSchema($schema);
+        }
+
+        $value = json_decode($input, true);
+        $validator = new Validator($checkMode);
+
+        $validator->check($value, $schema);
+        $this->assertTrue($validator->isValid(), print_r($validator->getErrors(), true));
+    }
+
     /**
      * @return array[]
      */
     abstract public function getValidTests();
 
+    /**
+     * @return array[]
+     */
+    public function getValidForAssocTests()
+    {
+        return $this->getValidTests();
+    }
+
     /**
      * @return array[]
      */
     abstract public function getInvalidTests();
 
+    /**
+     * @return array[]
+     */
+    public function getInvalidForAssocTests()
+    {
+        return $this->getInvalidTests();
+    }
+
     /**
      * @param object $schema
      * @return object

tests/Drafts/BaseDraftTestCase.php

@@ -21,17 +21,19 @@ private function setUpTests($isValid)
         foreach ($filePaths as $path) {
             foreach (glob($path . '/*.json') as $file) {
                 $filename = basename($file);
-                if (!in_array($filename, $skippedTests)) {
-                    $suites = json_decode(file_get_contents($file));
-                    foreach ($suites as $suite) {
-                        $suiteDescription = $suite->description;
-                        foreach ($suite->tests as $test) {
-                            $testCaseDescription = $test->description;
-                            if ($isValid === $test->valid) {
-                                $tests[
-                                    $this->createDataSetPath($filename, $suiteDescription, $testCaseDescription)
-                                ] = array(json_encode($test->data), json_encode($suite->schema));
-                            }
+                if (in_array($filename, $skippedTests)) {
+                    continue;
+                }
+
+                $suites = json_decode(file_get_contents($file));
+                foreach ($suites as $suite) {
+                    $suiteDescription = $suite->description;
+                    foreach ($suite->tests as $test) {
+                        $testCaseDescription = $test->description;
+                        if ($isValid === $test->valid) {
+                            $tests[
+                                $this->createDataSetPath($filename, $suiteDescription, $testCaseDescription)
+                            ] = array(json_encode($test->data), json_encode($suite->schema));
                         }
                     }
                 }