adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 02:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bringing the folder class to 84% coverage

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6924 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
DarkAngelBGE 2008-05-18 11:26:00 +00:00
parent f26d9b388e
commit 010a083d1c
2 changed files with 177 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/folder.php
View file

@ -104,6 +104,7 @@ class Folder extends Object{
if ($mode) { if ($mode) {
$this->mode = intval($mode, 8); $this->mode = intval($mode, 8);
} }
if (!file_exists($path) && $create == true) { if (!file_exists($path) && $create == true) {
$this->create($path, $this->mode); $this->create($path, $this->mode);
} }
@ -286,10 +287,7 @@ class Folder extends Object{
* @static * @static
*/ */
function correctSlashFor($path) { function correctSlashFor($path) {
if (Folder::isWindowsPath($path)) { return Folder::normalizePath($path);
return '\\';
}
return '/';
} }
/** /**
* Returns $path with added terminating slash (corrected for Windows or other OS). * Returns $path with added terminating slash (corrected for Windows or other OS).
@ -326,6 +324,7 @@ class Folder extends Object{
function inCakePath($path = '') { function inCakePath($path = '') {
$dir = substr($this->slashTerm(ROOT), 0, -1); $dir = substr($this->slashTerm(ROOT), 0, -1);
$newdir = $dir . $path; $newdir = $dir . $path;
return $this->inPath($newdir); return $this->inPath($newdir);
} }
/** /**
@ -337,6 +336,7 @@ class Folder extends Object{
function inPath($path = '', $reverse = false) { function inPath($path = '', $reverse = false) {
$dir = $this->slashTerm($path); $dir = $this->slashTerm($path);
$current = $this->slashTerm($this->pwd()); $current = $this->slashTerm($this->pwd());
if (!$reverse) { if (!$reverse) {
$return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current); $return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current);
} else { } else {

200
cake/tests/cases/libs/folder.test.php
View file

@ -26,7 +26,8 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/ */
uses('folder'); App::import('Core', 'Folder');
App::import('Core', 'File');
/** /**
* Short description for class. * Short description for class.
* *
@ -90,6 +91,10 @@ class FolderTest extends UnitTestCase {
$result = $Folder->copy($copy); $result = $Folder->copy($copy);
$this->assertTrue($result); $this->assertTrue($result);
$copy = TMP . 'test_folder_copy';
$result = $Folder->cp($copy);
$this->assertTrue($result);
$copy = TMP . 'test_folder_copy'; $copy = TMP . 'test_folder_copy';
$result = $Folder->chmod($copy, 0755, false); $result = $Folder->chmod($copy, 0755, false);
$this->assertTrue($result); $this->assertTrue($result);
@ -101,12 +106,19 @@ class FolderTest extends UnitTestCase {
$result = $Folder->move($mv); $result = $Folder->move($mv);
$this->assertTrue($result); $this->assertTrue($result);
$mv = TMP . 'test_folder_mv_2';
$result = $Folder->mv($mv);
$this->assertTrue($result);
$result = $Folder->delete($new); $result = $Folder->delete($new);
$this->assertTrue($result); $this->assertTrue($result);
$result = $Folder->delete($mv); $result = $Folder->delete($mv);
$this->assertTrue($result); $this->assertTrue($result);
$result = $Folder->rm($mv);
$this->assertTrue($result);
$new = TMP . 'test_folder_new'; $new = TMP . 'test_folder_new';
$result = $Folder->create($new); $result = $Folder->create($new);
$this->assertTrue($result); $this->assertTrue($result);
@ -154,32 +166,34 @@ class FolderTest extends UnitTestCase {
function testFolderTree() { function testFolderTree() {
$Folder =& new Folder(); $Folder =& new Folder();
$expected = array(array(TEST_CAKE_CORE_INCLUDE_PATH . 'config', $expected = array(
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode', array(
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding'), TEST_CAKE_CORE_INCLUDE_PATH . 'config',
array(TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding'
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0000_007f.php', ),
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0080_00ff.php', array(
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0100_017f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0180_024F.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0300_036f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0080_00ff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0370_03ff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0100_017f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0400_04ff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0180_024F.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0500_052f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0250_02af.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0530_058f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0370_03ff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '10400_1044f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0400_04ff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '10a0_10ff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0500_052f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '1e00_1eff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '0530_058f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '1f00_1fff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '1e00_1eff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2100_214f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '1f00_1fff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2150_218f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2100_214f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2460_24ff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2150_218f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2c00_2c5f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2460_24ff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2c60_2c7f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2c00_2c5f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2c80_2cff.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2c60_2c7f.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . 'fb00_fb4f.php', TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . '2c80_2cff.php',
TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . 'ff00_ffef.php')); TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' . DS . 'casefolding' . DS . 'ff00_ffef.php'
)
);
$results = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false); $results = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false);
$this->assertEqual($results, $expected); $this->assertEqual($results, $expected);
@ -204,9 +218,141 @@ class FolderTest extends UnitTestCase {
$this->assertTrue($Folder->isSlashTerm('/usr/local/')); $this->assertTrue($Folder->isSlashTerm('/usr/local/'));
$this->assertFalse($Folder->isSlashTerm('cake')); $this->assertFalse($Folder->isSlashTerm('cake'));
} }
function testStatic() { function testStatic() {
$result = Folder::slashTerm('/path/to/file'); $result = Folder::slashTerm('/path/to/file');
$this->assertEqual($result, '/path/to/file/'); $this->assertEqual($result, '/path/to/file/');
} }
function testNormalizePath() {
$path = '/path/to/file';
$result = Folder::normalizePath($path);
$this->assertEqual($result, '/');
$path = '\path\to\file';
$result = Folder::normalizePath($path);
$this->assertEqual($result, '/');
$path = 'C:\path\to\file';
$result = Folder::normalizePath($path);
$this->assertEqual($result, '\\');
}
function correctSlashFor() {
$path = '/path/to/file';
$result = Folder::correctSlashFor($path);
$this->assertEqual($result, '/');
$path = '\path\to\file';
$result = Folder::correctSlashFor($path);
$this->assertEqual($result, '/');
$path = 'C:\path\to\file';
$result = Folder::correctSlashFor($path);
$this->assertEqual($result, '\\');
}
function testInCakePath() {
$Folder =& new Folder();
$Folder->cd(ROOT);
$path = 'C:\path\to\file';
$result = $Folder->inCakePath($path);
$this->assertFalse($result);
$path = ROOT;
$Folder->cd(ROOT);
$result = $Folder->inCakePath($path);
$this->assertFalse($result);
// WHY DOES THIS FAIL ??
$path = DS.'cake'.DS.'config';
$Folder->cd(ROOT.DS.'cake'.DS.'config');
$result = $Folder->inCakePath($path);
$this->assertTrue($result);
}
function testFind() {
$folder =& new Folder();
$folder->cd(TEST_CAKE_CORE_INCLUDE_PATH . 'config');
$result = $folder->find();
$expected = array('config.php', 'paths.php');
$this->assertIdentical($result, $expected);
$result = $folder->find('.*\.php');
$expected = array('config.php', 'paths.php');
$this->assertIdentical($result, $expected);
$result = $folder->find('.*ig\.php');
$expected = array('config.php');
$this->assertIdentical($result, $expected);
$result = $folder->find('paths\.php');
$expected = array('paths.php');
$this->assertIdentical($result, $expected);
$folder->mkdir($folder->pwd().DS.'testme');
$folder->cd('testme');
$result = $folder->find('paths\.php');
$expected = array();
$this->assertIdentical($result, $expected);
$folder->cd($folder->pwd().'/..');
$result = $folder->find('paths\.php');
$expected = array('paths.php');
$this->assertIdentical($result, $expected);
$folder->delete($folder->pwd().DS.'testme');
}
function testFindRecursive() {
$folder =& new Folder();
$folder->cd(TEST_CAKE_CORE_INCLUDE_PATH);
$result = $folder->findRecursive('(config|paths)\.php');
$expected = array(
TEST_CAKE_CORE_INCLUDE_PATH.'config'.DS.'config.php',
TEST_CAKE_CORE_INCLUDE_PATH.'config'.DS.'paths.php'
);
$this->assertIdentical($result, $expected);
$folder->cd('config');
$folder->mkdir($folder->pwd().DS.'testme');
$folder->cd('testme');
$result = $folder->findRecursive('paths\.php');
$expected = array();
$this->assertIdentical($result, $expected);
$file =& new File($folder->pwd().DS.'my.php');
$file->create();
$folder->cd($folder->pwd().'/../..');
$result = $folder->findRecursive('(paths|my)\.php');
$expected = array(
TEST_CAKE_CORE_INCLUDE_PATH.'config'.DS.'paths.php',
TEST_CAKE_CORE_INCLUDE_PATH.'config'.DS.'testme'.DS.'my.php'
);
$this->assertIdentical($result, $expected);
$folder->cd(TEST_CAKE_CORE_INCLUDE_PATH.'config');
$folder->delete($folder->pwd().DS.'testme');
}
function testConstructWithNonExistantPath() {
$folder =& new Folder(TEST_CAKE_CORE_INCLUDE_PATH.'config_non_existant', true);
$this->assertTrue(is_dir(TEST_CAKE_CORE_INCLUDE_PATH.'config_non_existant'));
$folder->cd(TEST_CAKE_CORE_INCLUDE_PATH);
$folder->delete($folder->pwd().'config_non_existant');
}
function testDirSize() {
$folder =& new Folder(TEST_CAKE_CORE_INCLUDE_PATH.'config_non_existant', true);
$this->assertEqual($folder->dirSize(), 0);
$file =& new File($folder->pwd().DS.'my.php');
$file->create();
$file->write('something here');
$this->assertEqual($folder->dirSize(), 14);
$folder->cd(TEST_CAKE_CORE_INCLUDE_PATH);
$folder->delete($folder->pwd().'config_non_existant');
}
} }
?> ?>