1 files changed, 52 insertions, 74 deletions
diff --git a/lib/megaco/test/megaco_SUITE.erl b/lib/megaco/test/megaco_SUITE.erl
index 1bb3a570a4..4faa6736e6 100644
--- a/lib/megaco/test/megaco_SUITE.erl
+++ b/lib/megaco/test/megaco_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -36,8 +36,8 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 init() ->
     process_flag(trap_exit, true),
@@ -46,97 +46,75 @@ init() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     app_test,
-     appup_test,
-     config,
-     flex,
-     udp,
-     tcp,
-     examples,
-     %% call_flow,
-     digit_map,
-     mess,
-     measure,
-     binary_term_id,
-     codec,
-     sdp,
-     mib,
-     trans,
-     actions,
-     load,
-     pending_limit,
-     segmented,
-     timer
-    ].
+suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,1}]}]}].
+
+all() -> 
+    [{group, app_test}, {group, appup_test},
+     {group, config}, {group, flex}, {group, udp},
+     {group, tcp}, {group, examples}, {group, digit_map},
+     {group, mess}, {group, measure},
+     {group, binary_term_id}, {group, codec}, {group, sdp},
+     {group, mib}, {group, trans}, {group, actions},
+     {group, load}, {group, pending_limit},
+     {group, segmented}, {group, timer}].
+
+groups() -> 
+    [{tickets, [], [{group, mess}, {group, codec}]},
+     {app_test, [], [{megaco_app_test, all}]},
+     {appup_test, [], [{megaco_appup_test, all}]},
+     {config, [], [{megaco_config_test, all}]},
+     {call_flow, [], [{megaco_call_flow_test, all}]},
+     {digit_map, [], [{megaco_digit_map_test, all}]},
+     {mess, [], [{megaco_mess_test, all}]},
+     {udp, [], [{megaco_udp_test, all}]},
+     {tcp, [], [{megaco_tcp_test, all}]},
+     {examples, [], [{megaco_examples_test, all}]},
+     {measure, [], [{megaco_measure_test, all}]},
+     {binary_term_id, [],
+      [{megaco_binary_term_id_test, all}]},
+     {codec, [], [{megaco_codec_test, all}]},
+     {sdp, [], [{megaco_sdp_test, all}]},
+     {mib, [], [{megaco_mib_test, all}]},
+     {trans, [], [{megaco_trans_test, all}]},
+     {actions, [], [{megaco_actions_test, all}]},
+     {load, [], [{megaco_load_test, all}]},
+     {pending_limit, [], [{megaco_pending_limit_test, all}]},
+     {segmented, [], [{megaco_segment_test, all}]},
+     {timer, [], [{megaco_timer_test, all}]},
+     {flex, [], [{megaco_flex_test, all}]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-tickets(suite) ->
-    [
-     mess,
-     codec
-     ].
 
-app_test(suite) ->
-    [{megaco_app_test, all}].
 
-appup_test(suite) ->
-    [{megaco_appup_test, all}].
 
-config(suite) ->
-    [{megaco_config_test, all}].
 
-call_flow(suite) ->
-    [{megaco_call_flow_test, all}].
 
-digit_map(suite) ->
-    [{megaco_digit_map_test, all}].
 
-mess(suite) ->
-    [{megaco_mess_test, all}].
 
-udp(suite) ->
-    [{megaco_udp_test, all}].
 
-tcp(suite) ->
-    [{megaco_tcp_test, all}].
 
-examples(suite) ->
-    [{megaco_examples_test, all}].
 
-measure(suite) ->
-    [{megaco_measure_test, all}].
 
-binary_term_id(suite) ->
-    [{megaco_binary_term_id_test, all}].
 
-codec(suite) ->
-    [{megaco_codec_test, all}].
 
-sdp(suite) ->
-    [{megaco_sdp_test, all}].
 
-mib(suite) ->
-    [{megaco_mib_test, all}].
 
-trans(suite) ->
-    [{megaco_trans_test, all}].
 
-actions(suite) ->
-    [{megaco_actions_test, all}].
 
-load(suite) ->
-    [{megaco_load_test, all}].
 
-pending_limit(suite) ->
-    [{megaco_pending_limit_test, all}].
 
-segmented(suite) ->
-    [{megaco_segment_test, all}].
 
-timer(suite) ->
-    [{megaco_timer_test, all}].
 
-flex(suite) ->
-    [{megaco_flex_test, all}].