Added test for bugfix

danrevah · Feb 20, 2015 · 4413aca · 4413aca
1 parent 234a9e1
commit 4413aca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/Matcher/ArgumentMatcher.php b/src/Matcher/ArgumentMatcher.php
@@ -43,10 +43,8 @@ protected static function checkMatchingArguments($returnValues, $arguments)
                     if ($hamcrest[$index] instanceof Matcher) {
                         assertThat($arg, $hamcrest[$index]);
 
-                    } else {
-                        if ($arg != $hamcrest[$index]) {
-                            throw new AssertionError();
-                        }
+                    } else if ($arg != $hamcrest[$index]) {
+                        throw new AssertionError();
                     }
 
                 }

diff --git a/tests/ShortifyPunitTest.php b/tests/ShortifyPunitTest.php
@@ -387,4 +387,19 @@ public function testSpies()
         // after chaning methods in chain with same arguments are instanceof `MockClassOnTheFly`
         $this->assertInstanceOf('ShortifyPunit\Mock\MockClassOnTheFly', $spy->second_method());
     }
+
+    /**
+     * Hamcrest API with normal parameters caused problems
+     * Bug Fix in - v1.0.6
+     */
+    public function testHamcrestWithNormalParam()
+    {
+        $mock = ShortifyPunit::mock('SimpleClassForMocking');
+
+        ShortifyPunit::when($mock)->first_method(anything(), 'a')->returns(1);
+        ShortifyPunit::when($mock)->first_method(anything(), 'b')->returns(2);
+
+        $this->assertEquals($mock->first_method('anything...', 'a'), 1);
+        $this->assertEquals($mock->first_method('anything...', 'b'), 2);
+    }
 }