Permalink
Browse files

Fix tests that fail in PHPUnit 3.7

Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
  • Loading branch information...
1 parent 805b44f commit f89fe0e1efcd77877a3fab8f13e41a7e129639f9 @markstory markstory committed Oct 16, 2012
Showing with 16 additions and 6 deletions.
  1. +16 −6 lib/Cake/Test/Case/Event/CakeEventManagerTest.php
@@ -234,18 +234,23 @@ public function testDispatchWithKeyName() {
* @return void
*/
public function testDispatchReturnValue() {
+ $this->skipIf(
+ version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
+ 'These tests fail in PHPUnit 3.6'
+ );
$manager = new CakeEventManager;
$listener = $this->getMock('CakeEventTestListener');
$anotherListener = $this->getMock('CakeEventTestListener');
$manager->attach(array($listener, 'listenerFunction'), 'fake.event');
$manager->attach(array($anotherListener, 'listenerFunction'), 'fake.event');
$event = new CakeEvent('fake.event');
- $firstStep = clone $event;
$listener->expects($this->at(0))->method('listenerFunction')
- ->with($firstStep)
+ ->with($event)
->will($this->returnValue('something special'));
- $anotherListener->expects($this->at(0))->method('listenerFunction')->with($event);
+ $anotherListener->expects($this->at(0))
+ ->method('listenerFunction')
+ ->with($event);
$manager->dispatch($event);
$this->assertEquals('something special', $event->result);
}
@@ -256,18 +261,23 @@ public function testDispatchReturnValue() {
* @return void
*/
public function testDispatchFalseStopsEvent() {
+ $this->skipIf(
+ version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
+ 'These tests fail in PHPUnit 3.6'
+ );
+
$manager = new CakeEventManager;
$listener = $this->getMock('CakeEventTestListener');
$anotherListener = $this->getMock('CakeEventTestListener');
$manager->attach(array($listener, 'listenerFunction'), 'fake.event');
$manager->attach(array($anotherListener, 'listenerFunction'), 'fake.event');
$event = new CakeEvent('fake.event');
- $originalEvent = clone $event;
$listener->expects($this->at(0))->method('listenerFunction')
- ->with($originalEvent)
+ ->with($event)
->will($this->returnValue(false));
- $anotherListener->expects($this->never())->method('listenerFunction');
+ $anotherListener->expects($this->never())
+ ->method('listenerFunction');
$manager->dispatch($event);
$this->assertTrue($event->isStopped());
}

0 comments on commit f89fe0e

Please sign in to comment.