Merge [4598].

sebastianbergmann · Feb 1, 2009 · e72dfdf · e72dfdf
1 parent 95296f6
commit e72dfdf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/PHPUnit/Tests/Framework/MockObjectTest.php b/PHPUnit/Tests/Framework/MockObjectTest.php
@@ -46,6 +46,7 @@
 
 require_once 'PHPUnit/Framework/TestCase.php';
 
+require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'AbstractMockTestClass.php';
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'AnInterface.php';
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'FunctionCallback.php';
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MethodCallback.php';
@@ -248,5 +249,12 @@ public function testOriginalCloneSettingConsidered()
 
         $this->assertNotEquals(get_class($mock1), get_class($mock2));
     }
+
+    public function testGetMockForAbstractClass()
+    {
+        $mock = $this->getMock('AbstractMockTestClass');
+        $mock->expects($this->never())
+             ->method('doSomething');
+    }
 }
 ?>
diff --git a/PHPUnit/Tests/_files/AbstractMockTestClass.php b/PHPUnit/Tests/_files/AbstractMockTestClass.php
@@ -0,0 +1,6 @@
+<?php
+abstract class AbstractMockTestClass
+{
+    abstract public function doSomething();
+}
+?>
diff --git a/package.xml b/package.xml
@@ -909,6 +909,9 @@
       </file>
      </dir>
      <dir name="_files">
+      <file baseinstalldir="/" name="AbstractMockTestClass.php" role="test">
+       <tasks:replace from="@package_version@" to="version" type="package-info" />
+      </file>
       <file baseinstalldir="/" name="AbstractTest.php" role="test">
        <tasks:replace from="@package_version@" to="version" type="package-info" />
       </file>