Changeset 73

Timestamp:

07/15/09 10:00:25 (3 years ago)

Author:

dom

Message:

Refactoring.

Location:

trunk/src

Files:

• shells_tests.erl (modified) (1 diff)
• tester.erl (modified) (2 diffs)
• tester_test.erl (modified) (2 diffs)
• tests.erl (modified) (1 diff)
• tests_test.erl (modified) (3 diffs)

trunk/src/shells_tests.erl

@@ -24 +24 @@
     Paths = [modules: to_file_name (M, "../src") || M <- Modules],
     Binaries = [modules: to_binary (P) || P <- Paths],
-    Tester ! lists: zip (Paths, Binaries),
+    Tester ! {run, Binaries},
     {Run, Passed, Messages} = final_test_result ([]),
     {passed, Run, Paths, Messages} = {passed, Passed, Paths, Messages},

trunk/src/tester.erl

@@ -23 +23 @@
         {runner_end, New_state} ->
             loop (New_state);
-        Modules ->
+        {run, Modules} ->
             loop (test (load (Modules, State)))
     end.
@@ -30 +30 @@
     lists: foldl (fun load_aux/2, State, Modules).
 
-load_aux ({File_name, Binary}, State) ->
-    {Module, Tests} = tests: filter_by_attribute (Binary),
+load_aux (Binary, State) ->
+    {File_name, Module, Tests} = tests: filter_by_attribute (Binary),
     Node = dict: fetch (node, State),
     Load_args = [Module, File_name, Binary],

trunk/src/tester_test.erl

@@ -22 +22 @@
     Binaries = [modules: to_binary (P) || P <- Paths],
     false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
-    Tester ! lists: zip (Paths, Binaries),
+    Tester ! {run, Binaries},
     Results = receive_all ([]),
     false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
@@ -62 +62 @@
     Tester = spawn_link (tester, init, [notify_me (), Node]),
     Binary = modules: forms_to_binary (eg_test_form ("nok")),
-    Tester ! [{"./eg_test.erl", Binary}],
+    Tester ! {run, [Binary]},
     Results = receive_all ([]),
     [{1, 0, 0}, _Error, {1, 1, 0}] = Results,
     Correct_binary = modules: forms_to_binary (eg_test_form ("ok")),
-    Tester ! [{"./eg_test.erl", Correct_binary}],
+    Tester ! {run, [Correct_binary]},
     [{1, 0, 0}, {1, 1, 1}] = receive_all ([]),
-    Tester ! [{"./eg_test.erl", Binary}],
+    Tester ! {run, [Binary]},
     [{1, 0, 0}, _Error, {1, 1, 0}] = receive_all ([]),
     ok.

trunk/src/tests.erl

@@ -7 +7 @@
 
 filter_by_attribute (Binary) ->
-    {ok, Chunks} = beam_lib: chunks (Binary, [attributes]),
-    {Module, [{attributes, Attributes}]} = Chunks,
+    {ok, Chunks} = beam_lib: chunks (Binary, [attributes, compile_info]),
+    {Module, [{attributes, Attributes}, {compile_info, Info}]} = Chunks,
+    {value, {source, Filename}} = lists: keysearch (source, 1, Info),
     Declarations = lists: flatten ([T || {test, T} <- Attributes]),
     Tests = filter (Binary, Declarations, []),
-    {Module, Tests}.
+    {Filename, Module, Tests}.
 
 filter (Binary, [exports | Tail], Acc) ->

trunk/src/tests_test.erl

@@ -15 +15 @@
 non_tests_returns_empty_list () ->
     Binary = modules: to_binary ("../fix/eg_code.erl"),
-    {eg_code, []} = tests: filter_by_attribute (Binary).
+    {_, eg_code, []} = tests: filter_by_attribute (Binary).
 
 test_exports_returns_list_of_tests_from_unloaded_binary () ->
@@ -21 +21 @@
     Binary = modules: to_binary (File),
     false = code: is_loaded (eg_test),
-    {eg_test, [ok, nok]} = tests: filter_by_attribute (Binary),
+    {_, eg_test, [ok, nok]} = tests: filter_by_attribute (Binary),
     false = code: is_loaded (eg_test).
 
@@ -28 +28 @@
     Binary = modules: to_binary (File),
     false = code: is_loaded (eg_test_not_exports),
-    {eg_test_not_exports, [ok]} = tests: filter_by_attribute (Binary),
+    {_, eg_test_not_exports, [ok]} = tests: filter_by_attribute (Binary),
     false = code: is_loaded (eg_test_not_exports).