Changeset 38 for trunk

Timestamp:

09/04/08 07:54:31 (4 years ago)

Author:

dom

Message:

Check that tester can reload same module more than twice.

Location:

trunk/src

Files:

• modules.erl (modified) (1 diff)
• shells.erl (modified) (1 diff)
• tester_test.erl (modified) (3 diffs)

trunk/src/modules.erl

@@ -5 +5 @@
 -module (modules).
 -export ([to_binary/1]).
+-export([forms_to_binary /1]).
 
 to_binary (File_name) ->
+    compile (fun compile: file/2, File_name).
+
+forms_to_binary (Forms) ->
+    compile (fun compile: forms/2, Forms).
+
+compile (Fun, Parameter) ->
     Options = [binary, return, warn_unused_import],
-    {ok, _, Binary, _} = compile: file (File_name, Options),
+    {ok, _, Binary, _} = Fun (Parameter, Options),
     Binary.
+

trunk/src/shells.erl

@@ -30 +30 @@
     ok = tester_test: runs_given_test_sequence (Test_node),
     ok = tester_test: runs_given_tests (Test_node),
+    ok = tester_test: reloads_corrected_module (Test_node),
     Caller ! {Caller, done}.
     

trunk/src/tester_test.erl

@@ -6 +6 @@
 -export ([runs_a_test/1, reruns_a_test_when_given_module/1]).
 -export ([runs_given_tests/1, runs_given_test_sequence/1]).
+-export ([reloads_corrected_module/1]).
 
 start_tester (Node) ->
@@ -53 +54 @@
     ok.
 
+reloads_corrected_module (Node) ->
+    Tester = start_tester (Node),
+    Binary = modules: forms_to_binary (eg_test_form ("nok")),
+    Tester ! [{"./eg_test.erl", Binary}],
+    Results = receive_all ([]),
+    [{1, 0, 0}, _Error, {1, 1, 0}] = Results,
+    Correct_binary = modules: forms_to_binary (eg_test_form ("ok")),
+    Tester ! [{"./eg_test.erl", Correct_binary}],
+    [{1, 0, 0}, {1, 1, 1}] = receive_all ([]),
+    Tester ! [{"./eg_test.erl", Binary}],
+    [{1, 0, 0}, _Error, {1, 1, 0}] = receive_all ([]),
+    ok.
+
 receive_all (Ms) ->
     receive
@@ -61 +75 @@
     end.
 
+
+eg_test_form (String) ->
+    [{attribute,1,file,{"./eg_test.erl",1}},
+     {attribute,1,module,eg_test},
+     {attribute,2,export,[{ok,0}]},
+     {attribute,3,test,exports},
+     {function,4,
+      ok,
+      0,
+      [{clause,4,
+        [],
+        [],
+        [{match,5,
+          {atom,5,ok},
+          {call,5,
+           {atom,5,list_to_atom},
+           [{string,5,String}]}}]}]},
+     {eof,7}].
+
 %%% Test to be added:
 %%% tests that never end (e.g. infinite loop)