Add Tests from json-schema/JSON-Schema-Test-Suite GitHub Project

composer.json

@@ -23,8 +23,21 @@
             "email": "[email protected]"
         }
     ],
+    "repositories": [{
+        "type": "package",
+        "package": {
+            "name": "json-schema/JSON-Schema-Test-Suite",
+            "version": "1.1.0",
+            "source": {
+                "url": "https://github.com/json-schema/JSON-Schema-Test-Suite",
+                "type": "git",
+                "reference": "1.1.0"
+            }
+        }
+    }],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.3.0",
+        "json-schema/JSON-Schema-Test-Suite": "1.1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~3.7.0"

src/JsonSchema/Constraints/Format.php

@@ -92,6 +92,7 @@ public function check($element, $schema = null, $path = null, $i = null)
                 break;
 
             case 'ip-address':
+            case 'ipv4':
                 if (null === filter_var($element, FILTER_VALIDATE_IP, FILTER_NULL_ON_FAILURE | FILTER_FLAG_IPV4)) {
                     $this->addError($path, "Invalid IP address");
                 }
@@ -104,6 +105,7 @@ public function check($element, $schema = null, $path = null, $i = null)
                 break;
 
             case 'host-name':
+            case 'hostname':
                 if (!$this->validateHostname($element)) {
                     $this->addError($path, "Invalid hostname");
                 }

tests/JsonSchema/Tests/Drafts/BaseDraftTestCase.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace JsonSchema\Tests\Drafts;
+
+use JsonSchema\Tests\Constraints\BaseTestCase;
+
+abstract class BaseDraftTestCase extends BaseTestCase
+{
+    protected $relativeTestsRoot = '/../../../../vendor/json-schema/JSON-Schema-Test-Suite/tests';
+
+    private function setUpTests($isValid)
+    {
+        $filePaths = $this->getFilePaths();
+        $skippedTests = $this->getSkippedTests();
+        $tests = array();
+
+        foreach ($filePaths as $path) {
+            foreach (glob($path . '/*.json') as $file) {
+                if (!in_array(basename($file), $skippedTests)) {
+                    $suites = json_decode(file_get_contents($file));
+                    foreach ($suites as $suite) {
+                        foreach ($suite->tests as $test) {
+                            if ($isValid === $test->valid) {
+                                $tests[] = array(json_encode($test->data), json_encode($suite->schema));
+                           }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $tests;
+    }
+
+    public function getInvalidTests()
+    {
+        return $this->setUpTests(false);
+    }
+
+    public function getValidTests()
+    {
+        return $this->setUpTests(true);
+    }
+
+    protected abstract function getFilePaths();
+
+    protected abstract function getSkippedTests();
+}

tests/JsonSchema/Tests/Drafts/Draft3Test.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace JsonSchema\Tests\Drafts;
+
+class Draft3Test extends BaseDraftTestCase
+{
+    protected function getFilePaths()
+    {
+        return array(
+            realpath(__DIR__ . $this->relativeTestsRoot . '/draft3'),
+            realpath(__DIR__ . $this->relativeTestsRoot . '/draft3/optional')
+        );
+    }
+
+    protected function getSkippedTests()
+    {
+        return array(
+            'ref.json',
+            'refRemote.json',
+            'bignum.json',
+            'jsregex.json',
+            'zeroTerminatedFloats.json'
+        );
+    }
+}

tests/JsonSchema/Tests/Drafts/Draft4Test.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace JsonSchema\Tests\Drafts;
+
+class Draft4Test extends BaseDraftTestCase
+{
+    protected function getFilePaths()
+    {
+        return array(
+            realpath(__DIR__ . $this->relativeTestsRoot . '/draft4'),
+            realpath(__DIR__ . $this->relativeTestsRoot . '/draft4/optional')
+        );
+    }
+
+    protected function getSkippedTests()
+    {
+        return array(
+            // Not Yet Implemented
+            'allOf.json',
+            'anyOf.json',
+            'definitions.json',
+            'maxProperties.json',
+            'minProperties.json',
+            'multipleOf.json',
+            'not.json',
+            'oneOf.json',
+            // Partially Implemented
+            'ref.json',
+            'refRemote.json',
+            // Optional
+            'bignum.json',
+            'zeroTerminatedFloats.json'
+        );
+    }
+
+}