Tweaked tests for assoc array tests

jsonrainbow · Jun 28, 2016 · d3115a4 · d3115a4
1 parent efc9124
commit d3115a4
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 12 deletions.
diff --git a/tests/Constraints/AdditionalPropertiesTest.php b/tests/Constraints/AdditionalPropertiesTest.php
@@ -9,8 +9,6 @@
 
 namespace JsonSchema\Tests\Constraints;
 
-use JsonSchema\Validator;
-
 class AdditionalPropertiesTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -52,8 +50,7 @@ public function getInvalidTests()
                     "prop":{"type":"string"}
                   },
                   "additionalProperties": false
-                }',
-                Validator::CHECK_MODE_TYPE_CAST
+                }'
             ),
             array(
                 '{
@@ -79,8 +76,7 @@ public function getInvalidTests()
                     "prop":{"type":"string"}
                   },
                   "additionalProperties": {"type":"string"}
-                }',
-                Validator::CHECK_MODE_TYPE_CAST
+                }'
             ),
             array(
                 '{
@@ -132,8 +128,7 @@ public function getValidTests()
                   "properties":{
                     "prop":{"type":"string"}
                   }
-                }',
-                Validator::CHECK_MODE_TYPE_CAST
+                }'
             ),
             array(
                 '{

diff --git a/tests/Constraints/OfPropertiesTest.php b/tests/Constraints/OfPropertiesTest.php
@@ -7,8 +7,6 @@
  */
 namespace JsonSchema\Tests\Constraints;
 
-use JsonSchema\Validator;
-
 /**
  * Class OfPropertiesTest
  */
@@ -71,7 +69,7 @@ public function getInvalidTests()
                   },
                   "required": ["prop1"]
                 }',
-                Validator::CHECK_MODE_NORMAL,
+                null,
                 array(
                     array(
                         "property"   => "prop2",

diff --git a/tests/Constraints/RequiredPropertyTest.php b/tests/Constraints/RequiredPropertyTest.php
@@ -9,6 +9,7 @@
 
 namespace JsonSchema\Tests\Constraints;
 
+use JsonSchema\Constraints\Constraint;
 use JsonSchema\Constraints\UndefinedConstraint;
 
 class RequiredPropertyTest extends BaseTestCase
@@ -229,7 +230,8 @@ public function getInvalidTests()
                   "properties": {
                     "array":{"type":"array", "required": true}
                   }
-                }'
+                }',
+                Constraint::CHECK_MODE_NORMAL
             ),
             array(
                 '{

diff --git a/tests/Drafts/Draft3Test.php b/tests/Drafts/Draft3Test.php
@@ -8,6 +8,7 @@
  */
 
 namespace JsonSchema\Tests\Drafts;
+use JsonSchema\Constraints\Constraint;
 
 /**
  * @package JsonSchema\Tests\Drafts
@@ -25,6 +26,28 @@ protected function getFilePaths()
         );
     }
 
+    public function getInvalidForAssocTests()
+    {
+        $tests = parent::getInvalidForAssocTests();
+        unset(
+            $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 getValidForAssocTests()
+    {
+        $tests = parent::getValidForAssocTests();
+        unset(
+            $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;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/tests/Drafts/Draft4Test.php b/tests/Drafts/Draft4Test.php
@@ -25,6 +25,28 @@ protected function getFilePaths()
         );
     }
 
+    public function getInvalidForAssocTests()
+    {
+        $tests = parent::getInvalidForAssocTests();
+        unset(
+            $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 getValidForAssocTests()
+    {
+        $tests = parent::getValidForAssocTests();
+        unset(
+            $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;
+    }
+
     /**
      * {@inheritdoc}
      */