fixed/refactored some spl tests related to owner/group retrieval

diff --git a/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt b/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt
index 58387cccef2326b1999959606d9cc50d9d9443da..3573d85852f129d8e9ebb8aeb533ea94481ff277 100644 (file)
--- a/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt
+++ b/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt
@@ -8,23 +8,19 @@ Daniel Londero <daniel.londero@gmail.com>
 Francesco Trucchia <ft@ideato.it>
 Jacopo Romei <jacopo@sviluppoagile.it>
 #Test Fest Cesena (Italy) on 2009-06-20\r
---SKIPIF--\r
-<?php\r
-if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms");\r
-?>\r
 --FILE--\r
 <?php\r
-
-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);
 ?>\r
 --EXPECTF--\r
 bool(true)

diff --git a/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt b/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt
index e342dcdb6fa53f806760cd0b72d11ccd0597b028..f02cb6e04e4a95dc439cef5cd475c3932db6a147 100644 (file)
--- a/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt
+++ b/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt
@@ -1,29 +1,26 @@
---TEST--\r
-SPL: Spl Directory Iterator test getOwner\r
---CREDITS--\r
+--TEST--
+SPL: DirectoryIterator test getOwner
+--CREDITS--
 Cesare D'Amico <cesare.damico@gruppovolta.it>
 Andrea Giorgini <agiorg@gmail.com>
 Filippo De Santis <fd@ideato.it>
 Daniel Londero <daniel.londero@gmail.com>
 Francesco Trucchia <ft@ideato.it>
 Jacopo Romei <jacopo@sviluppoagile.it>
-#Test Fest Cesena (Italy) on 2009-06-20\r
---SKIPIF--\r
-<?php\r
-if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms");\r
-?>\r
---FILE--\r
-<?php\r
-
-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');
-?>\r
---EXPECTF--\r
+$dirname = basename(__FILE__, '.phpt');
+rmdir($dirname);
+?>
+--EXPECTF--
 bool(true)

diff --git a/ext/spl/tests/SplFileInfo_getGroup_basic.phpt b/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
index 7b0528d7d171416b95ef33f7568db765815d73a2..c5808c57d9edf5df985338873210e5b0b4c00b0e 100644 (file)
--- a/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
@@ -1,30 +1,26 @@
---TEST--\r
-SPL: Spl File Info test getGroup\r
---CREDITS--\r
+--TEST--
+SPL: SplFileInfo test getGroup
+--CREDITS--
 Cesare D'Amico <cesare.damico@gruppovolta.it>
 Andrea Giorgini <agiorg@gmail.com>
 Filippo De Santis <fd@ideato.it>
 Daniel Londero <daniel.londero@gmail.com>
 Francesco Trucchia <ft@ideato.it>
 Jacopo Romei <jacopo@sviluppoagile.it>
-#Test Fest Cesena (Italy) on 2009-06-20\r
---SKIPIF--\r
-<?php\r
-if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms");\r
-?>\r
---FILE--\r
-<?php\r
-
-//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');
-?>\r
---EXPECTF--\r
+$filename = basename(__FILE__, 'phpt').'tmp';
+unlink($filename);
+?>
+--EXPECTF--
 bool(true)

diff --git a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
index 50f79430c9e8c0453d969a0f3612c85f0e1dec1c..790dcc69ba0582f6559375f1f775e84830ba8858 100644 (file)
--- a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
@@ -1,30 +1,26 @@
---TEST--\r
-SPL: Spl File Info test getOwner\r
---CREDITS--\r
+--TEST--
+SPL: SplFileInfo test getOwner
+--CREDITS--
 Cesare D'Amico <cesare.damico@gruppovolta.it>
 Andrea Giorgini <agiorg@gmail.com>
 Filippo De Santis <fd@ideato.it>
 Daniel Londero <daniel.londero@gmail.com>
 Francesco Trucchia <ft@ideato.it>
 Jacopo Romei <jacopo@sviluppoagile.it>
-#Test Fest Cesena (Italy) on 2009-06-20\r
---SKIPIF--\r
-<?php\r
-if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms");\r
-?>\r
---FILE--\r
-<?php\r
-
-//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');
-?>\r
---EXPECTF--\r
+$filename = basename(__FILE__, 'phpt').'tmp';
+unlink($filename);
+?>
+--EXPECTF--
 bool(true)