[cosEventDomain] Update the test suites to follow the new style

2 files changed, 12 insertions, 46 deletions

diff --git a/lib/cosEventDomain/test/event_domain_SUITE.erl b/lib/cosEventDomain/test/event_domain_SUITE.erl
index b80b16ae6f..c20988701c 100644
--- a/lib/cosEventDomain/test/event_domain_SUITE.erl
+++ b/lib/cosEventDomain/test/event_domain_SUITE.erl
@@ -35,7 +35,7 @@
 %% Macros
 %%-----------------------------------------------------------------
 
--define(default_timeout, ?t:minutes(5)).
+-define(default_timeout, test_server:minutes(5)).
 
 
 -define(match(ExpectedRes, Expr),
@@ -49,7 +49,7 @@
 		    _ ->
 			io:format("###### ERROR ERROR ######~n~p~n",
 				  [AcTuAlReS]),
-			?line exit(AcTuAlReS)
+			exit(AcTuAlReS)
 		end
 	end()).
 
@@ -89,12 +89,12 @@ cases() ->
 %%-----------------------------------------------------------------
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
+    Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
 
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
+    Dog = proplist:get_value(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
@@ -129,15 +129,12 @@ end_per_suite(Config) when is_list(Config) ->
 %%-----------------------------------------------------------------
 %%  Tests app file
 %%-----------------------------------------------------------------
-app_test(doc) -> [];
-app_test(suite) -> [];
 app_test(_Config) ->
     ok=test_server:app_test(cosEventDomain),
     ok.
 
 
-event_domain_api(doc) -> ["Testing the CosEventDomain Domain API", ""];
-event_domain_api(suite) -> [];
+%% Testing the CosEventDomain Domain API
 event_domain_api(_Config) ->
 
     %% We will setup a cluster looking like:
@@ -418,8 +415,7 @@ event_domain_api(_Config) ->
 
     ok.
 
-event_domain_factory_api(doc) -> ["Testing the CosEventDomain Factory API", ""];
-event_domain_factory_api(suite) -> [];
+%% Testing the CosEventDomain Factory API
 event_domain_factory_api(_Config) ->
 
     Cyclic = #'CosNotification_Property'{name=?CycleDetection, 
diff --git a/lib/cosEventDomain/test/generated_SUITE.erl b/lib/cosEventDomain/test/generated_SUITE.erl
index 51b627f0d6..afd925359a 100644
--- a/lib/cosEventDomain/test/generated_SUITE.erl
+++ b/lib/cosEventDomain/test/generated_SUITE.erl
@@ -29,7 +29,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
--define(default_timeout, ?t:minutes(3)).
+-define(default_timeout, test_server:minutes(3)).
 
 -define(match(ExpectedRes, Expr),
         fun() ->
@@ -40,7 +40,7 @@
 		    _ ->
 			io:format("###### ERROR ERROR ######~n~p~n",
 				  [AcTuAlReS]),
-			?line exit(AcTuAlReS)
+			exit(AcTuAlReS)
 		end
 	end()).
 
@@ -51,7 +51,7 @@
 		    Not ->
 			io:format("###### ERROR ERROR ######~n~p~n",
 				  [AcTuAlReS]),
-			?line exit(AcTuAlReS);
+			exit(AcTuAlReS);
 		    _ ->
 			AcTuAlReS
 		end
@@ -63,7 +63,7 @@
 		case orber_tc:check_tc(TC) of
 		    false ->
 			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			?line exit(TC);
+			exit(TC);
 		    true ->
 			true
 		end
@@ -123,12 +123,12 @@ end_per_group(_GroupName, Config) ->
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
+    Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
 
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
+    Dog = proplist:get_value(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
@@ -137,8 +137,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin'(doc) -> ["CosEventDomainAdmin"];
-'CosEventDomainAdmin'(suite) -> [];
 'CosEventDomainAdmin'(_) ->
     ?match("CycleDetection", 'CosEventDomainAdmin':'CycleDetection'()),
     ?match(0, 'CosEventDomainAdmin':'AuthorizeCycles'()),
@@ -152,8 +150,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_DiamondSeq'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_DiamondSeq'(doc) -> ["CosEventDomainAdmin_DiamondSeq"];
-'CosEventDomainAdmin_DiamondSeq'(suite) -> [];
 'CosEventDomainAdmin_DiamondSeq'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DiamondSeq':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/DiamondSeq:1.0", 
@@ -166,8 +162,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_AlreadyExists'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_AlreadyExists'(doc) -> ["CosEventDomainAdmin_AlreadyExists"];
-'CosEventDomainAdmin_AlreadyExists'(suite) -> [];
 'CosEventDomainAdmin_AlreadyExists'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_AlreadyExists':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/AlreadyExists:1.0", 
@@ -180,8 +174,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_DomainIDSeq'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_DomainIDSeq'(doc) -> ["CosEventDomainAdmin_DomainIDSeq"];
-'CosEventDomainAdmin_DomainIDSeq'(suite) -> [];
 'CosEventDomainAdmin_DomainIDSeq'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DomainIDSeq':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/DomainIDSeq:1.0", 
@@ -194,8 +186,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_Connection'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_Connection'(doc) -> ["CosEventDomainAdmin_Connection"];
-'CosEventDomainAdmin_Connection'(suite) -> [];
 'CosEventDomainAdmin_Connection'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_Connection':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/Connection:1.0", 
@@ -208,8 +198,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_ConnectionIDSeq'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_ConnectionIDSeq'(doc) -> ["CosEventDomainAdmin_ConnectionIDSeq"];
-'CosEventDomainAdmin_ConnectionIDSeq'(suite) -> [];
 'CosEventDomainAdmin_ConnectionIDSeq'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_ConnectionIDSeq':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/ConnectionIDSeq:1.0", 
@@ -222,8 +210,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_ConnectionNotFound'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_ConnectionNotFound'(doc) -> ["CosEventDomainAdmin_ConnectionNotFound"];
-'CosEventDomainAdmin_ConnectionNotFound'(suite) -> [];
 'CosEventDomainAdmin_ConnectionNotFound'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_ConnectionNotFound':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/ConnectionNotFound:1.0", 
@@ -236,8 +222,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_CycleCreationForbidden'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_CycleCreationForbidden'(doc) -> ["CosEventDomainAdmin_CycleCreationForbidden"];
-'CosEventDomainAdmin_CycleCreationForbidden'(suite) -> [];
 'CosEventDomainAdmin_CycleCreationForbidden'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_CycleCreationForbidden':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/CycleCreationForbidden:1.0", 
@@ -250,8 +234,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_CycleSeq'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_CycleSeq'(doc) -> ["CosEventDomainAdmin_CycleSeq"];
-'CosEventDomainAdmin_CycleSeq'(suite) -> [];
 'CosEventDomainAdmin_CycleSeq'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_CycleSeq':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/CycleSeq:1.0", 
@@ -264,8 +246,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_DiamondCreationForbidden'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_DiamondCreationForbidden'(doc) -> ["CosEventDomainAdmin_DiamondCreationForbidden"];
-'CosEventDomainAdmin_DiamondCreationForbidden'(suite) -> [];
 'CosEventDomainAdmin_DiamondCreationForbidden'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DiamondCreationForbidden':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/DiamondCreationForbidden:1.0", 
@@ -278,8 +258,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_DomainNotFound'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_DomainNotFound'(doc) -> ["CosEventDomainAdmin_DomainNotFound"];
-'CosEventDomainAdmin_DomainNotFound'(suite) -> [];
 'CosEventDomainAdmin_DomainNotFound'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DomainNotFound':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/DomainNotFound:1.0", 
@@ -292,8 +270,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_MemberIDSeq'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_MemberIDSeq'(doc) -> ["CosEventDomainAdmin_MemberIDSeq"];
-'CosEventDomainAdmin_MemberIDSeq'(suite) -> [];
 'CosEventDomainAdmin_MemberIDSeq'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_MemberIDSeq':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/MemberIDSeq:1.0", 
@@ -306,8 +282,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_RouteSeq'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_RouteSeq'(doc) -> ["CosEventDomainAdmin_RouteSeq"];
-'CosEventDomainAdmin_RouteSeq'(suite) -> [];
 'CosEventDomainAdmin_RouteSeq'(_) ->
     ?match(true, orber_tc:check_tc('CosEventDomainAdmin_RouteSeq':tc())),
     ?match("IDL:omg.org/CosEventDomainAdmin/RouteSeq:1.0", 
@@ -320,8 +294,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_EventDomainFactory'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_EventDomainFactory'(doc) -> ["CosEventDomainAdmin_EventDomainFactory"];
-'CosEventDomainAdmin_EventDomainFactory'(suite) -> [];
 'CosEventDomainAdmin_EventDomainFactory'(_) ->
     ?nomatch(undefined, 'CosEventDomainAdmin_EventDomainFactory':oe_tc(create_event_domain)),
     ?nomatch(undefined, 'CosEventDomainAdmin_EventDomainFactory':oe_tc(get_all_domains)),
@@ -340,8 +312,6 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: 'CosEventDomainAdmin_EventDomain'
 %% Description: 
 %%-----------------------------------------------------------------
-'CosEventDomainAdmin_EventDomain'(doc) -> ["CosEventDomainAdmin_EventDomain"];
-'CosEventDomainAdmin_EventDomain'(suite) -> [];
 'CosEventDomainAdmin_EventDomain'(_) ->
     ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(add_channel)),
     ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_all_channels)),