Added tests for simple will* methods

Author: fabian

Tests/MockObjectTest.php

@@ -167,6 +167,13 @@ public function testStubbedReturnValue()
              ->will($this->returnValue('something'));
 
         $this->assertEquals('something', $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturn('something');
+
+        $this->assertEquals('something', $mock->doSomething());
     }
 
     public function testStubbedReturnValueMap()
@@ -184,6 +191,15 @@ public function testStubbedReturnValueMap()
         $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
         $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
         $this->assertEquals(NULL, $mock->doSomething('foo', 'bar'));
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnMap($map);
+
+        $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
+        $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
+        $this->assertEquals(NULL, $mock->doSomething('foo', 'bar'));
     }
 
     public function testFunctionCallback()
@@ -194,6 +210,13 @@ public function testFunctionCallback()
              ->will($this->returnCallback('functionCallback'));
 
         $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+
+        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', FALSE);
+        $mock->expects($this->once())
+             ->method('doSomething')
+             ->willReturnCallback('functionCallback');
+
+        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
     }
 
     public function testStaticMethodCallback()
@@ -304,6 +327,21 @@ public function testStubbedReturnValueForStaticMethod()
         $this->assertEquals(
           'something', StaticMockTestClassMock::doSomething()
         );
+
+        $this->getMockClass(
+          'StaticMockTestClass',
+          array('doSomething'),
+          array(),
+          'StaticMockTestClassMock'
+        );
+
+        StaticMockTestClassMock::staticExpects($this->any())
+          ->method('doSomething')
+          ->willReturn('something');
+
+        $this->assertEquals(
+          'something', StaticMockTestClassMock::doSomething()
+        );
     }
 
     public function testStubbedReturnValueForStaticMethod2()
@@ -322,6 +360,21 @@ public function testStubbedReturnValueForStaticMethod2()
         $this->assertEquals(
           'something', StaticMockTestClassMock2::doSomethingElse()
         );
+
+        $this->getMockClass(
+          'StaticMockTestClass',
+          array('doSomething'),
+          array(),
+          'StaticMockTestClassMock2'
+        );
+
+        StaticMockTestClassMock2::staticExpects($this->any())
+          ->method('doSomething')
+          ->willReturn('something');
+
+        $this->assertEquals(
+          'something', StaticMockTestClassMock2::doSomethingElse()
+        );
     }
 
     public function testGetMockForAbstractClass()