Closing directory after a complete traversal.

Adding tests for that.

1 files changed, 30 insertions, 27 deletions

diff --git a/tests/test.lua b/tests/test.lua
index d0018cd..07436f9 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -9,7 +9,7 @@ require"lfs"
 function attrdir (path)
         for file in lfs.dir(path) do
                 if file ~= "." and file ~= ".." then
-                        local f = path..sep..file
+                        local f = path..'/'..file
                         print ("\t=> "..f.." <=")
                         local attr = lfs.attributes (f)
                         assert (type(attr) == "table")
@@ -32,35 +32,38 @@ assert (lfs.chdir (reldir), "could not change back to current directory")
 assert (lfs.currentdir() == current, "error trying to change directories")
 assert (lfs.chdir ("this couldn't be an actual directory") == nil, "could change to a non-existent directory")
 -- Changing creating and removing directories
-local tmpdir = tmp..sep.."lfs_tmp_dir"
+local tmpdir = tmp.."/lfs_tmp_dir"
 assert (lfs.mkdir (tmpdir), "could not make a new directory")
--- create a new file
-local tmpfile = tmpdir..sep.."lfs_tmp_file"
-assert (io.open(tmpfile, "w"), "could not make a new file")
-local attrib, errmsg = lfs.attributes (tmpfile)
+local attrib, errmsg = lfs.attributes (tmpdir)
 if not attrib then
-        error ("could not get attributes of file `"..tmpfile.."':\n"..errmsg)
-else
-        -- Change access time
-        assert (lfs.touch (tmpfile, 11))
-        local new_att = assert (lfs.attributes (tmpfile))
-        assert (new_att.access == 11, string.format("could not set access time: %s", tostring(new_att.access)))
-        assert (new_att.modification == 11, "could not set modification time")
-        -- Change access and modification time
-        assert (lfs.touch (tmpfile, 33, 22))
-        local new_att = assert (lfs.attributes (tmpfile))
-        assert (new_att.access == 33, "could not set access time")
-        assert (new_att.modification == 22, "could not set modification time")
-        -- Restore access time to current value
-        assert (lfs.touch (tmpfile))
-        new_att = assert (lfs.attributes (tmpfile))
-        assert (new_att.access == attrib.access)
-        assert (new_att.modification == attrib.modification)
+        error ("could not get attributes of file `"..tmpdir.."':\n"..errmsg)
 end
-assert (os.remove (tmpfile), "could not remove file")
-assert (lfs.rmdir (tmpdir), "could not remove new directory")
-assert (lfs.mkdir (tmpdir..sep.."lfs_tmp_dir") == false, "could create a directory inside a non-existent one")
--- 
+-- Change access time
+assert (lfs.touch (tmpdir, 11))
+local new_att = assert (lfs.attributes (tmpdir))
+assert (new_att.access == 11, "could not set access time")
+assert (new_att.modification == 11, "could not set modification time")
+-- Change access and modification time
+assert (lfs.touch (tmpdir, 33, 22))
+local new_att = assert (lfs.attributes (tmpdir))
+assert (new_att.access == 33, "could not set access time")
+assert (new_att.modification == 22, "could not set modification time")
+-- Restore access time to current value
+assert (lfs.touch (tmpdir))
+new_att = assert (lfs.attributes (tmpdir))
+assert (new_att.access == attrib.access)
+assert (new_att.modification == attrib.modification)
+-- Remove new directory
+assert (os.remove (tmpdir), "could not remove new directory")
+assert (lfs.mkdir (tmpdir.."/lfs_tmp_dir") == false, "could create a directory inside a non-existent one")
+-- Trying to get attributes of a non-existent file
 assert (lfs.attributes ("this couldn't be an actual file") == nil, "could get attributes of a non-existent file")
 assert (type(lfs.attributes (upper)) == "table", "couldn't get attributes of upper directory")
+-- Stressing directory iterator
+count = 0
+for i = 1, 4000 do
+        for file in lfs.dir (tmp) do
+                count = count + 1
+        end
+end
 print"Ok!"