Changeset 45

Timestamp:

01/27/09 15:39:17 (3 years ago)

Author:

dom

Message:

Added fixtures, a module that allows directory trees to be setup and teared down for tests. Automated bootstrap tests in ./install script.

Location:

trunk

Files:

• doc/conventions.txt (modified) (1 diff)
• install (modified) (1 diff)
• src/fixtures.erl (added)
• src/fixtures_test.erl (added)
• src/modules.erl (modified) (2 diffs)
• src/shells.erl (modified) (3 diffs)
• src/shells_tests.erl (added)
• src/tester_test.erl (modified) (10 diffs)

trunk/doc/conventions.txt

@@ -9 +9 @@
 argument to the process's init function.
 
+Don't write start() functions that hide the spawning.

trunk/install

@@ -5 +5 @@
 erl -kernel error_logger "{file,\"tester.log\"}" -sname forgetester -noinput &
 cd ebin
+erlc ../src/shells.erl
 erl -make
 erl -kernel error_logger "{file,\"../forge.log\"}" -sname forgeinstaller -noinput -s shells install forgetester@$hostname -s init stop

trunk/src/modules.erl

@@ -1 @@
-%%% Copyright (c) 2008 Dominic Williams
+%%% Copyright (c) Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.
@@ -5 +5 @@
 -module (modules).
 -export ([to_binary/1]).
--export([forms_to_binary /1]).
+-export ([to_file_name/2]).
+-export ([forms_to_binary/1]).
 
 to_binary (File_name) ->
     compile (fun compile: file/2, File_name).
 
+to_file_name (Module, Directory) ->
+    File_name = atom_to_list (Module) ++ ".erl",
+    filename: join (Directory, File_name).
+    
 forms_to_binary (Forms) ->
     compile (fun compile: forms/2, Forms).

trunk/src/shells.erl

@@ -8 +8 @@
     try
         Self = self (),
-        spawn_link (fun () -> tests (test_node (Test_node), Self) end),
+        spawn_link (fun () -> shells_tests: tests (test_node (Test_node), Self) end),
         receive {Self, done} -> ok;
                 M -> io:fwrite ("tests_crash: ~p~n", [M])
@@ -34 +34 @@
     end.
 
-tests (Test_node, Caller) ->
-    io: fwrite ("Running local developer tests~n", []),
-    ok = tests_test: filter_by_attribute (),
-    io: fwrite ("Running developer tests on test node: ~p~n", [Test_node]),
-    ok = tester_test: runs_a_test (Test_node),
-    ok = tester_test: reruns_a_test_when_given_module (Test_node),
-    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),
-    ok = tester_test: deletes_a_module (Test_node),
-    ok = tester_test: deletes_a_test_module (Test_node),
-    ok = tester_test: notifies_a_message (Test_node),
-    ok = tester_test: runs_new_tests_failed_then_successful (Test_node),
-    Caller ! {Caller, done}.
-    
 receive_all () ->
     receive
@@ -59 +44 @@
            done
     end.
+

trunk/src/tester_test.erl

@@ -1 @@
-%%% Copyright (c) 2008 Dominic Williams, Nicolas Charpentier
+%%% Copyright (c) Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.
 
 -module (tester_test).
--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]).
--export ([deletes_a_module /1]).
--export ([deletes_a_test_module /1]).
--export ([notifies_a_message /1]).
--export ([runs_new_tests_failed_then_successful /1]).
+-export ([run_all/1]).
 
-start_tester (Node) ->
-    Self = self (),
-    Notify = fun (Event) -> Self ! Event end,
-    extremeforge: start_tester (Node, Notify).
+run_all (Node) ->
+    runs_a_test (Node),
+    reruns_a_test_when_given_module (Node),
+    runs_given_tests (Node),
+    runs_given_test_sequence (Node),
+    reloads_corrected_module (Node),
+    deletes_a_module  (Node),
+    deletes_a_test_module  (Node),
+    notifies_a_message  (Node),
+    runs_new_tests_failed_then_successful  (Node),
+    ok.
 
-fixture_path (Module) ->
-    File_name = atom_to_list (Module) ++ ".erl",
-    filename: join ("../fix", File_name).
-    
 send (Modules, Tester) ->
-    Paths = [fixture_path (M) || M <- Modules],
+    Paths = [modules: to_file_name (M, "../fix") || M <- Modules],
     Binaries = [modules: to_binary (P) || P <- Paths],
     false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
@@ -29 +26 @@
     false = lists: any (fun (M) -> code: is_loaded (M) end, Modules),
     Results.
-    
+
+notify_me () ->
+    Self = self (),
+    fun (M) -> Self ! M end.
+
 runs_a_test (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     [{2, 0, 0}, {2, 1, 1}, Error, {2, 2, 1}] = send ([eg_test], Tester),
     {{badmatch, nok}, [{eg_test, nok, 0} | _]} = Error, 
@@ -37 +38 @@
 
 reruns_a_test_when_given_module (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     [{1, 0, 0}, Error, {1, 1, 0}] = send ([eg_test_of_code], Tester),
     {undef, [{eg_code, ok, []}, {eg_test_of_code, ok, 0} | _]} = Error,
@@ -44 +45 @@
 
 runs_given_test_sequence (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     [{2, 0, 0}, {2, 1, 1}, _, {2, 2, 1}] = send ([eg_test], Tester),
     [{2, 0, 0}, _, {2, 1, 0}, {2, 2, 1}] = send ([eg_code], Tester),
@@ -52 +53 @@
 
 runs_given_tests (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     Modules = [eg_test, eg_code, eg_test_of_code],
     Result = send (Modules, Tester),
@@ -59 +60 @@
 
 reloads_corrected_module (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     Binary = modules: forms_to_binary (eg_test_form ("nok")),
     Tester ! [{"./eg_test.erl", Binary}],
@@ -72 +73 @@
 
 deletes_a_module (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     [{1, 0, 0}, {1, 1, 1}] = send ([eg_test_of_code], Tester),
     Tester ! {delete,[eg_code]},
@@ -81 +82 @@
 
 deletes_a_test_module (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     [{1, 0, 0}, {1, 1, 1}] = send ([eg_test_of_code], Tester),
     Tester ! {delete,[eg_test_of_code]},
@@ -89 +90 @@
 
 notifies_a_message (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     Test_message = "this is a message",
     Tester ! {notify, Test_message},
@@ -96 +97 @@
 
 runs_new_tests_failed_then_successful (Node) ->
-    Tester = start_tester (Node),
+    Tester = spawn_link (tester, init, [notify_me (), Node]),
     Modules = [eg_code, eg_test_of_code_failed],
     Result = send (Modules, Tester),