adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing tests caused by already existing classes

Browse source
This commit is contained in:
ndm2 2014-03-01 20:24:32 +01:00
parent 008ad3237c
commit 01e1b5ca61
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Test/Case/Console/ShellDispatcherTest.php
View file

@ -481,7 +481,7 @@ class ShellDispatcherTest extends CakeTestCase {
$Dispatcher = new TestShellDispatcher(); $Dispatcher = new TestShellDispatcher();
$methods = get_class_methods('Object'); $methods = get_class_methods('Object');
array_push($methods, 'main', 'initdb', 'initialize', 'loadTasks', 'startup', '_secret'); array_push($methods, 'main', 'initdb', 'initialize', 'loadTasks', 'startup', '_secret');
$Shell = $this->getMock('Object', $methods, array(), 'MockWithMainNotAShell'); $Shell = $this->getMock('Object', $methods);
$Shell->expects($this->never())->method('initialize'); $Shell->expects($this->never())->method('initialize');
$Shell->expects($this->once())->method('startup'); $Shell->expects($this->once())->method('startup');
@ -493,7 +493,7 @@ class ShellDispatcherTest extends CakeTestCase {
$this->assertTrue($result); $this->assertTrue($result);
$this->assertEquals(array(), $Dispatcher->args); $this->assertEquals(array(), $Dispatcher->args);
$Shell = $this->getMock('Object', $methods, array(), 'MockWithMainNotAShell'); $Shell = $this->getMock('Object', $methods);
$Shell->expects($this->once())->method('initdb')->will($this->returnValue(true)); $Shell->expects($this->once())->method('initdb')->will($this->returnValue(true));
$Shell->expects($this->once())->method('startup'); $Shell->expects($this->once())->method('startup');
$Dispatcher->TestShell = $Shell; $Dispatcher->TestShell = $Shell;
@ -512,7 +512,7 @@ class ShellDispatcherTest extends CakeTestCase {
$Dispatcher = new TestShellDispatcher(); $Dispatcher = new TestShellDispatcher();
$methods = get_class_methods('Object'); $methods = get_class_methods('Object');
array_push($methods, 'main', 'initdb', 'initialize', 'loadTasks', 'startup', '_secret'); array_push($methods, 'main', 'initdb', 'initialize', 'loadTasks', 'startup', '_secret');
$Shell = $this->getMock('Object', $methods, array(&$Dispatcher), 'MockWithoutMainNotAShell'); $Shell = $this->getMock('Object', $methods);
$Shell->expects($this->never())->method('initialize'); $Shell->expects($this->never())->method('initialize');
$Shell->expects($this->once())->method('startup'); $Shell->expects($this->once())->method('startup');
@ -524,7 +524,7 @@ class ShellDispatcherTest extends CakeTestCase {
$this->assertTrue($result); $this->assertTrue($result);
$this->assertEquals(array(), $Dispatcher->args); $this->assertEquals(array(), $Dispatcher->args);
$Shell = $this->getMock('Object', $methods, array(&$Dispatcher), 'MockWithoutMainNotAShell'); $Shell = $this->getMock('Object', $methods);
$Shell->expects($this->once())->method('initdb')->will($this->returnValue(true)); $Shell->expects($this->once())->method('initdb')->will($this->returnValue(true));
$Shell->expects($this->once())->method('startup'); $Shell->expects($this->once())->method('startup');
$Dispatcher->TestShell = $Shell; $Dispatcher->TestShell = $Shell;

11
lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
View file

@ -33,7 +33,9 @@ class AclComponentTest extends CakeTestCase {
*/ */
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
$this->MockAclImplementation = $this->getMock('AclInterface', array(), array(), 'MockAclImplementation'); if (!class_exists('MockAclImplementation', false)) {
$this->getMock('AclInterface', array(), array(), 'MockAclImplementation');
}
Configure::write('Acl.classname', 'MockAclImplementation'); Configure::write('Acl.classname', 'MockAclImplementation');
$Collection = new ComponentCollection(); $Collection = new ComponentCollection();
$this->Acl = new AclComponent($Collection); $this->Acl = new AclComponent($Collection);
@ -68,10 +70,11 @@ class AclComponentTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testAdapter() { public function testAdapter() {
$this->MockAclImplementation->expects($this->once())->method('initialize')->with($this->Acl); $Adapter = $this->getMock('AclInterface');
$this->assertNull($this->Acl->adapter($this->MockAclImplementation)); $Adapter->expects($this->once())->method('initialize')->with($this->Acl);
$this->assertEquals($this->Acl->adapter(), $this->MockAclImplementation, 'Returned object is different %s'); $this->assertNull($this->Acl->adapter($Adapter));
$this->assertEquals($this->Acl->adapter(), $Adapter, 'Returned object is different %s');
} }
/** /**