Changeset 34 for trunk

Timestamp:

08/22/08 18:46:07 (4 years ago)

Author:

dom

Message:

Removed everything related to fixtures while the concept matures a bit.

Location:

trunk

Files:

• fix/eg_test_fix.erl (deleted)
• fix/eg_test_fix_nofix.erl (deleted)
• src/shells.erl (modified) (1 diff)
• src/tester.erl (modified) (3 diffs)
• src/tester_test.erl (modified) (2 diffs)
• src/tests.erl (modified) (1 diff)
• src/tests_test.erl (modified) (1 diff)

trunk/src/shells.erl

@@ -28 +28 @@
     ok = tester_test: reruns_a_test_when_given_module (Test_node),
     ok = tester_test: runs_given_tests (Test_node),
-    ok = tester_test: runs_a_fixtured_test (Test_node),
     Caller ! {Caller, done}.
     

trunk/src/tester.erl

@@ -22 +22 @@
 
 load ({File_name, Binary}, State) ->
-    {Module, Functions} = tests: filter_by_attribute (Binary),
+    {Module, Tests} = tests: filter_by_attribute (Binary),
     Node = dict: fetch (node, State),
     Load_args = [Module, File_name, Binary],
     {module, Module} = rpc: call (Node, code, load_binary, Load_args),
-    New_tests = dict: store (Module, Functions, dict: fetch (tests, State)),
+    New_tests = dict: store (Module, Tests, dict: fetch (tests, State)),
     dict: store (tests, New_tests, State).
 
 test (State) ->
-    {Total, Tests} = flatten (dict: fetch (tests, State)),
+    Test_dict = dict: fetch (tests, State),
+    {Total, Tests} = flatten (Test_dict),
     Notify = dict: fetch (notify, State),
     Notify ({Total, 0, 0}),
@@ -37 +38 @@
 
 flatten (Tests) ->
-    F = fun (_, Ts, {Count, List}) ->
-                {Count + length (Ts), [Ts | List]}
+    F = fun (Module, Ts, {Count, List}) ->
+                {Count + length (Ts), [[{Module, T} || T <- Ts] | List]}
         end,
     {Total, All} = dict: fold (F, {0, []}, Tests),
@@ -46 +47 @@
     Node = dict: fetch (node, State),
     Notify = dict: fetch (notify, State),
-    fun ({M, F, A}, {Run, Passed}) ->
-            Pid = spawn_link (Node, M, F, A),
+    fun ({Module, Function}, {Run, Passed}) ->
+            Pid = spawn_link (Node, Module, Function, []),
             New_passed =
                 receive

trunk/src/tester_test.erl

@@ -6 +6 @@
 -export ([runs_a_test/1, reruns_a_test_when_given_module/1]).
 -export ([runs_given_tests/1]).
--export ([runs_a_fixtured_test/1]).
--test ([{nodes_fix, test_node, [runs_a_test, runs_given_tests]}]).
--test ([{nodes_fix, test_node, [reruns_a_test_when_given_module]}]).
 
 start_tester (Node) ->
@@ -46 +43 @@
     ok.
 
-runs_a_fixtured_test (Node) ->
-    Tester = start_tester (Node),
-    [{1, 0, 0}, {1, 1, 1}] = send (eg_test_fix, Tester),
-    ok.
-
 receive_all (Ms) ->
     receive

trunk/src/tests.erl

@@ -10 +10 @@
     {Module, [{attributes, Attributes}]} = Chunks,
     Declarations = lists: flatten ([T || {test, T} <- Attributes]),
-    filter_by_attribute (Module, Binary, Declarations, []).
+    Tests = filter (Binary, Declarations, []),
+    {Module, Tests}.
+
+filter (Binary, [exports | Tail], Acc) ->
+    {ok, Chunks} = beam_lib: chunks (Binary, [exports]),
+    {_, [{exports, Exports}]} = Chunks,
+    Tests = lists: foldl (fun testable_export/2, [], Exports),
+    filter (Binary, Tail, [Tests | Acc]);
+filter (_, [], Acc) ->
+    lists: flatten (Acc).
+
+testable_export ({module_info, _}, Fs) -> Fs;
+testable_export ({F, 0}, Fs) -> [F | Fs];
+testable_export (_, Fs) -> Fs.
 
 receive_all () ->
     receive_all ([]).
