Changeset 18 for trunk

Timestamp:

02/13/08 18:49:59 (4 years ago)

Author:

dom

Message:

Allow tests to take a fixture as argument

Location:

trunk

Files:

• fix/eg_test.erl (modified) (2 diffs)
• src/tests.erl (modified) (1 diff)
• src/tests_test.erl (modified) (2 diffs)

trunk/fix/eg_test.erl

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

trunk/src/tests.erl

@@ -12 +12 @@
 
 filter_by_attribute (Binary, [exports | Tail], Tests) ->
-    {ok,  {Module, [{exports, Exports}]}} = beam_lib: chunks (Binary, [exports]),
-    Funs = [fun () -> Module: X () end || {X, 0} <- Exports, X /= module_info],
+    {ok, {Module, [{exports, Exports}]}} = beam_lib: chunks (Binary, [exports]),
+    Funs = exports_to_funs (Module, Exports, []),
     filter_by_attribute (Binary, Tail, [Funs | Tests]);
 filter_by_attribute (_, [], Tests) ->
     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) ->
+    Fun = fun (_) -> M: F () end,
+    exports_to_funs (M, Exports, [Fun | Funs]);
+exports_to_funs (M, [{F, 1} | Exports], Funs) ->
+    Fun = fun (Fix) -> M: F (Fix) end,
+    exports_to_funs (M, Exports, [Fun | Funs]);
+exports_to_funs (_, [], Funs) ->
+    Funs.

trunk/src/tests_test.erl

@@ -20 +20 @@
     Binary = modules: to_binary (File_name),
     false = code: is_loaded (eg_test),
-    [Nok, Ok] = tests: filter_by_attribute (Binary),
+    [With_fixture, Ok, Nok] = tests: filter_by_attribute (Binary),
     try
         {module, eg_test} = code: load_binary (eg_test, File_name, Binary),
-        ok = Ok (),
-        {'EXIT', {{badmatch, nok}, _}} = (catch Nok ())
+        ok = Ok (fun empty_fixture/1),
+        {'EXIT', {{badmatch, nok}, _}} = (catch Nok (fun empty_fixture/1)),
+        ok = With_fixture (fun echo_fixture/1)
     after
         code: purge (eg_test),
@@ -30 +31 @@
     end.
 
+empty_fixture (_) ->
+    throw (empty_fixture).
+
+echo_fixture (X) ->
+    X.