Changeset 75

Timestamp:

07/16/09 03:49:56 (3 years ago)

Author:

dom

Message:

Fixed a bug in directory_watcher.

Location:

trunk/src

Files:

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

trunk/src/directory_watcher.erl

@@ -124 +124 @@
     report_lost (Fun, X),
     compare (Fun, Xs, []);
+compare (Fun, [X], [Y]) ->
+    report_lost (Fun, X),
+    {File, _} = Y,
+    report_found (Fun, File),
+    done;
 compare (_, [], []) ->
     done.

trunk/src/directory_watcher_test.erl

@@ -16 +16 @@
 -export ([change_from_file_to_directory/0]).
 -export ([change_from_file_to_directory_when_recursive/0]).
+-export ([remove_and_add_in_same_check/0]).
 
 tests_from_empty () ->
@@ -67 +68 @@
     F = fun change_from_directory_to_file_when_recursive/2,
     ok = fixtures: use_tree (tree (), F).
-    
+
+remove_and_add_in_same_check () ->    
+    F = fun remove_and_add_in_same_check/2,
+    ok = fixtures: use_tree ([{file, "foo", "foo"}], F).
+
 tree () ->
     Subsub = {directory, "subsubdir",
@@ -255 +260 @@
     ok.
 
+remove_and_add_in_same_check (Root, _) ->
+    Watcher = spawn_link (directory_watcher, init_recursive, [Root, send_me ()]),
+    receive_all (),
+    [Foo, Bar] = [filename: join (Root, X) || X <- ["foo", "bar"]],
+    ok = file: delete (Foo),
+    ok = file: write_file (Bar, list_to_binary ("bar")),
+    Watcher ! check,
+    [{{file, ""}, Foo, lost},
+     {{file, ""}, Bar, found}] = receive_all (),
+    ok.
+    
+
 send_me () ->
     Self = self (),