Changeset 32 for trunk

Timestamp:

06/23/08 18:09:51 (4 years ago)

Author:

dom

Message:

Added a tester_test (which passed) then refactored all three

Location:

trunk/src

Files:

• shells.erl (modified) (1 diff)
• tester_test.erl (modified) (2 diffs)

trunk/src/shells.erl

@@ -26 +26 @@
     io: fwrite ("Running developer tests on test node: ~p~n", [Test_node]),
     ok = tester_test: runs_a_test (Test_node),
+    ok = tester_test: reruns_a_test_when_given_module (Test_node),
     ok = tester_test: runs_given_tests (Test_node),
     Caller ! {Caller, done}.

trunk/src/tester_test.erl

@@ -4 +4 @@
 
 -module (tester_test).
--export ([runs_a_test/1, runs_given_tests/1]).
+-export ([runs_a_test/1, reruns_a_test_when_given_module/1]).
+-export ([runs_given_tests/1]).
 -test ([{nodes_fix, test_node, [runs_a_test, runs_given_tests]}]).
+-test ([{nodes_fix, test_node, [reruns_a_test_when_given_module]}]).
 
-runs_a_test (Node) ->
+start_tester (Node) ->
     Self = self (),
     Notify = fun (Event) -> Self ! Event end,
-    Tester = spawn_link (tester, init, [Notify, Node]),
-    Binary = modules: to_binary ("../fix/eg_test.erl"),
-    false = code: is_loaded (eg_test),
-    Tester ! {"../fix/eg_test.erl", Binary},
-    [{2, 0, 0}, {2, 1, 1}, Error, {2, 2, 1}] = receive_all ([]),
+    spawn_link (tester, init, [Notify, Node]).
+
+send (Module, Tester) ->
+    File_name = atom_to_list (Module) ++ ".erl",
+    Path = filename: join ("../fix", File_name),
+    Binary = modules: to_binary (Path),
+    false = code: is_loaded (Module),
+    Tester ! {Path, Binary},
+    Results = receive_all ([]),
+    false = code: is_loaded (Module),
+    Results.
+    
+runs_a_test (Node) ->
+    Tester = start_tester (Node),
+    [{2, 0, 0}, {2, 1, 1}, Error, {2, 2, 1}] = send (eg_test, Tester),
     {{badmatch, nok}, [{eg_test, nok, 0} | _]} = Error, 
-    false = code: is_loaded (eg_test),
+    ok.
+
+reruns_a_test_when_given_module (Node) ->
+    Tester = start_tester (Node),
+    [{1, 0, 0}, Error, {1, 1, 0}] = send (eg_test_of_code, Tester),
+    {undef, [{eg_code, ok, []}, {eg_test_of_code, ok, 0} | _]} = Error,
+    [{1, 0, 0}, {1, 1, 1}] = send (eg_code, Tester),
     ok.
 
 runs_given_tests (Node) ->
-    Self = self (),
-    Notify = fun (Event) -> Self ! Event end,
-    Tester = spawn_link (tester, init, [Notify, Node]),
-    Test_binary = modules: to_binary ("../fix/eg_test_of_code.erl"),
-    Code_binary = modules: to_binary ("../fix/eg_code.erl"),
-    false = code: is_loaded (eg_test_of_code),
-    false = code: is_loaded (eg_code),
-    Tester ! {"../fix/eg_test_of_code.erl", Test_binary},
-    [{1, 0, 0}, Error, {1, 1, 0}] = receive_all ([]),
-    {undef, [{eg_code, ok, []}, {eg_test_of_code, ok, 0} | _]} = Error,
-    false = code: is_loaded (eg_test),
-    Tester ! {"../fix/eg_code.erl", Code_binary},
-    [{1, 0, 0}, {1, 1, 1}] = receive_all ([]),
+    Tester = start_tester (Node),
+    [{2, 0, 0}, {2, 1, 1}, _, {2, 2, 1}] = send (eg_test, Tester),
+    [{2, 0, 0}, {2, 1, 1}, _, {2, 2, 1}] = send (eg_code, Tester),
+    Result = send (eg_test_of_code, Tester),
+    [{3, 0, 0}, {3, 1, 1}, _, {3, 2, 1}, {3, 3, 2}] = Result,
     ok.
     
@@ -44 +54 @@
 
 %%% Test to be added:
-%%% with several modules, including non-test ones
 %%% with fixtures
 %%% tests that never end (e.g. infinite loop)