Changeset 37 for trunk/src/tester_test.erl

Timestamp:

08/26/08 18:47:29 (4 years ago)

Author:

dom

Message:

Changed tester to receive list of modules to test, not individual modules.

File:

• trunk/src/tester_test.erl (modified) (3 diffs)

trunk/src/tester_test.erl

@@ -5 +5 @@
 -module (tester_test).
 -export ([runs_a_test/1, reruns_a_test_when_given_module/1]).
--export ([runs_given_tests/1]).
+-export ([runs_given_tests/1, runs_given_test_sequence/1]).
 
 start_tester (Node) ->
@@ -12 +12 @@
     spawn_link (tester, init, [Notify, Node]).
 
-send (Module, Tester) ->
+fixture_path (Module) ->
     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},
+    filename: join ("../fix", File_name).
+    
+send (Modules, Tester) ->
+    Paths = [fixture_path (M) || M <- Modules],
+    Binaries = [modules: to_binary (P) || P <- Paths],
+    false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
+    Tester ! lists: zip (Paths, Binaries),
     Results = receive_all ([]),
-    false = code: is_loaded (Module),
+    false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
     Results.
     
 runs_a_test (Node) ->
     Tester = start_tester (Node),
-    [{2, 0, 0}, {2, 1, 1}, Error, {2, 2, 1}] = send (eg_test, Tester),
+    [{2, 0, 0}, {2, 1, 1}, Error, {2, 2, 1}] = send ([eg_test], Tester),
     {{badmatch, nok}, [{eg_test, nok, 0} | _]} = Error, 
     ok.
@@ -30 +33 @@
 reruns_a_test_when_given_module (Node) ->
     Tester = start_tester (Node),
-    [{1, 0, 0}, Error, {1, 1, 0}] = send (eg_test_of_code, Tester),
+    [{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),
+    [{1, 0, 0}, {1, 1, 1}] = send ([eg_code], Tester),
+    ok.
+
+runs_given_test_sequence (Node) ->
+    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.
 
 runs_given_tests (Node) ->
     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),
+    Modules = [eg_test, eg_code, eg_test_of_code],
+    Result = send (Modules, Tester),
     [{3, 0, 0}, {3, 1, 1}, _, {3, 2, 1}, {3, 3, 2}] = Result,
     ok.