Starting to add error message testing to PHPUnit tests

Author: Justin Rainbow

JsonSchema.php

@@ -317,7 +317,7 @@ static function checkType($type, &$value, $path) {
       	return array(
       	  array(
       	    'property'=>$path,
-      	    'message'=>gettype($value)." value found, but a ".$type." is required "
+      	    'message'=>gettype($value)." value found, but a ".$type." is required"
       	  )
       	);
       }

tests/AdditionalPropertiesTest.php

@@ -18,6 +18,20 @@ public function getInvalidTests()
                   "additionalProperties": false
                 }'
             ),
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":"2"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  },
+                  "additionalProperties": false
+                }',
+                JsonSchema::CHECK_MODE_TYPE_CAST
+            ),
             array(
                 '{
                   "prop":"1",
@@ -30,6 +44,20 @@ public function getInvalidTests()
                   },
                   "additionalProperties": {"type":"string"}
                 }'
+            ),
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":2
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  },
+                  "additionalProperties": {"type":"string"}
+                }',
+                JsonSchema::CHECK_MODE_TYPE_CAST
             )
         );
     }
@@ -49,6 +77,19 @@ public function getValidTests()
                   }
                 }'
             ),
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":"2"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  }
+                }',
+                JsonSchema::CHECK_MODE_TYPE_CAST
+            ),
             array(
                 '{
                   "prop":"1",

tests/BaseTestCase.php

@@ -5,11 +5,17 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider getInvalidTests
      */
-    public function testInvalidCases($input, $schema, $errors = array())
+    public function testInvalidCases($input, $schema, $checkMode = null, $errors = array())
     {
+        if (null === $checkMode) {
+            $checkMode = JsonSchema::CHECK_MODE_NORMAL;
+        }
+        
+        JsonSchema::$checkMode = $checkMode;
+        
         $result = JsonSchema::validate(json_decode($input), json_decode($schema));
         if (array() !== $errors) {
-            $this->assertEquals($errors, $result->errors);
+            $this->assertEquals($errors, $result->errors, var_export($result, true));
         }
         $this->assertFalse($result->valid, var_export($result, true));
     }
@@ -22,7 +28,9 @@ public function testValidCases($input, $schema, $checkMode = null)
         if (null === $checkMode) {
             $checkMode = JsonSchema::CHECK_MODE_NORMAL;
         }
+        
         JsonSchema::$checkMode = $checkMode;
+        
         $result = JsonSchema::validate(json_decode($input), json_decode($schema));
         $this->assertTrue($result->valid, var_export($result, true));
     }

tests/PhpTypeCastModeTest.php

@@ -14,18 +14,14 @@ public function getInvalidTests()
                   "properties":{
                     "a":{"type":"number"}
                   }
-                }'
-            ),
-            array(
-                '{
-                  "a":"9"
                 }',
-                '{
-                  "type":"object",
-                  "properties":{
-                    "a":{"type":"number"}
-                  }
-                }'
+                null,
+                array(
+                    array(
+                        'property' => 'a',
+                        'message'  => 'string value found, but a number is required'
+                    )
+                )
             ),
             array(
                 '{
@@ -55,7 +51,19 @@ public function getValidTests()
                   }
                 }',
                 JsonSchema::CHECK_MODE_TYPE_CAST
-            )
+            ),
+            array(
+                '{
+                  "a":"9"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "a":{"type":"number"}
+                  }
+                }',
+                JsonSchema::CHECK_MODE_TYPE_CAST
+            ),
         );
     }
 }