test: add more tests for the JsonGuard error conversion

RETFU · Nov 9, 2017 · 2c53c67 · 2c53c67
1 parent 7910dff
commit 2c53c67
Show file tree

Hide file tree

Showing 31 changed files with 597 additions and 32 deletions.
diff --git a/src/Error.php b/src/Error.php
@@ -17,6 +17,7 @@ class Error
     const DATA_VALIDATION_MAXITEMS = 'DATA_VALIDATION_MAXITEMS';
     const DATA_VALIDATION_UNIQUEITEMS = 'DATA_VALIDATION_UNIQUEITEMS';
     const DATA_VALIDATION_ONEOF = 'DATA_VALIDATION_ONEOF';
+    const DATA_VALIDATION_PATTERN = 'DATA_VALIDATION_PATTERN';
 
 
     /**

diff --git a/src/Validator/JsonValidator.php b/src/Validator/JsonValidator.php
@@ -6,7 +6,7 @@
 use League\JsonReference\Dereferencer;
 use RREST\Error;
 use RREST\Exception\InvalidJSONException;
-use RREST\Validator\Util\JsonGuardValidationError\Converter;
+use RREST\Validator\Util\JsonGuardValidationErrorConverter\Converter;
 
 class JsonValidator
 {
@@ -87,10 +87,8 @@ private function getJsonFromString($value)
     {
         $json = json_decode($value);
         if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new InvalidJSONException([new Error(
-                ucfirst(json_last_error_msg()),
-                Error::INVALID_JSON
-            )]);
+            $error = new Error(ucfirst(json_last_error_msg()), Error::INVALID_JSON);
+            throw new InvalidJSONException([$error]);
         }
 
         return $json;

diff --git a/...onGuardValidationError/AnyOfConverter.php → ...lidationErrorConverter/AnyOfConverter.php b/...onGuardValidationError/AnyOfConverter.php → ...lidationErrorConverter/AnyOfConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use League\JsonGuard\Constraint\DraftFour\Required;
 use RREST\Error;

diff --git a/...il/JsonGuardValidationError/Converter.php → ...ardValidationErrorConverter/Converter.php b/...il/JsonGuardValidationError/Converter.php → ...ardValidationErrorConverter/Converter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use League\JsonGuard\ValidationError;
 use RREST\Error;

diff --git a/...uardValidationError/ConverterAbstract.php → ...ationErrorConverter/ConverterAbstract.php b/...uardValidationError/ConverterAbstract.php → ...ationErrorConverter/ConverterAbstract.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use League\JsonGuard\ValidationError;
 

diff --git a/...ardValidationError/ConverterInterface.php → ...tionErrorConverter/ConverterInterface.php b/...ardValidationError/ConverterInterface.php → ...tionErrorConverter/ConverterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...sonGuardValidationError/EnumConverter.php → ...alidationErrorConverter/EnumConverter.php b/...sonGuardValidationError/EnumConverter.php → ...alidationErrorConverter/EnumConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...nGuardValidationError/FormatConverter.php → ...idationErrorConverter/FormatConverter.php b/...nGuardValidationError/FormatConverter.php → ...idationErrorConverter/FormatConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 
@@ -35,11 +35,8 @@ public function getErrors()
                 break;
             default:
                 $message = 'Invalid format';
+                break;
         }
-        return [new Error(
-            $message,
-            Error::DATA_VALIDATION_FORMAT,
-            $context
-        )];
+        return [new Error($message, Error::DATA_VALIDATION_FORMAT, $context)];
     }
 }
diff --git a/...uardValidationError/MaxItemsConverter.php → ...ationErrorConverter/MaxItemsConverter.php b/...uardValidationError/MaxItemsConverter.php → ...ationErrorConverter/MaxItemsConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...ardValidationError/MaxLengthConverter.php → ...tionErrorConverter/MaxLengthConverter.php b/...ardValidationError/MaxLengthConverter.php → ...tionErrorConverter/MaxLengthConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 
@@ -13,11 +13,11 @@ public function getErrors()
     {
         $context = new \stdClass;
         $context->field = $this->getFieldPath($this->validationError, '');
-        $context->minLength = $this->validationError->getParameter();
+        $context->maxLength = $this->validationError->getParameter();
         $context->currentValue = $this->validationError->getData();
         return [new Error(
             \sprintf('The field %s must be less than %s characters long', $context->field, $context->maxLength),
-            Error::DATA_VALIDATION_MINLENGTH,
+            Error::DATA_VALIDATION_MAXLENGTH,
             $context
         )];
     }

diff --git a/...uardValidationError/MinItemsConverter.php → ...ationErrorConverter/MinItemsConverter.php b/...uardValidationError/MinItemsConverter.php → ...ationErrorConverter/MinItemsConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...ardValidationError/MinLengthConverter.php → ...tionErrorConverter/MinLengthConverter.php b/...ardValidationError/MinLengthConverter.php → ...tionErrorConverter/MinLengthConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...onGuardValidationError/OneOfConverter.php → ...lidationErrorConverter/OneOfConverter.php b/...onGuardValidationError/OneOfConverter.php → ...lidationErrorConverter/OneOfConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...GuardValidationError/PatternConverter.php → ...dationErrorConverter/PatternConverter.php b/...GuardValidationError/PatternConverter.php → ...dationErrorConverter/PatternConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 
@@ -17,7 +17,7 @@ public function getErrors()
         $context->currentValues = $this->validationError->getData();
         return [new Error(
             \sprintf('The field %s must match the pattern %s', $context->field, $context->pattern),
-            Error::DATA_VALIDATION_UNIQUEITEMS,
+            Error::DATA_VALIDATION_PATTERN,
             $context
         )];
     }

diff --git a/...uardValidationError/RequiredConverter.php → ...ationErrorConverter/RequiredConverter.php b/...uardValidationError/RequiredConverter.php → ...ationErrorConverter/RequiredConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...sonGuardValidationError/TypeConverter.php → ...alidationErrorConverter/TypeConverter.php b/...sonGuardValidationError/TypeConverter.php → ...alidationErrorConverter/TypeConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/...dValidationError/UniqueItemsConverter.php → ...onErrorConverter/UniqueItemsConverter.php b/...dValidationError/UniqueItemsConverter.php → ...onErrorConverter/UniqueItemsConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RREST\Validator\Util\JsonGuardValidationError;
+namespace RREST\Validator\Util\JsonGuardValidationErrorConverter;
 
 use RREST\Error;
 

diff --git a/tests/units/Validator/JsonValidator.php b/tests/units/Validator/JsonValidator.php
@@ -2,19 +2,32 @@
 
 namespace RREST\tests\units\Validator;
 
-require_once __DIR__.'/../boostrap.php';
+require_once __DIR__ . '/../boostrap.php';
 
 use atoum;
 
 class JsonValidator extends atoum
 {
     public function testFails()
     {
-        $jsonValidator= new JsonValidator('{}', '{}');
-
         $this
-            ->given($jsonValidator)
+            ->given($this->newTestedInstance('{}', '{}  '))
             ->boolean($this->testedInstance->fails())
             ->isFalse();
+
+        $schema = file_get_contents(__DIR__ . '/../../fixture/song.json');
+        $this
+            ->given($this->newTestedInstance('{}', $schema))
+            ->boolean($this->testedInstance->fails())
+            ->isTrue();
+
+
+        $this
+            ->exception(
+                function () {
+                    $this->newTestedInstance('}', '}')->fails();
+                }
+            )
+            ->isInstanceOf('\RREST\Exception\InvalidJSONException');
     }
 }
diff --git a/tests/units/Validator/Util/JsonGuardValidationErrorConverter/AnyOfConverter.php b/tests/units/Validator/Util/JsonGuardValidationErrorConverter/AnyOfConverter.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace RREST\tests\units\Validator\Util\JsonGuardValidationErrorConverter;
+
+require_once __DIR__ . '/../../../boostrap.php';
+
+use atoum;
+use League\JsonGuard\Validator;
+use RREST\Error;
+
+class AnyOfConverter extends atoum
+{
+    public function testGetErrors()
+    {
+        $json = json_decode('{"x":5}');
+        $schema = json_decode('{
+          "$schema": "http://json-schema.org/schema",
+          "type": "object",
+          "properties": {
+            "artist": { "type": "string" }
+          },
+          "anyOf":[
+                {"required": ["artist"]},
+                {"required": ["toto"]}
+            ]
+        }');
+        $validator = new Validator($json, $schema);
+        $error = $validator->errors()[0];
+
+        $this
+            ->given($this->newTestedInstance($error))
+            ->array($this->testedInstance->getErrors())
+            ->hasSize(1)
+            ->values
+            ->object[0]->isInstanceOf('\RREST\Error')
+            ->string($this->testedInstance->getErrors()[0]->code)->isEqualTo(Error::DATA_VALIDATION_REQUIRED_ANYOF);
+    }
+}
diff --git a/tests/units/Validator/Util/JsonGuardValidationErrorConverter/Converter.php b/tests/units/Validator/Util/JsonGuardValidationErrorConverter/Converter.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace RREST\tests\units\Validator\Util\JsonGuardValidationErrorConverter;
+
+require_once __DIR__ . '/../../../boostrap.php';
+
+use atoum;
+use League\JsonGuard\Constraint\DraftFour\Required;
+
+class Converter extends atoum
+{
+    public function testGetErrors()
+    {
+        $this
+            ->given($this->newTestedInstance(
+                new \League\JsonGuard\ValidationError('a','b','c','d','e','f','g')
+            ))
+            ->array($this->testedInstance->getErrors())
+            ->hasSize(1)
+            ->values
+            ->object[0]->isInstanceOf('\RREST\Error');
+
+        $this
+            ->given($this->newTestedInstance(
+                new \League\JsonGuard\ValidationError('a',Required::KEYWORD,'c',['d'],'e','f','g')
+            ))
+            ->array($this->testedInstance->getErrors())
+            ->hasSize(1)
+        ;
+    }
+}
diff --git a/tests/units/Validator/Util/JsonGuardValidationErrorConverter/EnumConverter.php b/tests/units/Validator/Util/JsonGuardValidationErrorConverter/EnumConverter.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace RREST\tests\units\Validator\Util\JsonGuardValidationErrorConverter;
+
+require_once __DIR__ . '/../../../boostrap.php';
+
+use atoum;
+use League\JsonGuard\Validator;
+use RREST\Error;
+
+class EnumConverter extends atoum
+{
+    public function testGetErrors()
+    {
+        $json = json_decode('{"artist":"c"}');
+        $schema = json_decode('{
+          "$schema": "http://json-schema.org/schema",
+          "type": "object",
+          "properties": {
+            "artist": { "type": "string", "enum": ["a","b"] }
+          },
+          "required": [ "artist" ]
+        }');
+        $validator = new Validator($json, $schema);
+        $error = $validator->errors()[0];
+
+        $this
+            ->given($this->newTestedInstance($error))
+            ->array($this->testedInstance->getErrors())
+            ->hasSize(1)
+            ->values
+            ->object[0]->isInstanceOf('\RREST\Error')
+            ->string($this->testedInstance->getErrors()[0]->code)->isEqualTo(Error::DATA_VALIDATION_ENUM);
+    }
+}