Changeset 86

Timestamp:

08/06/09 09:55:53 (3 years ago)

Author:

dom

Message:

Replaced all fix/eg_... files by fixtures:use_tree/2 files and removed ./old directory.

Location:

trunk

Files:

• fix (deleted)
• old (deleted)
• src/compiler_test.erl (modified) (2 diffs)
• src/shells_tests.erl (modified) (1 diff)
• src/tester_test.erl (modified) (3 diffs)

trunk/src/compiler_test.erl

@@ -16 +16 @@
 
 compiles_and_reports_progress_warnings_and_errors () ->
-    Compiler = spawn_link (compiler, init, [notify_me (), "fix"]),
+    F = fun compiles_and_reports_progress_warnings_and_errors/2,
+    ok = fixtures: use_tree (tester_test:tree (), F).
+    
+compiles_and_reports_progress_warnings_and_errors (Root, _) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
     Compiler ! check,
     Ms = receive_all (),
@@ -23 +27 @@
 
 stops () ->
-    Compiler = spawn_link (compiler, init, [notify_me (), "fix"]),
+    ok = fixtures: use_tree ([], fun stops/2).
+
+stops (Root, _) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
     Compiler ! check,
     receive_all (),

trunk/src/shells_tests.erl

@@ -16 +16 @@
                modules_test, modules,
                text_printer_test, text_printer,
-               adlib_test, adlib],
+               adlib_test, adlib,
+               tester_test, tester, tests],
     ok = hand_send_to_tester (Modules, Test_node),
     Caller ! {Caller, done}.

trunk/src/tester_test.erl

@@ -5 +5 @@
 -module (tester_test).
 -export ([run_all/1, run_all/0]).
+-export ([tree/0]).
 -test (run_all).
 
@@ -35 +36 @@
     Paths = [modules: to_file_name (M, Root) || M <- Modules],
     Binaries = [modules: to_binary (P) || P <- Paths],
-    false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
+%    false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
     Tester ! {run, Binaries},
     Results = receive_all ([]),
-    false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
+%    false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
     Results.
 
@@ -196 +197 @@
     ].
 
-
-
-
 %%% Test to be added:
 %%% tests that never end (e.g. infinite loop)