From b4c851d574b6e9ebd29ffd41b7ebd76b0912b7cf Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Mon, 18 Apr 2011 15:37:30 +0200
Subject: Add test case for suite with empty group.

---
 lib/common_test/test/ct_groups_test_2_SUITE.erl    | 34 ++++++++++++++++++----
 .../groups_2/groups_22_SUITE.erl                   | 34 +++++++++++++---------
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index 65c7e75080..43a2b86602 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -59,7 +59,7 @@ end_per_testcase(TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [missing_conf, repeat_1].
+    [missing_conf, repeat_1, empty_group].
 
 groups() -> 
     [].
@@ -83,7 +83,7 @@ missing_conf(Config) when is_list(Config) ->
 
     Suite = filename:join(DataDir, "groups_1/missing_conf_SUITE"),
 
-    {Opts,ERPid} = setup({suite,Suite}, Config),
+    {Opts,ERPid} = setup([{suite,Suite}], Config),
     ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
@@ -103,7 +103,7 @@ repeat_1(Config) when is_list(Config) ->
 
     Suite = filename:join(DataDir, "groups_1/repeat_1_SUITE"),
 
-    {Opts,ERPid} = setup({suite,Suite}, Config),
+    {Opts,ERPid} = setup([{suite,Suite}], Config),
     ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
@@ -115,6 +115,27 @@ repeat_1(Config) when is_list(Config) ->
     TestEvents = events_to_check(repeat_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
+%%%-----------------------------------------------------------------
+%%%
+
+empty_group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    Suite = filename:join(DataDir, "groups_2/groups_22_SUITE"),
+
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {group,[test_group_8,test_group_9]}],
+			 Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(empty_group,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(empty_group),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
@@ -123,7 +144,7 @@ setup(Test, Config) ->
     Opts0 = ct_test_support:get_opts(Config),
     Level = ?config(trace_level, Config),
     EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
-    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}} | Test],
     ERPid = ct_test_support:start_event_receiver(Config),
     {Opts,ERPid}.
 
@@ -258,4 +279,7 @@ test_events(repeat_1) ->
      {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
-    ].
+    ];
+
+test_events(empty_group) ->
+    [].
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
index cd517876df..a41489e55c 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
@@ -31,27 +31,30 @@ suite() ->
 
 groups() ->
     [
-      {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
+     {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
 
-      {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
+     {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
 
-      {test_group_2, [parallel], [testcase_2a,
+     {test_group_2, [parallel], [testcase_2a,
 
-				  {test_group_3, [{repeat,1}],
-				   [testcase_3a, testcase_3b]},
+				 {test_group_3, [{repeat,1}],
+				  [testcase_3a, testcase_3b]},
 
-				  testcase_2b]},
+				 testcase_2b]},
 
-      {test_group_4, [{test_group_5, [parallel], [testcase_5a,
+     {test_group_4, [{test_group_5, [parallel], [testcase_5a,
 
-						  {group, test_group_6},
+						 {group, test_group_6},
 
-						  testcase_5b]}]},
+						 testcase_5b]}]},
 
-      {test_group_6, [parallel], [{group, test_group_7}]},
+     {test_group_6, [parallel], [{group, test_group_7}]},
 
-      {test_group_7, [sequence], [testcase_7a,testcase_7b]}
-     ].
+     {test_group_7, [sequence], [testcase_7a,testcase_7b]},
+
+     {test_group_8, [], [{group,test_group_9}]},
+     {test_group_9, [], []}
+    ].
 
 all() ->
     [{group, test_group_1a},
@@ -60,7 +63,9 @@ all() ->
      testcase_2,
      {group, test_group_2},
      testcase_3,
-     {group, test_group_4}].
+     {group, test_group_4},
+     {group, test_group_8},
+     {group, test_group_9}].
 
 %% this func only for internal test purposes
 grs_and_tcs() ->
@@ -68,7 +73,8 @@ grs_and_tcs() ->
       test_group_1a, test_group_1b,
       test_group_2, test_group_3,
       test_group_4, test_group_5,
-      test_group_6, test_group_7
+      test_group_6, test_group_7,
+      test_group_8, test_group_9
      ],
      [
       testcase_1a, testcase_1b, testcase_1c,
-- 
cgit v1.2.3