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

Update expectation to account for umask()

Browse source 
Updating a number of simple assertEqual -> assertEquals.
Fixes #2045
This commit is contained in:
mark_story 2011-09-30 22:10:16 -04:00
parent f4b2e03295
commit 115c656dcc
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/Cake/Test/Case/Utility/FileTest.php
View file

@ -65,46 +65,46 @@ class FileTest extends CakeTestCase {
$result = $this->File->pwd(); $result = $this->File->pwd();
$expecting = $file; $expecting = $file;
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->name; $result = $this->File->name;
$expecting = basename(__FILE__); $expecting = basename(__FILE__);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->info(); $result = $this->File->info();
$expecting = array( $expecting = array(
'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__), 'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__),
'extension' => 'php', 'filename' =>'FileTest' 'extension' => 'php', 'filename' =>'FileTest'
); );
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->ext(); $result = $this->File->ext();
$expecting = 'php'; $expecting = 'php';
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->name(); $result = $this->File->name();
$expecting = 'FileTest'; $expecting = 'FileTest';
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->md5(); $result = $this->File->md5();
$expecting = md5_file($file); $expecting = md5_file($file);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->md5(true); $result = $this->File->md5(true);
$expecting = md5_file($file); $expecting = md5_file($file);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->size(); $result = $this->File->size();
$expecting = filesize($file); $expecting = filesize($file);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->owner(); $result = $this->File->owner();
$expecting = fileowner($file); $expecting = fileowner($file);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->group(); $result = $this->File->group();
$expecting = filegroup($file); $expecting = filegroup($file);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->Folder(); $result = $this->File->Folder();
$this->assertIsA($result, 'Folder'); $this->assertIsA($result, 'Folder');
@ -112,8 +112,8 @@ class FileTest extends CakeTestCase {
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'File permissions tests not supported on Windows.'); $this->skipIf(DIRECTORY_SEPARATOR === '\\', 'File permissions tests not supported on Windows.');
$result = $this->File->perms(); $result = $this->File->perms();
$expecting = '0644'; $expecting = decoct(0644 & ~umask());
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
} }
/** /**
@ -127,7 +127,7 @@ class FileTest extends CakeTestCase {
$result = $this->File->read(); $result = $this->File->read();
$expecting = file_get_contents(__FILE__); $expecting = file_get_contents(__FILE__);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$this->assertTrue(!is_resource($this->File->handle)); $this->assertTrue(!is_resource($this->File->handle));
$this->File->lock = true; $this->File->lock = true;
@ -139,12 +139,12 @@ class FileTest extends CakeTestCase {
$data = $expecting; $data = $expecting;
$expecting = substr($data, 0, 3); $expecting = substr($data, 0, 3);
$result = $this->File->read(3); $result = $this->File->read(3);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$this->assertTrue(is_resource($this->File->handle)); $this->assertTrue(is_resource($this->File->handle));
$expecting = substr($data, 3, 3); $expecting = substr($data, 3, 3);
$result = $this->File->read(3); $result = $this->File->read(3);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
} }
/** /**
@ -172,7 +172,7 @@ class FileTest extends CakeTestCase {
$expecting = substr($data, 5, 3); $expecting = substr($data, 5, 3);
$result = $this->File->read(3); $result = $this->File->read(3);
$this->assertTrue($success); $this->assertTrue($success);
$this->assertEqual($result, $expecting); $this->assertEquals($expecting, $result);
$result = $this->File->offset(); $result = $this->File->offset();
$expecting = 5+3; $expecting = 5+3;
@ -239,7 +239,7 @@ class FileTest extends CakeTestCase {
public function testOpeningNonExistantFileCreatesIt() { public function testOpeningNonExistantFileCreatesIt() {
$someFile = new File(TMP . 'some_file.txt', false); $someFile = new File(TMP . 'some_file.txt', false);
$this->assertTrue($someFile->open()); $this->assertTrue($someFile->open());
$this->assertEqual($someFile->read(), ''); $this->assertEquals('', $someFile->read());
$someFile->close(); $someFile->close();
$someFile->delete(); $someFile->delete();
} }