Made some general improvements to exception message so they include m…

…ock name/class where relevant
mockery · May 27, 2010 · 70a3952 · 70a3952
1 parent e8f736d
commit 70a3952
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/library/Mockery/CountValidator/AtLeast.php b/library/Mockery/CountValidator/AtLeast.php
@@ -44,7 +44,9 @@ public function validate($n)
     {
         if ($this->_limit > $n) {
             throw new Exception(
-                'Method should be called'
+                'Method ' . (string) $this->_expectation
+                . ' from ' . $this->_expectation->getMock()->mockery_getName()
+                . ' should be called' . PHP_EOL
                 . ' at least ' . $this->_limit . ' times but called ' . $n
                 . ' times.'
             );

diff --git a/library/Mockery/CountValidator/AtMost.php b/library/Mockery/CountValidator/AtMost.php
@@ -33,7 +33,9 @@ public function validate($n)
     {
         if ($this->_limit < $n) {
             throw new Exception(
-                'Method should be called'
+                'Method ' . (string) $this->_expectation
+                . ' from ' . $this->_expectation->getMock()->mockery_getName()
+                . ' should be called' . PHP_EOL
                 . ' at most ' . $this->_limit . ' times but called ' . $n
                 . ' times.'
             );

diff --git a/library/Mockery/CountValidator/Exact.php b/library/Mockery/CountValidator/Exact.php
@@ -33,7 +33,9 @@ public function validate($n)
     {
         if ($this->_limit !== $n) {
             throw new Exception(
-                'Method should be called'
+                'Method ' . (string) $this->_expectation
+                . ' from ' . $this->_expectation->getMock()->mockery_getName()
+                . ' should be called' . PHP_EOL
                 . ' exactly ' . $this->_limit . ' times but called ' . $n
                 . ' times.'
             );

diff --git a/library/Mockery/Generator.php b/library/Mockery/Generator.php
@@ -310,7 +310,7 @@ public function __call(\$method, array \$args)
             return \$return;
         }
         throw new \BadMethodCallException(
-            'Method ' . \$this->_mockery_name . '::' . \$method . ' does not exist on this mock object'
+            'Method ' . \$this->_mockery_name . '::' . \$method . '() does not exist on this mock object'
         );
     }
 
@@ -359,7 +359,8 @@ public function mockery_validateOrder(\$method, \$order)
     {
         if (\$order < \$this->_mockery_currentOrder) {
             throw new \Mockery\Exception(
-                'Method ' . \$method . ' called out of order: expected order '
+                'Method ' . \$this->_mockery_name . '::' . \$method . '()'
+                . ' called out of order: expected order '
                 . \$order . ', was ' . \$this->_mockery_currentOrder
             );
         }

diff --git a/library/Mockery/Mock.php b/library/Mockery/Mock.php
@@ -212,7 +212,7 @@ public function __call($method, array $args)
             return $return;
         }
         throw new \BadMethodCallException(
-            'Method ' . $this->_mockery_name . '::' . $method . ' does not exist on this mock object'
+            'Method ' . $this->_mockery_name . '::' . $method . '() does not exist on this mock object'
         );
     }
 
@@ -306,7 +306,8 @@ public function mockery_validateOrder($method, $order)
     {
         if ($order < $this->_mockery_currentOrder) {
             throw new \Mockery\Exception(
-                'Method ' . $method . ' called out of order: expected order '
+                'Method ' . $this->_mockery_name . '::' . $method . '()'
+                . ' called out of order: expected order '
                 . $order . ', was ' . $this->_mockery_currentOrder
             );
         }

diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
@@ -1538,6 +1538,32 @@ public function testAnExampleWithSomeExpectationAmendsOnCallCounts()
         $this->container->mockery_verify();
     }
 
+    public function testAnExampleWithSomeExpectationAmendsOnCallCounts_PHPUnitTest()
+    {
+        $service = $this->getMock('MyService2');
+        $service->expects($this->once())->method('login')->with('user', 'pass')->will($this->returnValue(true));
+        $service->expects($this->exactly(3))->method('hasBookmarksTagged')->with('php')
+            ->will($this->onConsecutiveCalls(false, true, true));
+        $service->expects($this->exactly(3))->method('addBookmark')
+            ->with($this->matchesRegularExpression('/^http:/'), $this->isType('string'))
+            ->will($this->returnValue(true));
+
+        $this->assertTrue($service->login('user', 'pass'));
+        $this->assertFalse($service->hasBookmarksTagged('php'));
+        $this->assertTrue($service->addBookmark('http://example.com/1', 'some_tag1'));
+        $this->assertTrue($service->addBookmark('http://example.com/2', 'some_tag2'));
+        $this->assertTrue($service->addBookmark('http://example.com/3', 'some_tag3'));
+        $this->assertTrue($service->hasBookmarksTagged('php'));
+        $this->assertTrue($service->hasBookmarksTagged('php'));
+    }
+
+}
+
+class MyService2
+{
+    public function login($user, $pass){}
+    public function hasBookmarksTagged($tag){}
+    public function addBookmark($uri, $tag){}
 }
 
 class Mockery_Duck {