Changeset 21 for trunk

Timestamp:

02/22/08 16:58:41 (4 years ago)

Author:

dom

Message:

Added filtering with a mixture of plain tests and fixtured tests (with Charpi)

Location:

trunk

Files:

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

trunk/src/tests.erl

@@ -28 +28 @@
     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 (M, [{_, _} | Exports], Funs) ->
+    exports_to_funs (M, Exports, Funs);
 exports_to_funs (_, [], Funs) ->
     Funs.

trunk/src/tests_test.erl

@@ -11 +11 @@
     filtering_tests_returns_list_of_funs_from_unloaded_binary (),
     filtering_fixtured_tests_returns_list_of_fixture_fun_tuples (),
+    filtering_understands_mixed_export_and_fixtured_tests (),
     ok.
 
@@ -32 +33 @@
     filtering (File_name, eg_test_with_fixture, Test).
     
+filtering_understands_mixed_export_and_fixtured_tests () ->
+    File_name = "../fix/eg_test_with_and_without_fixture.erl",
+    Test = fun ([{Module, Fixture, With}, Without]) ->
+                   {'EXIT', {Reason, _}} = (catch Without ()),
+                   {badmatch, without_fixture_ok} = Reason,
+                   [ok] = Module: Fixture (With)
+           end,
+    filtering (File_name, eg_test_with_and_without_fixture, Test).
+
 filtering (File_name, Module, Test) ->
     Binary = modules: to_binary (File_name),