Changeset 10 for trunk

Timestamp:

11/06/07 17:22:06 (5 years ago)

Author:

dom

Message:

Refactoring tests of compile events before adding new ones

File:

• trunk/src/test_files_acceptance.erl (modified) (2 diffs)

trunk/src/test_files_acceptance.erl

@@ -142 +142 @@
       [foo(), bad_bar(), baz()],
       fun (Server, _, _) ->
-              Messages =
-                  lists:reverse (
-                    lists:foldl (
-                      fun (_, Acc) ->
-                              Received =
-                                  receive {Server, Msg} -> Msg
-                                  after 30000 -> timeout end,
-                              [Received | Acc]
-                      end,
-                      [],
-                      lists:seq (1, 12))),
-              check_multi_module_messages (Messages)
+              Pairs = receive_event_dashboard_pairs (6, Server),
+              {Module_events, Compile_events} = lists:split (3, Pairs),
+              check_module_events (Module_events, ["bar", "baz", "foo"]),
+              check_compile_events (Compile_events, [baz, foo], ["bar"])
       end).
 
@@ -547 +539 @@
               {dashboard, {{modules, 1, 0, 1}, {unit, 0, 0, 0}, {acceptance, 0, 0, 0}}} = receive_one_from (Server)
       end).
+
+receive_event_dashboard_pairs (N, Server) ->
+              Messages =
+                  lists:reverse (
+                    lists:foldl (
+                      fun (_, Acc) ->
+                              Received =
+                                  receive {Server, Msg} -> Msg
+                                  after 30000 -> timeout end,
+                              [Received | Acc]
+                      end,
+                      [],
+                      lists:seq (1, N * 2))),
+    Make_pairs =
+        fun (Event, {[], Pairs}) ->
+                {[Event], Pairs};
+            (Dashboard, {[Event], Pairs}) ->
+                {[], [{Event, Dashboard} | Pairs]}
+        end,
+    {[], Pairs} = lists:foldl (Make_pairs, {[], []}, Messages),
+    lists:reverse (Pairs).
+
+check_module_events (Pairs, Expected) ->
+    {_, Modules} =
+        lists:foldl (
+          fun ({{event, {Module, {module, uncompiled}, _}},
+                {dashboard, {{modules, 0, 0, Count}, {unit, 0, 0, 0}, {acceptance, 0, 0, 0}}}},
+               {Count, Modules}) ->
+                  {Count + 1, [Module | Modules]}
+          end,
+          {1, []},
+          Pairs),
+    Expected = lists:sort (Modules).
+
+check_compile_events (Pairs, Expected_compiled, Expected_errors) ->
+    Simplified =
+        [{Mod, Result, Yes, No, Total}
+         || {{event, {Mod, {module, Result}, _}}, {dashboard, {{modules, Yes, No, Total}, {unit, 0, 0, 0}, {acceptance, 0, 0, 0}}}}
+                <- Pairs],
+    Expected_compiled =
+        lists:sort ( [Mod || {Mod, compiled, _, _, _} <- Simplified]),
+    Expected_errors =
+        lists:sort ([Mod || {Mod, errors, _, _, _} <- Simplified]),
+    Total = length (Expected_errors) + length (Expected_compiled),
+    lists:foldl (
+      fun ({_, Result, Yes, No, T}, {Old_yes, Old_no}) when T == Total ->
+              case Result of
+                  compiled ->
+                      Yes = Old_yes + 1,
+                      No = Old_no;
+                  errors ->
+                      Yes = Old_yes,
+                      No = Old_no + 1
+              end,
+              {Yes, No}
+      end,
+      {0, 0},
+      Simplified).