Changeset 19 for trunk

Timestamp:

02/20/08 16:54:36 (4 years ago)

Author:

dom

Message:

Change the way fixtured tests are written (see eg_test_with_fixture.erl)

Location:

trunk

Files:

• fix/eg_test.erl (modified) (2 diffs)
• fix/eg_test_with_fixture.erl (added)
• src/tests.erl (modified) (2 diffs)
• src/tests_test.erl (modified) (3 diffs)

trunk/fix/eg_test.erl

@@ -5 +5 @@
 -module (eg_test).
 -test (exports).
--export ([ok/0, nok/0, with_fixture/1]).
+-export ([ok/0, nok/0]).
 
 ok () ->
@@ -13 +13 @@
     ok = list_to_existing_atom ("nok").
 
-with_fixture (F) ->
-    "data" = F ("data"),
-    ok.

trunk/src/tests.erl

@@ -7 +7 @@
 
 filter_by_attribute (Binary) ->
-    {ok,  {_, [{attributes, Attributes}]}} = beam_lib: chunks (Binary, [attributes]),
+    {ok, Chunks} = beam_lib: chunks (Binary, [attributes]),
+    {Module, [{attributes, Attributes}]} = Chunks,
     Declarations = lists: flatten ([T || {test, T} <- Attributes]),
-    filter_by_attribute (Binary, Declarations, []).
+    filter_by_attribute (Module, Binary, Declarations, []).
 
-filter_by_attribute (Binary, [exports | Tail], Tests) ->
-    {ok, {Module, [{exports, Exports}]}} = beam_lib: chunks (Binary, [exports]),
+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 (Binary, Tail, [Funs | Tests]);
-filter_by_attribute (_, [], Tests) ->
+    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]);
+filter_by_attribute (_, _, [], Tests) ->
     lists: flatten (Tests).
 
@@ -21 +26 @@
     exports_to_funs (M, Exports, Funs);
 exports_to_funs (M, [{F, 0} | Exports], Funs) ->
-    Fun = fun (_) -> M: F () end,
+    Fun = fun () -> M: F () end,
     exports_to_funs (M, Exports, [Fun | Funs]);
 exports_to_funs (M, [{F, 1} | Exports], Funs) ->

trunk/src/tests_test.erl

@@ -10 +10 @@
     filtering_non_tests_returns_empty_list(),
     filtering_tests_returns_list_of_funs_from_unloaded_binary (),
+    filtering_fixtured_tests_returns_list_of_fixture_fun_tuples (),
     ok.
 
@@ -20 +21 @@
     Binary = modules: to_binary (File_name),
     false = code: is_loaded (eg_test),
-    [With_fixture, Ok, Nok] = tests: filter_by_attribute (Binary),
+    [Ok, Nok] = tests: filter_by_attribute (Binary),
     try
         {module, eg_test} = code: load_binary (eg_test, File_name, Binary),
-        ok = Ok (fun empty_fixture/1),
-        {'EXIT', {{badmatch, nok}, _}} = (catch Nok (fun empty_fixture/1)),
-        ok = With_fixture (fun echo_fixture/1)
+        ok = Ok (),
+        {'EXIT', {{badmatch, nok}, _}} = (catch Nok ())
     after
         code: purge (eg_test),
@@ -31 +31 @@
     end.
 
-empty_fixture (_) ->
-    throw (empty_fixture).
-
-echo_fixture (X) ->
-    X.
+filtering_fixtured_tests_returns_list_of_fixture_fun_tuples () ->
+    File_name = "../fix/eg_test_with_fixture.erl",
+    Binary = modules: to_binary (File_name),
+    [{Module, Fixture, Tests}] = tests: filter_by_attribute (Binary),
+    try
+        {module, eg_test_with_fixture} =
+          code: load_binary (eg_test_with_fixture, File_name, Binary),
+        [ok] = Module:Fixture (Tests)
+    after
+        code: purge (eg_test_with_fixture),
+        code: delete (eg_test_with_fixture)
+    end.
+