Changeset 17

Timestamp:

02/12/08 18:51:47 (4 years ago)

Author:

dom

Message:

Make test filter work on unloaded binary

Location:

trunk

Files:

• fix (added)
• fix/README (added)
• fix/eg_code.erl (moved) (moved from trunk/src/eg_code.erl)
• fix/eg_test.erl (moved) (moved from trunk/src/eg_test.erl)
• src/README (modified) (1 diff)
• src/modules.erl (added)
• src/tests.erl (modified) (1 diff)
• src/tests_test.erl (modified) (1 diff)

trunk/src/README

@@ -5 +5 @@
 
 *_test.erl: developer tests
-eg_*.erl: example code used by tests
 other: application code
 

trunk/src/tests.erl

@@ -6 +6 @@
 -export ([filter_by_attribute/1]).
 
-filter_by_attribute (Module) ->
-    Attributes = Module: module_info (attributes),
-    Declarations = lists:flatten ([T || {test, T} <- Attributes]),
-    filter_by_attribute (Module, Declarations, []).
+filter_by_attribute (Binary) ->
+    {ok,  {_, [{attributes, Attributes}]}} = beam_lib: chunks (Binary, [attributes]),
+    Declarations = lists: flatten ([T || {test, T} <- Attributes]),
+    filter_by_attribute (Binary, Declarations, []).
 
-filter_by_attribute (Module, [exports | Tail], Tests) ->
-    Exports = Module: module_info (exports),
-    Funs = [fun () -> Module: X() end || {X, 0} <- Exports, X /= module_info],
-    filter_by_attribute (Module, Tail, [Funs | Tests]);
+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],
+    filter_by_attribute (Binary, Tail, [Funs | Tests]);
 filter_by_attribute (_, [], Tests) ->
-    lists:flatten (Tests).
-    
-    
+    lists: flatten (Tests).

trunk/src/tests_test.erl

@@ -8 +8 @@
 
 filter_by_attribute_test () ->
-    [] = tests:filter_by_attribute (eg_code),
-    [Ok, Nok] = tests: filter_by_attribute (eg_test),
-    ok = Ok (),
-    {'EXIT', {{badmatch, nok}, _}} = (catch Nok ()),
+    filtering_non_tests_returns_empty_list(),
+    filtering_tests_returns_list_of_funs_from_unloaded_binary (),
     ok.
+
+filtering_non_tests_returns_empty_list () ->
+    Binary = modules: to_binary ("../fix/eg_code.erl"), 
+    [] = tests: filter_by_attribute (Binary).
+
+filtering_tests_returns_list_of_funs_from_unloaded_binary () ->
+    File_name = "../fix/eg_test.erl",
+    Binary = modules: to_binary (File_name),
+    false = code: is_loaded (eg_test),
+    [Nok, Ok] = tests: filter_by_attribute (Binary),
+    try
+        {module, eg_test} = code: load_binary (eg_test, File_name, Binary),
+        ok = Ok (),
+        {'EXIT', {{badmatch, nok}, _}} = (catch Nok ())
+    after
+        code: purge (eg_test),
+        code: delete (eg_test)
+    end.
+