From 40655e41045a6d6b0863164cf1e6d9ec5fb02920 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Thu, 27 Mar 2008 10:45:06 +0000 Subject: [PATCH] MF53:- Fix test (readdir() does not sort the results..) --- ext/standard/tests/file/fseek_dir_basic.phpt | 80 ++++++++++++++------ 1 file changed, 55 insertions(+), 25 deletions(-) diff --git a/ext/standard/tests/file/fseek_dir_basic.phpt b/ext/standard/tests/file/fseek_dir_basic.phpt index 5204432b38..c6d0816e91 100644 --- a/ext/standard/tests/file/fseek_dir_basic.phpt +++ b/ext/standard/tests/file/fseek_dir_basic.phpt @@ -12,25 +12,28 @@ create_files($path, 3); echo "call readdir():\n"; var_dump($dh = opendir($path)); -while( FALSE !== ($file = readdir($dh)) ) { - var_dump($file); -} +$files = array(); +while( FALSE !== ($files[] = readdir($dh)) ) {} +sort($files); +var_dump($files); +$files = array(); echo "\ncall fseek() on directory resource:\n"; var_dump(fseek($dh, 20)); echo "call readdir():\n"; -while( FALSE !== ($file = readdir($dh)) ) { - var_dump($file); -} +while( FALSE !== ($files[] = readdir($dh)) ) {} +sort($files); +var_dump($files); +$files = array(); echo "\ncall fseek() with different arguments on directory resource:\n"; var_dump(fseek($dh, 20, SEEK_END)); echo "call readdir():\n"; -while( FALSE !== ($file = readdir($dh)) ) { - var_dump($file); -} +while( FALSE !== ($files[] = readdir($dh)) ) {} +sort($files); +var_dump($files); delete_files($path, 3); closedir($dh); @@ -39,28 +42,55 @@ var_dump(rmdir($path)); ?> --EXPECTF-- call readdir(): -resource(%d) of type (stream) -string(1) "." -string(2) ".." -string(9) "file1.tmp" -string(9) "file2.tmp" -string(9) "file3.tmp" +resource(12) of type (stream) +array(6) { + [0]=> + bool(false) + [1]=> + string(1) "." + [2]=> + string(2) ".." + [3]=> + string(9) "file1.tmp" + [4]=> + string(9) "file2.tmp" + [5]=> + string(9) "file3.tmp" +} call fseek() on directory resource: int(0) call readdir(): -string(1) "." -string(2) ".." -string(9) "file1.tmp" -string(9) "file2.tmp" -string(9) "file3.tmp" +array(6) { + [0]=> + bool(false) + [1]=> + string(1) "." + [2]=> + string(2) ".." + [3]=> + string(9) "file1.tmp" + [4]=> + string(9) "file2.tmp" + [5]=> + string(9) "file3.tmp" +} call fseek() with different arguments on directory resource: int(0) call readdir(): -string(1) "." -string(2) ".." -string(9) "file1.tmp" -string(9) "file2.tmp" -string(9) "file3.tmp" +array(6) { + [0]=> + bool(false) + [1]=> + string(1) "." + [2]=> + string(2) ".." + [3]=> + string(9) "file1.tmp" + [4]=> + string(9) "file2.tmp" + [5]=> + string(9) "file3.tmp" +} bool(true) -- 2.40.0