Enable schema validation for the test suite

erayd · erayd · commit d113909802ea · 2017-02-23T02:59:50.000+13:00
diff --git a/tests/Constraints/AdditionalPropertiesTest.php b/tests/Constraints/AdditionalPropertiesTest.php
@@ -11,6 +11,8 @@
 
 class AdditionalPropertiesTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/ArraysTest.php b/tests/Constraints/ArraysTest.php
@@ -11,6 +11,8 @@
 
 class ArraysTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/BasicTypesTest.php b/tests/Constraints/BasicTypesTest.php
@@ -11,6 +11,9 @@
 
 class BasicTypesTest extends BaseTestCase
 {
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/CoerciveTest.php b/tests/Constraints/CoerciveTest.php
@@ -17,6 +17,9 @@
 
 class CoerciveTest extends BasicTypesTest
 {
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = true;
+
     /**
      * @dataProvider getValidCoerceTests
      */
diff --git a/tests/Constraints/DependenciesTest.php b/tests/Constraints/DependenciesTest.php
@@ -11,6 +11,9 @@
 
 class DependenciesTest extends BaseTestCase
 {
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/DisallowTest.php b/tests/Constraints/DisallowTest.php
@@ -11,6 +11,14 @@
 
 class DisallowTest extends BaseTestCase
 {
+    // schemas in these tests look like draft-03, but the 'disallow' patterns provided are in
+    // violation of the spec - 'disallow' as defined in draft-03 accepts the same values as the
+    // 'type' option, and cannot take arbitrary patterns. The implementation in this library is
+    // probably deliberate, but noting that it's invalid, schema validation has been disabled
+    // for these tests. The 'disallow' option was removed permanently in draft-04.
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = false;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/DivisibleByTest.php b/tests/Constraints/DivisibleByTest.php
@@ -11,6 +11,8 @@
 
 class DivisibleByTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/EnumTest.php b/tests/Constraints/EnumTest.php
@@ -11,6 +11,9 @@
 
 class EnumTest extends BaseTestCase
 {
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/ExtendsTest.php b/tests/Constraints/ExtendsTest.php
@@ -11,6 +11,9 @@
 
 class ExtendsTest extends BaseTestCase
 {
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/FormatTest.php b/tests/Constraints/FormatTest.php
@@ -13,6 +13,8 @@
 
 class FormatTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function setUp()
     {
         date_default_timezone_set('UTC');
diff --git a/tests/Constraints/LongArraysTest.php b/tests/Constraints/LongArraysTest.php
@@ -15,6 +15,8 @@
 
 class LongArraysTest extends VeryBaseTestCase
 {
+    protected $validateSchema = true;
+
     public function testLongStringArray()
     {
         $schema =
diff --git a/tests/Constraints/MinItemsMaxItemsTest.php b/tests/Constraints/MinItemsMaxItemsTest.php
@@ -11,6 +11,8 @@
 
 class MinItemsMaxItemsTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/MinLengthMaxLengthMultiByteTest.php b/tests/Constraints/MinLengthMaxLengthMultiByteTest.php
@@ -11,6 +11,8 @@
 
 class MinLengthMaxLengthMultiByteTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     protected function setUp()
     {
         if (!extension_loaded('mbstring')) {
diff --git a/tests/Constraints/MinLengthMaxLengthTest.php b/tests/Constraints/MinLengthMaxLengthTest.php
@@ -11,6 +11,8 @@
 
 class MinLengthMaxLengthTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/MinMaxPropertiesTest.php b/tests/Constraints/MinMaxPropertiesTest.php
@@ -11,6 +11,8 @@
 
 class MinMaxPropertiesTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     /**
      * {@inheritdoc}
      */
diff --git a/tests/Constraints/MinimumMaximumTest.php b/tests/Constraints/MinimumMaximumTest.php
@@ -11,6 +11,8 @@
 
 class MinimumMaximumTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/NotTest.php b/tests/Constraints/NotTest.php
@@ -11,6 +11,8 @@
 
 class NotTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/NumberAndIntegerTypesTest.php b/tests/Constraints/NumberAndIntegerTypesTest.php
@@ -11,6 +11,8 @@
 
 class NumberAndIntegerTypesTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/OfPropertiesTest.php b/tests/Constraints/OfPropertiesTest.php
@@ -13,6 +13,8 @@
  */
 class OfPropertiesTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/Constraints/PatternPropertiesTest.php b/tests/Constraints/PatternPropertiesTest.php
@@ -11,6 +11,8 @@
 
 class PatternPropertiesTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/PatternTest.php b/tests/Constraints/PatternTest.php
@@ -11,6 +11,8 @@
 
 class PatternTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/PointerTest.php b/tests/Constraints/PointerTest.php
@@ -13,6 +13,8 @@
 
 class PointerTest extends \PHPUnit_Framework_TestCase
 {
+    protected $validateSchema = true;
+
     public function testVariousPointers()
     {
         $schema = array(
diff --git a/tests/Constraints/ReadOnlyTest.php b/tests/Constraints/ReadOnlyTest.php
@@ -11,6 +11,8 @@
 
 class ReadOnlyTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         //is readonly really required?
diff --git a/tests/Constraints/RequireTest.php b/tests/Constraints/RequireTest.php
@@ -11,6 +11,8 @@
 
 class RequireTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/RequiredPropertyTest.php b/tests/Constraints/RequiredPropertyTest.php
@@ -14,6 +14,12 @@
 
 class RequiredPropertyTest extends BaseTestCase
 {
+    // Most tests are draft-03 compliant, but some tests are draft-04, or mix draft-03 and
+    // draft-04 syntax within the same schema. Unfortunately, draft-03 and draft-04 required
+    // definitions are incompatible, so disabling schema validation for these tests.
+    protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';
+    protected $validateSchema = false;
+
     public function testErrorPropertyIsPopulatedForRequiredIfMissingInInput()
     {
         $validator = new UndefinedConstraint();
diff --git a/tests/Constraints/SelfDefinedSchemaTest.php b/tests/Constraints/SelfDefinedSchemaTest.php
@@ -13,12 +13,15 @@
 
 class SelfDefinedSchemaTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
             array(
                 '{
                     "$schema": {
+                        "$schema": "http://json-schema.org/draft-04/schema#",
                         "properties": {
                             "name": {
                                 "type": "string"
@@ -44,6 +47,7 @@ public function getValidTests()
             array(
                 '{
                     "$schema": {
+                        "$schema": "http://json-schema.org/draft-04/schema#",
                         "properties": {
                             "name": {
                                 "type": "string"
diff --git a/tests/Constraints/TupleTypingTest.php b/tests/Constraints/TupleTypingTest.php
@@ -11,6 +11,8 @@
 
 class TupleTypingTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/UnionTypesTest.php b/tests/Constraints/UnionTypesTest.php
@@ -11,6 +11,8 @@
 
 class UnionTypesTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/UnionWithNullValueTest.php b/tests/Constraints/UnionWithNullValueTest.php
@@ -11,6 +11,8 @@
 
 class UnionWithNullValueTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/UniqueItemsTest.php b/tests/Constraints/UniqueItemsTest.php
@@ -11,6 +11,8 @@
 
 class UniqueItemsTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(
diff --git a/tests/Constraints/WrongMessagesFailingTestCaseTest.php b/tests/Constraints/WrongMessagesFailingTestCaseTest.php
@@ -11,6 +11,8 @@
 
 class WrongMessagesFailingTestCaseTest extends BaseTestCase
 {
+    protected $validateSchema = true;
+
     public function getInvalidTests()
     {
         return array(

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`class AdditionalPropertiesTest extends BaseTestCase`
`13`	`13`	`{`
	`14`	`+ protected $validateSchema = true;`
	`15`	`+`
`14`	`16`	`public function getInvalidTests()`
`15`	`17`	`{`
`16`	`18`	`return array(`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`
`12`	`12`	`class BasicTypesTest extends BaseTestCase`
`13`	`13`	`{`
	`14`	`+ protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';`
	`15`	`+ protected $validateSchema = true;`
	`16`	`+`
`14`	`17`	`public function getInvalidTests()`
`15`	`18`	`{`
`16`	`19`	`return array(`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@`
`17`	`17`
`18`	`18`	`class CoerciveTest extends BasicTypesTest`
`19`	`19`	`{`
	`20`	`+ protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';`
	`21`	`+ protected $validateSchema = true;`
	`22`	`+`
`20`	`23`	`/**`
`21`	`24`	`* @dataProvider getValidCoerceTests`
`22`	`25`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,14 @@`
`11`	`11`
`12`	`12`	`class DisallowTest extends BaseTestCase`
`13`	`13`	`{`
	`14`	`+ // schemas in these tests look like draft-03, but the 'disallow' patterns provided are in`
	`15`	`+ // violation of the spec - 'disallow' as defined in draft-03 accepts the same values as the`
	`16`	`+ // 'type' option, and cannot take arbitrary patterns. The implementation in this library is`
	`17`	`+ // probably deliberate, but noting that it's invalid, schema validation has been disabled`
	`18`	`+ // for these tests. The 'disallow' option was removed permanently in draft-04.`
	`19`	`+ protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';`
	`20`	`+ protected $validateSchema = false;`
	`21`	`+`
`14`	`22`	`public function getInvalidTests()`
`15`	`23`	`{`
`16`	`24`	`return array(`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`class FormatTest extends BaseTestCase`
`15`	`15`	`{`
	`16`	`+ protected $validateSchema = true;`
	`17`	`+`
`16`	`18`	`public function setUp()`
`17`	`19`	`{`
`18`	`20`	`date_default_timezone_set('UTC');`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`class LongArraysTest extends VeryBaseTestCase`
`17`	`17`	`{`
	`18`	`+ protected $validateSchema = true;`
	`19`	`+`
`18`	`20`	`public function testLongStringArray()`
`19`	`21`	`{`
`20`	`22`	`$schema =`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,12 @@`
`14`	`14`
`15`	`15`	`class RequiredPropertyTest extends BaseTestCase`
`16`	`16`	`{`
	`17`	`+ // Most tests are draft-03 compliant, but some tests are draft-04, or mix draft-03 and`
	`18`	`+ // draft-04 syntax within the same schema. Unfortunately, draft-03 and draft-04 required`
	`19`	`+ // definitions are incompatible, so disabling schema validation for these tests.`
	`20`	`+ protected $schemaSpec = 'http://json-schema.org/draft-03/schema#';`
	`21`	`+ protected $validateSchema = false;`
	`22`	`+`
`17`	`23`	`public function testErrorPropertyIsPopulatedForRequiredIfMissingInInput()`
`18`	`24`	`{`
`19`	`25`	`$validator = new UndefinedConstraint();`