Merge pull request #1 from norzechowicz/dev

Matcher test

Author: defrag

src/JsonMatcher/Matcher/ChainMatcher.php

@@ -22,12 +22,14 @@ public function addMatcher(PropertyMatcher $matcher)
     public function match($value, $pattern)
     {
         foreach ($this->matchers as $propertyMatcher) {
-            if (false === $propertyMatcher->match($value, $pattern)) {
-                return false;
+            if ($propertyMatcher->canMatch($pattern)) {
+                if (true === $propertyMatcher->match($value, $pattern)) {
+                    return true;
+                }
             }
         }
 
-        return true;
+        return false;
     }
 
     public function canMatch($pattern)

src/JsonMatcher/Matcher/TypeMatcher.php

@@ -15,7 +15,7 @@ public function match($value, $pattern)
 
     public function canMatch($pattern)
     {
-        return 0 !== preg_match("/^@(string|integer|boolean|double)@$/", $pattern);
+        return is_string($pattern) && 0 !== preg_match("/^@(string|integer|boolean|double)@$/", $pattern);
     }
 
     private function extractType($pattern)

tests/JsonMatcher/MatcherTest.php

@@ -1,10 +1,85 @@
 <?php
 namespace JsonMatcher\Tests;
 
+use JsonMatcher\Matcher\ArrayMatcher;
+use JsonMatcher\Matcher\ChainMatcher;
+use JsonMatcher\Matcher\ScalarMatcher;
+use JsonMatcher\Matcher\TypeMatcher;
+use JsonMatcher\Matcher\WildcardMatcher;
+use JsonMatcher\Matcher;
+
 class MatcherTest extends \PHPUnit_Framework_TestCase
 {
-    public function test_foo()
+    protected $matcher;
+
+    protected $arrayValue;
+
+    public function setUp()
+    {
+        $scalarMatchers = new ChainMatcher(array(
+            new TypeMatcher(),
+            new ScalarMatcher(),
+            new WildcardMatcher()
+        ));
+        $this->matcher = new Matcher(new ChainMatcher(array(
+            $scalarMatchers,
+            new ArrayMatcher($scalarMatchers)
+        )));
+
+        $this->arrayValue = array(
+            'users' => array(
+                array(
+                    'id' => 1,
+                    'firstName' => 'Norbert',
+                    'lastName' => 'Orzechowicz',
+                    'enabled' => true
+                ),
+                array(
+                    'id' => 2,
+                    'firstName' => 'Michał',
+                    'lastName' => 'Dąbrowski',
+                    'enabled' => true,
+                )
+            ),
+            'readyToUse' => true,
+            'data' => new \stdClass(),
+        );
+    }
+
+    public function test_matcher_with_array_value()
+    {
+        $this->assertTrue($this->matcher->match(
+            $this->arrayValue,
+            array(
+                'users' => array(
+                    array(
+                        'id' => '@integer@',
+                        'firstName' => '@string@',
+                        'lastName' => 'Orzechowicz',
+                        'enabled' => '@boolean@'
+                    ),
+                    array(
+                        'id' => '@integer@',
+                        'firstName' => '@string@',
+                        'lastName' => 'Dąbrowski',
+                        'enabled' => '@boolean@',
+                    )
+                ),
+                'readyToUse' => true,
+                'data' => '*',
+            )
+        ));
+    }
+
+    public function test_matcher_with_scalar_values()
     {
-        $this->assertTrue(true);
+        $this->assertTrue($this->matcher->match(
+            'Norbert Orzechowicz',
+            '@string@'
+        ));
+        $this->assertTrue($this->matcher->match(
+            6.66,
+            '@double@'
+        ));
     }
 }

tests/JsonMatcher/TypeMatcherTest.php

@@ -15,6 +15,7 @@ public function test_can_match()
         $this->assertFalse($matcher->canMatch("qweqwe"));
         $this->assertFalse($matcher->canMatch(1));
         $this->assertFalse($matcher->canMatch("@string"));
+        $this->assertFalse($matcher->canMatch(new \stdClass()));
     }
 
     public function test_type_match()