Changeset 1289

Timestamp:

01/23/08 20:49:17 (7 months ago)

Author:

mikey

Message:

changed PHPUnit patch to allow overruling of mock class cache (more bc stuff)

Files:

• trunk/experiments/general/PHPUnit/phpunit_mock.patch (modified) (7 diffs)

trunk/experiments/general/PHPUnit/phpunit_mock.patch

@@ -1 +1 @@
-Index: PHPUnit/Framework/TestCase.php
-===================================================================
-9
+3
-+++ PHPUnit/Framework/TestCase.php  (working copy)
-@@ -217,6 +217,12 @@
@@ -16 +16 @@
-      *
-      * @param  string $name
-28
+32
-             throw new InvalidArgumentException;
-         }
@@ -29 +29 @@
--        );
-+        $key = md5($className . serialize($methods));
-
+ || empty($mockClassName) === false
-+            $mock = PHPUnit_Framework_MockObject_Mock::generate(
-+              $className,
@@ -38 +38 @@
-+              $callAutoload
-+            );
-+            
-+            self::$mockClasses[$key] = $mock->mockClassName;
-+        }
- 
--        $mockClass  = new ReflectionClass($mock->mockClassName);
--        $mockObject = $mockClass->newInstanceArgs($arguments);
++            if (empty($mockClassName) === true) {
++                self::$mockClasses[$key] = $mock->mockClassName;
++                $mockClassName           = $mock->mockClassName;
++            }
++        } else {
++            $mockClassName = self::$mockClasses[$key];
++        }
- 
-+        if (count($arguments) === 0) {
-self::$mockClasses[$key]
+$mockClassName
-+        } else {
-self::$mockClasses[$key]
+$mockClassName
-+            $mockObject = $mockClass->newInstanceArgs($arguments);
-+        }
@@ -133 +137 @@
-Index: PHPUnit/Tests/Framework/MockObjectTest.php
-===================================================================
-9
+3
-+++ PHPUnit/Tests/Framework/MockObjectTest.php  (working copy)
-@@ -47,6 +47,7 @@
@@ -151 +155 @@
-  * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
-  * @version    Release: @package_version@
-29
+54
- 
-         $this->assertEquals('something', $mock->doSomething());
@@ -179 +183 @@
-+        $this->assertEquals(get_class($mock4), get_class($mock5));
-+    }
++
++    public function testMockClassStoreOverrulable()
++    {
++        $mock1 = $this->getMock('PartialMockTestClass');
++        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), 'MyMockClassNameForPartialMockTestClass1');
++        $mock3 = $this->getMock('PartialMockTestClass');
++        $mock4 = $this->getMock('PartialMockTestClass', array('doSomething'), array(), 'AnotherMockClassNameForPartialMockTestClass');
++        $mock5 = $this->getMock('PartialMockTestClass', array(), array(), 'MyMockClassNameForPartialMockTestClass2');
++        $this->assertNotEquals(get_class($mock1), get_class($mock2));
++        $this->assertEquals(get_class($mock1), get_class($mock3));
++        $this->assertNotEquals(get_class($mock1), get_class($mock4));
++        $this->assertNotEquals(get_class($mock2), get_class($mock3));
++        $this->assertNotEquals(get_class($mock2), get_class($mock4));
++        $this->assertNotEquals(get_class($mock2), get_class($mock5));
++        $this->assertNotEquals(get_class($mock3), get_class($mock4));
++        $this->assertNotEquals(get_class($mock3), get_class($mock5));
++        $this->assertNotEquals(get_class($mock4), get_class($mock5));
++    }
++
++    public function testMockClassStoreOverruleSameClassNameThrowsException()
++    {
++        $mock1 = $this->getMock('PartialMockTestClass', array(), array(), __FUNCTION__);
++        $this->setExpectedException('RuntimeException');
++        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), __FUNCTION__);
++    }
- }
- ?>