Changeset 89 for trunk

Timestamp:

08/07/09 06:22:22 (3 years ago)

Author:

dom

Message:

Made tester stop and added a run_once to directory_tester.

Location:

trunk/src

Files:

• directory_tester.erl (modified) (2 diffs)
• tester.erl (modified) (2 diffs)
• tester_test.erl (modified) (3 diffs)

trunk/src/directory_tester.erl

@@ -4 +4 @@
 
 -module(directory_tester).
--export ([init/2]).
--export ([init/1]).
+-export ([init/1, init/2]).
+-export ([run_once/1, run_once/2]).
+
+run_once ([Directory, Node]) when is_list (Node) ->
+    run_once (Directory, list_to_atom (Node)).
+
+run_once (Directory, Node) ->
+    run (start (Directory, Node)).
 
 init ([Directory, Node]) when is_list (Node) ->
@@ -11 +17 @@
     
 init (Directory, Node) ->
+    loop (start (Directory, Node)).
+
+start (Directory, Node) ->
     Compiler = spawn_link (compiler, init, [notify_me (compiler), Directory]),
     Tester = spawn_link (tester, init, [notify_me (tester), Node]),
     Compiler ! check,
     Printer = spawn_link (text_printer, init, [standard_io]),
-    loop (Compiler, Tester, Printer).
+    {Compiler, Tester, Printer}.
 
 notify_me (Atom) ->
     Parent = self (),
     fun (Event) ->
-            Parent ! {self (), Atom, Event}
+            Parent ! {notify, {self (), Atom, Event}}
     end.
 
-loop (Compiler, Tester, Printer) ->
+loop ({Compiler, Tester, Printer}) ->
     receive
         stop ->
             Compiler ! {self (), stop},
-            Tester ! stop;
-        {Compiler, compiler, {{binaries, Bs}, {removed, Rs}}} ->
+            Tester ! {self (), stop};
+        {notify, {Compiler, compiler, {{binaries, Bs}, {removed, Rs}}}} ->
             delete (Rs, Tester),
             run (Bs, Tester),
-            loop (Compiler, Tester, Printer);
-        Event ->
+            loop ({Compiler, Tester, Printer});
+        {notify, Event} ->
             Printer ! Event,
-            loop (Compiler, Tester, Printer)
+            loop ({Compiler, Tester, Printer})
     after 4000 ->
             Compiler ! check,
-            loop (Compiler, Tester, Printer)
+            loop ({Compiler, Tester, Printer})
+    end.
+
+run ({Compiler, Tester, Printer}) ->
+    receive
+        {notify, {Compiler, compiler, {{binaries, Bs}, {removed, Rs}}}} ->
+            Compiler ! {self (), stop},
+            delete (Rs, Tester),
+            run (Bs, Tester),
+            Tester ! {self (), stop},
+            run ({Compiler, Tester, Printer});
+        {notify, Event} ->
+            Printer ! Event,
+            run ({Compiler, Tester, Printer});
+        {Tester, bye} ->
+            done;
+        {_, bye} ->
+            run ({Compiler, Tester, Printer})
     end.
 

trunk/src/tester.erl

@@ -15 +15 @@
 loop (State) ->
     receive
-        {notify, Message} ->
-            Notify = dict: fetch (notify, State),
-            Notify (Message),
-            loop (State);
         {delete, Modules} ->
-            loop (test (unload (Modules, State)));
-        {runner_end, New_state} ->
-            loop (New_state);
+            test (unload (Modules, State));
         {run, Modules} ->
-            loop (test (load (Modules, State)))
+            test (load (Modules, State));
+        {Pid, stop} ->
+            Pid ! {self (), bye}
     end.
 
@@ -51 +47 @@
                        end,
     Test_session = spawn (Test_session_fun),
-    dict: store (test_session, Test_session, State_without_pid).
+    dict: store (test_session, Test_session, State_without_pid),
+    loop (receive {runner_end, New_state} -> New_state end).
 
 stop_running_session (State) ->

trunk/src/tester_test.erl

@@ -28 +28 @@
             deletes_a_module  (Node, Root),
             deletes_a_test_module  (Node, Root),
-            notifies_a_message  (Node, Root),
             runs_new_tests_failed_then_successful  (Node, Root),
+            stops (Node, Root),
             ok
     end.
@@ -104 +104 @@
     ok.
 
-notifies_a_message (Node, _) ->
-    Tester = spawn_link (tester, init, [notify_me (), Node]),
-    Test_message = "this is a message",
-    Tester ! {notify, Test_message},
-    [Test_message] = receive_something ([], 1),
-    ok.
-
 runs_new_tests_failed_then_successful (Node, Root) ->
     Tester = spawn_link (tester, init, [notify_me (), Node]),
@@ -125 +118 @@
     ok.
 
-receive_something (Ms, Delay) ->
-    receive
-        M ->
-            receive_something ([M|Ms], Delay)
-    after Delay ->
-            lists: reverse (Ms)
-    end.
-
+stops (Node, Root) ->
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
+    Modules = [eg_code, eg_test_of_code],
+    Paths = [modules: to_file_name (M, Root) || M <- Modules],
+    Binaries = [modules: to_binary (P) || P <- Paths],
+    Tester ! {run, Binaries},
+    Tester ! {self (), stop},
+    Results = receive_all ([]),
+    [{1, 0, 0}, {1, 1, 1}] = Results,
+    ok = receive {Tester, bye} -> ok after 100 -> timeout end.
+                 
 receive_all (Ms) ->
     receive