Changeset 54

Timestamp:

04/16/09 21:01:49 (3 years ago)

Author:

dom

Message:

Added tests and improved recursive directory_watcher.

Location:

trunk/src

Files:

• directory_watcher.erl (modified) (1 diff)
• directory_watcher_test.erl (modified) (1 diff)

trunk/src/directory_watcher.erl

@@ -65 +65 @@
             loop_recursive (Directory, Pid, Watchers);
         check ->
-            lists: foreach (fun (P) -> P ! check end, Watchers);
+            lists: foreach (fun (P) -> P ! check end, Watchers),
+            loop_recursive (Directory, Pid, Watchers);
         stop ->
             notify (Pid, bye)

trunk/src/directory_watcher_test.erl

@@ -37 +37 @@
 
 recursive () ->
+    Subsub = {directory, "subsubdir",
+              [{file, "subsubfile.sub", "titi"}]},
     Tree = [{file, "foo.txt", "Hello"},
             {file, "bar.txt", "G'day"},
             {file, "toto.erl", "-module(toto)."},
-            {directory, "subdir", [{file, "subfile.ext", "toto"}]}],
+            {directory, "subdir",
+             [{file, "subfile.ext", "toto"},
+              Subsub]}],
     ok = fixtures: use_tree (Tree, fun recursive/2).
 
 recursive (Dir, _) ->
     Watcher = spawn_link (directory_watcher, init_recursive, [Dir, self ()]),
-    Filename = filename: join ([Dir, "subdir", "subfile.ext"]),
-    Expected = {{file, ".ext"}, Filename, found},
-    ok = receive_until_found (Expected).
+    Subdir = filename: join (Dir, "subdir"),
+    Found_subdir = {directory, Subdir, found},
+    ok = receive_until_found (Found_subdir),
+    Subfile = filename: join (Subdir, "subfile.ext"),
+    Found_subfile = {{file, ".ext"}, Subfile, found},
+    ok = receive_until_found (Found_subfile),
+    Subsubfile = filename: join ([Subdir, "subsubdir", "subsubfile.sub"]),
+    Found_subsub = {{file, ".sub"}, Subsubfile, found},
+    ok = receive_until_found (Found_subsub),
+    ok = file: write_file (Subsubfile, "not titi"),
+    Watcher ! check,
+    Change_subsub = {{file, ".sub"}, Subsubfile, changed},
+    ok = receive_until_found (Change_subsub).    
 
 bad_symlinks_are_ignored (Dir, _) ->