Merge pull request #38 from norzechowicz/json-normalizer

Expanded TRANSFORM_QUOTATION_PATTERN in Json matcher to handle new type matchers

Author: norberttech

src/Coduo/PHPMatcher/Matcher/JsonMatcher.php

@@ -4,7 +4,7 @@
 
 class JsonMatcher extends Matcher
 {
-    const TRANSFORM_QUOTATION_PATTERN = '/([^"])@(integer|string|array|double|wildcard|boolean|\.\.\.|null)@([^"])/';
+    const TRANSFORM_QUOTATION_PATTERN = '/([^"])@([a-zA-Z0-9\.]+)@([^"])/';
     const TRANSFORM_QUOTATION_REPLACEMENT = '$1"@$2@"$3';
 
     /**

tests/Coduo/PHPMatcher/Matcher/JsonMatcherTest.php

@@ -58,6 +58,14 @@ public function test_positive_matches($value, $pattern)
         $this->assertTrue($this->matcher->match($value, $pattern), $this->matcher->getError());
     }
 
+    /**
+     * @dataProvider normalizationRequiredDataProvider
+     */
+    public function test_positive_matches_after_normalization($value, $pattern)
+    {
+        $this->assertTrue($this->matcher->match($value, $pattern), $this->matcher->getError());
+    }
+
     /**
      * @dataProvider negativeMatches
      */
@@ -193,4 +201,34 @@ public static function negativeMatches()
             )
         );
     }
+
+    public static function normalizationRequiredDataProvider()
+    {
+        return array(
+            array(
+                '{"name": "Norbert"}',
+                '{"name": @string@}'
+            ),
+            array(
+                '{"name": 25}',
+                '{"name": @number@}'
+            ),
+            array(
+                '{"name": 25}',
+                '{"name": @integer@}'
+            ),
+            array(
+                '{"name": true}',
+                '{"name": @boolean@}'
+            ),
+            array(
+                '{"name": ["Norbert", "Michał"]}',
+                '{"name": ["Norbert", @...@]}'
+            ),
+            array(
+                '{"name": "Norbert", "roles": ["ADMIN", "USER"]}',
+                '{"name": @string@, "roles": [@string@, @string@]}'
+            ),
+        );
+    }
 }