-
-filter_by_attribute (Module, Binary, [exports | Tail], Tests) ->
-    {ok, Chunks} = beam_lib: chunks (Binary, [exports]),
-    {Module, [{exports, Exports}]} = Chunks,
-    Funs = exports_to_funs (Module, Exports, []),
-    filter_by_attribute (Module, Binary, Tail, [Funs | Tests]);
-filter_by_attribute (Module, Binary, [{M, F, Ts} | Tail], Tests) ->
-    Funs = [{Module, T} || T <- Ts],
-    filter_by_attribute (Module, Binary, Tail, [{M, F, [Funs]} | Tests]);
-filter_by_attribute (Module, _, [], Tests) ->
-    {Module, lists: flatten (Tests)}.
-
-exports_to_funs (M, [{module_info, _} | Exports], Funs) ->
-    exports_to_funs (M, Exports, Funs);
-exports_to_funs (M, [{F, 0} | Exports], Funs) ->
-    exports_to_funs (M, Exports, [{M, F, []} | Funs]);
-exports_to_funs (M, [{_, _} | Exports], Funs) ->
-    exports_to_funs (M, Exports, Funs);
-exports_to_funs (_, [], Funs) ->
-    Funs.
 
 receive_all (Ms) ->

trunk/src/tests_test.erl

@@ -9 +9 @@
 filter_by_attribute () ->
     filtering_non_tests_returns_empty_list(),
-    filtering_tests_returns_list_of_MFA_from_unloaded_binary (),
-    filtering_fixtured_tests_returns_list_of_fixture_fun_tuples (),
-    filtering_understands_mixed_export_and_fixtured_tests (),
+    filtering_tests_returns_list_of_tests_from_unloaded_binary (),
     ok.
 
 filtering_non_tests_returns_empty_list () ->
-    Binary = modules: to_binary ("../fix/eg_code.erl"), 
+    Binary = modules: to_binary ("../fix/eg_code.erl"),
     {eg_code, []} = tests: filter_by_attribute (Binary).
 
-filtering_tests_returns_list_of_MFA_from_unloaded_binary () ->
-    File_name = "../fix/eg_test.erl",
-    Test = fun ([Ok, Nok]) ->
-                   {Ok_m, Ok_f, Ok_a} = Ok,
-                   ok = apply (Ok_m, Ok_f, Ok_a),
-                   {Nok_m, Nok_f, Nok_a} = Nok,
-                   Error = (catch apply (Nok_m, Nok_f, Nok_a)),
-                   {'EXIT', {{badmatch, nok}, _}} = Error
-           end,
-    filtering (File_name, eg_test, Test).
-
-filtering_fixtured_tests_returns_list_of_fixture_fun_tuples () ->
-    File_name = "../fix/eg_test_fix.erl",
-    Test = fun ([{Module, Fixture, [Tests]}]) ->
-                   [ok] = Module: Fixture (Tests)
-           end,
-    filtering (File_name, eg_test_fix, Test).
-    
-filtering_understands_mixed_export_and_fixtured_tests () ->
-    File_name = "../fix/eg_test_fix_nofix.erl",
-    Test = fun ([{Module, Fixture, [With]}, Without]) ->
-                   {Wo_m, Wo_f, Wo_a} = Without,
-                   {'EXIT', {Reason, _}} = (catch apply (Wo_m, Wo_f, Wo_a)),
-                   {badmatch, without_fixture_ok} = Reason,
-                   [ok] = Module: Fixture (With)
-           end,
-    filtering (File_name, eg_test_fix_nofix, Test).
-
-filtering (File_name, Module, Test) ->
-    Binary = modules: to_binary (File_name),
-    false = code: is_loaded (Module),
-    {Module, Tests} = tests: filter_by_attribute (Binary),
-    try
-        {module, Module} = code: load_binary (Module, File_name, Binary),
-        Test (Tests)
-    after
-        code: purge (Module),
-        code: delete (Module)
-    end.
+filtering_tests_returns_list_of_tests_from_unloaded_binary () ->
+    File = "../fix/eg_test.erl",
+    Binary = modules: to_binary (File),
+    false = code: is_loaded (eg_test),
+    {eg_test, [ok, nok]} = tests: filter_by_attribute (Binary),
+    false = code: is_loaded (eg_test).