knut Sat, 25 Jun 2011 04:50:42 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312449
Log: fixed/refactored some spl tests related to owner/group retrieval Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt U php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt U php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt U php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt U php/php-src/trunk/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt U php/php-src/trunk/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt U php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt U php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -8,23 +8,19 @@ Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> #Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> --FILE-- <?php - -shell_exec('mkdir test_dir_ptfi'); -$dir = new DirectoryIterator('test_dir_ptfi'); -$result = shell_exec('ls -lnd test_dir_ptfi | cut -d" " -f 4'); - -var_dump($dir->getGroup() == $result); - +$dirname = basename(__FILE__, '.phpt'); +mkdir($dirname); +$dir = new DirectoryIterator($dirname); +$expected = filegroup($dirname); +$actual = $dir->getGroup(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -rmdir('test_dir_ptfi'); +$dirname = basename(__FILE__, '.phpt'); +rmdir($dirname); ?> --EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,29 +1,26 @@ ---TEST-- -SPL: Spl Directory Iterator test getOwner ---CREDITS-- +--TEST-- +SPL: DirectoryIterator test getOwner +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -shell_exec('mkdir test_dir_ptfi'); -$dir = new DirectoryIterator('test_dir_ptfi'); -$result = shell_exec('ls -lnd test_dir_ptfi | cut -d" " -f 3'); -var_dump($dir->getOwner() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$dirname = basename(__FILE__, '.phpt'); +mkdir($dirname); +$dir = new DirectoryIterator($dirname); +$expected = fileowner($dirname); +$actual = $dir->getOwner(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -rmdir('test_dir_ptfi'); -?> ---EXPECTF-- +$dirname = basename(__FILE__, '.phpt'); +rmdir($dirname); +?> +--EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,30 +1,26 @@ ---TEST-- -SPL: Spl File Info test getGroup ---CREDITS-- +--TEST-- +SPL: SplFileInfo test getGroup +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -//file -touch ('test_file_ptfi'); -$fileInfo = new SplFileInfo('test_file_ptfi'); -$result = shell_exec('ls -ln test_file_ptfi | cut -d" " -f 4'); -var_dump($fileInfo->getGroup() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$filename = basename(__FILE__, 'phpt').'tmp'; +touch($filename); +$fileInfo = new SplFileInfo($filename); +$expected = filegroup($filename); +$actual = $fileInfo->getGroup(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -unlink('test_file_ptfi'); -?> ---EXPECTF-- +$filename = basename(__FILE__, 'phpt').'tmp'; +unlink($filename); +?> +--EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,30 +1,26 @@ ---TEST-- -SPL: Spl File Info test getOwner ---CREDITS-- +--TEST-- +SPL: SplFileInfo test getOwner +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -//file -touch ('test_file_ptfi'); -$fileInfo = new SplFileInfo('test_file_ptfi'); -$result = shell_exec('ls -ln test_file_ptfi | cut -d" " -f 3'); -var_dump($fileInfo->getOwner() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$filename = basename(__FILE__, 'phpt').'tmp'; +touch($filename); +$fileInfo = new SplFileInfo($filename); +$expected = fileowner($filename); +$actual = $fileInfo->getOwner(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -unlink('test_file_ptfi'); -?> ---EXPECTF-- +$filename = basename(__FILE__, 'phpt').'tmp'; +unlink($filename); +?> +--EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -8,23 +8,19 @@ Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> #Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> --FILE-- <?php - -shell_exec('mkdir test_dir_ptfi'); -$dir = new DirectoryIterator('test_dir_ptfi'); -$result = shell_exec('ls -lnd test_dir_ptfi | cut -d" " -f 4'); - -var_dump($dir->getGroup() == $result); - +$dirname = basename(__FILE__, '.phpt'); +mkdir($dirname); +$dir = new DirectoryIterator($dirname); +$expected = filegroup($dirname); +$actual = $dir->getGroup(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -rmdir('test_dir_ptfi'); +$dirname = basename(__FILE__, '.phpt'); +rmdir($dirname); ?> --EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,29 +1,26 @@ ---TEST-- -SPL: Spl Directory Iterator test getOwner ---CREDITS-- +--TEST-- +SPL: DirectoryIterator test getOwner +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -shell_exec('mkdir test_dir_ptfi'); -$dir = new DirectoryIterator('test_dir_ptfi'); -$result = shell_exec('ls -lnd test_dir_ptfi | cut -d" " -f 3'); -var_dump($dir->getOwner() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$dirname = basename(__FILE__, '.phpt'); +mkdir($dirname); +$dir = new DirectoryIterator($dirname); +$expected = fileowner($dirname); +$actual = $dir->getOwner(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -rmdir('test_dir_ptfi'); -?> ---EXPECTF-- +$dirname = basename(__FILE__, '.phpt'); +rmdir($dirname); +?> +--EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,30 +1,26 @@ ---TEST-- -SPL: Spl File Info test getGroup ---CREDITS-- +--TEST-- +SPL: SplFileInfo test getGroup +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -//file -touch ('test_file_ptfi'); -$fileInfo = new SplFileInfo('test_file_ptfi'); -$result = shell_exec('ls -ln test_file_ptfi | cut -d" " -f 4'); -var_dump($fileInfo->getGroup() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$filename = basename(__FILE__, 'phpt').'tmp'; +touch($filename); +$fileInfo = new SplFileInfo($filename); +$expected = filegroup($filename); +$actual = $fileInfo->getGroup(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -unlink('test_file_ptfi'); -?> ---EXPECTF-- +$filename = basename(__FILE__, 'phpt').'tmp'; +unlink($filename); +?> +--EXPECTF-- bool(true) Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,30 +1,26 @@ ---TEST-- -SPL: Spl File Info test getOwner ---CREDITS-- +--TEST-- +SPL: SplFileInfo test getOwner +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -//file -touch ('test_file_ptfi'); -$fileInfo = new SplFileInfo('test_file_ptfi'); -$result = shell_exec('ls -ln test_file_ptfi | cut -d" " -f 3'); -var_dump($fileInfo->getOwner() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$filename = basename(__FILE__, 'phpt').'tmp'; +touch($filename); +$fileInfo = new SplFileInfo($filename); +$expected = fileowner($filename); +$actual = $fileInfo->getOwner(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -unlink('test_file_ptfi'); -?> ---EXPECTF-- +$filename = basename(__FILE__, 'phpt').'tmp'; +unlink($filename); +?> +--EXPECTF-- bool(true) Modified: php/php-src/trunk/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt =================================================================== --- php/php-src/trunk/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/trunk/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -8,23 +8,19 @@ Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> #Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> --FILE-- <?php - -shell_exec('mkdir test_dir_ptfi'); -$dir = new DirectoryIterator('test_dir_ptfi'); -$result = shell_exec('ls -lnd test_dir_ptfi | cut -d" " -f 4'); - -var_dump($dir->getGroup() == $result); - +$dirname = basename(__FILE__, '.phpt'); +mkdir($dirname); +$dir = new DirectoryIterator($dirname); +$expected = filegroup($dirname); +$actual = $dir->getGroup(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -rmdir('test_dir_ptfi'); +$dirname = basename(__FILE__, '.phpt'); +rmdir($dirname); ?> --EXPECTF-- bool(true) Modified: php/php-src/trunk/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt =================================================================== --- php/php-src/trunk/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/trunk/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,29 +1,26 @@ ---TEST-- -SPL: Spl Directory Iterator test getOwner ---CREDITS-- +--TEST-- +SPL: DirectoryIterator test getOwner +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -shell_exec('mkdir test_dir_ptfi'); -$dir = new DirectoryIterator('test_dir_ptfi'); -$result = shell_exec('ls -lnd test_dir_ptfi | cut -d" " -f 3'); -var_dump($dir->getOwner() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$dirname = basename(__FILE__, '.phpt'); +mkdir($dirname); +$dir = new DirectoryIterator($dirname); +$expected = fileowner($dirname); +$actual = $dir->getOwner(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -rmdir('test_dir_ptfi'); -?> ---EXPECTF-- +$dirname = basename(__FILE__, '.phpt'); +rmdir($dirname); +?> +--EXPECTF-- bool(true) Modified: php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt =================================================================== --- php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,30 +1,26 @@ ---TEST-- -SPL: Spl File Info test getGroup ---CREDITS-- +--TEST-- +SPL: SplFileInfo test getGroup +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -//file -touch ('test_file_ptfi'); -$fileInfo = new SplFileInfo('test_file_ptfi'); -$result = shell_exec('ls -ln test_file_ptfi | cut -d" " -f 4'); -var_dump($fileInfo->getGroup() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$filename = basename(__FILE__, 'phpt').'tmp'; +touch($filename); +$fileInfo = new SplFileInfo($filename); +$expected = filegroup($filename); +$actual = $fileInfo->getGroup(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -unlink('test_file_ptfi'); -?> ---EXPECTF-- +$filename = basename(__FILE__, 'phpt').'tmp'; +unlink($filename); +?> +--EXPECTF-- bool(true) Modified: php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt =================================================================== --- php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-06-25 04:32:14 UTC (rev 312448) +++ php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-06-25 04:50:42 UTC (rev 312449) @@ -1,30 +1,26 @@ ---TEST-- -SPL: Spl File Info test getOwner ---CREDITS-- +--TEST-- +SPL: SplFileInfo test getOwner +--CREDITS-- Cesare D'Amico <cesare.dam...@gruppovolta.it> Andrea Giorgini <agi...@gmail.com> Filippo De Santis <f...@ideato.it> Daniel Londero <daniel.lond...@gmail.com> Francesco Trucchia <f...@ideato.it> Jacopo Romei <jac...@sviluppoagile.it> -#Test Fest Cesena (Italy) on 2009-06-20 ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); -?> ---FILE-- -<?php - -//file -touch ('test_file_ptfi'); -$fileInfo = new SplFileInfo('test_file_ptfi'); -$result = shell_exec('ls -ln test_file_ptfi | cut -d" " -f 3'); -var_dump($fileInfo->getOwner() == $result); - +#Test Fest Cesena (Italy) on 2009-06-20 +--FILE-- +<?php +$filename = basename(__FILE__, 'phpt').'tmp'; +touch($filename); +$fileInfo = new SplFileInfo($filename); +$expected = fileowner($filename); +$actual = $fileInfo->getOwner(); +var_dump($expected == $actual); ?> --CLEAN-- <?php -unlink('test_file_ptfi'); -?> ---EXPECTF-- +$filename = basename(__FILE__, 'phpt').'tmp'; +unlink($filename); +?> +--EXPECTF-- bool(true)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php