Changeset 33

Timestamp:

06/24/08 14:33:47 (4 years ago)

Author:

dom

Message:

Tester now runs fixtured tests

Location:

trunk

Files:

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

trunk/fix/eg_test_fix.erl

@@ -12 +12 @@
 
 fixture (Tests) ->
-    [Test ("data") || Test <- Tests].
+    [M: F ("data") || {M, F} <- Tests].

trunk/fix/eg_test_fix_nofix.erl

@@ -11 +11 @@
 
 fixture (Tests) ->
-    [Test ("data") || Test <- Tests].
+    [M: F ("data") || {M, F} <- Tests].

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_test.erl

@@ -1 @@
-%%% Copyright (c) 2008 Dominic Williams
+%%% Copyright (c) 2008 Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.
@@ -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]}]).
@@ -44 +45 @@
     [{3, 0, 0}, {3, 1, 1}, _, {3, 2, 1}, {3, 3, 2}] = Result,
     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
@@ -54 +60 @@
 
 %%% Test to be added:
-%%% with fixtures
 %%% tests that never end (e.g. infinite loop)
 %%% Code loading and re-running all tests when one of many is refreshed

trunk/src/tests.erl

@@ -21 +21 @@
     filter_by_attribute (Module, Binary, Tail, [Funs | Tests]);
 filter_by_attribute (Module, Binary, [{M, F, Ts} | Tail], Tests) ->
-    Funs = [fun (Fix) -> Module:T (Fix) end || T <- Ts],
-    filter_by_attribute (Module, Binary, Tail, [{M, F, Funs} | 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)}.

trunk/src/tests_test.erl

@@ -31 +31 @@
 filtering_fixtured_tests_returns_list_of_fixture_fun_tuples () ->
     File_name = "../fix/eg_test_fix.erl",
-    Test = fun ([{Module, Fixture, Tests}]) ->
+    Test = fun ([{Module, Fixture, [Tests]}]) ->
                    [ok] = Module: Fixture (Tests)
            end,
@@ -38 +38 @@
 filtering_understands_mixed_export_and_fixtured_tests () ->
     File_name = "../fix/eg_test_fix_nofix.erl",
-    Test = fun ([{Module, Fixture, With}, Without]) ->
+    Test = fun ([{Module, Fixture, [With]}, Without]) ->
                    {Wo_m, Wo_f, Wo_a} = Without,
                    {'EXIT', {Reason, _}} = (catch apply (Wo_m, Wo_f, Wo_a)),