Skip to content

Commit

Permalink
Fixed tests (file order is undefined, so we need to sort() them)
Browse files Browse the repository at this point in the history
  • Loading branch information
dstogov committed Mar 24, 2008
1 parent 1bda8cf commit 824fa7a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
10 changes: 10 additions & 0 deletions ext/standard/tests/dir/readdir_basic.phpt
Expand Up @@ -22,13 +22,23 @@ mkdir($path);

echo "\n-- Call readdir() with \$path argument --\n";
var_dump($dh = opendir($path));
$a = array();
while( FALSE !== ($file = readdir($dh)) ) {
$a[] = $file;
}
sort($a);
foreach($a as $file) {
var_dump($file);
}

echo "\n-- Call readdir() without \$path argument --\n";
var_dump($dh = opendir($path));
$a = array();
while( FALSE !== ( $file = readdir() ) ) {
$a[] = $file;
}
sort($a);
foreach($a as $file) {
var_dump($file);
}

Expand Down
16 changes: 13 additions & 3 deletions ext/standard/tests/dir/readdir_variation6.phpt
Expand Up @@ -14,15 +14,15 @@ Test readdir() function : usage variations - operate on previously opened direct

echo "*** Testing readdir() : usage variations ***\n";


include( dirname(__FILE__) . "/../file/file.inc");
// include the file.inc for Function: function create_files()
include( dirname(__FILE__)."/../file/file.inc");

// create the temporary directory
$dir_path = dirname(__FILE__) . "/readdir_variation6";
mkdir($dir_path);

// create files within the temporary directory
@create_files($dir_path, 3, "alphanumeric", 0755, 1, "w", "readdir_variation6");
create_files($dir_path, 3, "alphanumeric", 0755, 1, "w", "readdir_variation6");

// open the directory
$dir_handle1 = opendir($dir_path);
Expand All @@ -31,12 +31,22 @@ $dir_handle1 = opendir($dir_path);
opendir($dir_path);

echo "\n-- Reading Directory Contents with Previous Handle --\n";
$a = array();
while (FALSE !== ($file = readdir($dir_handle1))) {
$a[] = $file;
}
sort($a);
foreach ($a as $file) {
var_dump($file);
}

echo "\n-- Reading Directory Contents with Current Handle (no arguments supplied) --\n";
$a = array();
while (FALSE !== ($file = readdir())) {
$a[] = $file;
}
sort($a);
foreach ($a as $file) {
var_dump($file);
}

Expand Down

0 comments on commit 824fa7a

Please sign in to comment.