aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/test/megaco_timer_test.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-12 10:37:22 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:25:12 +0100
commit6261f06d39e990b45f08b79edebe7b18a6eb9f01 (patch)
tree0900cce5f409e70e9c5ec33af86d861bec82d539 /lib/megaco/test/megaco_timer_test.erl
parent91298c06d77197433c68b3cc1d05eb966e1370e0 (diff)
downloadotp-6261f06d39e990b45f08b79edebe7b18a6eb9f01.tar.gz
otp-6261f06d39e990b45f08b79edebe7b18a6eb9f01.tar.bz2
otp-6261f06d39e990b45f08b79edebe7b18a6eb9f01.zip
Update megaco tests to conform with common_test standard
Diffstat (limited to 'lib/megaco/test/megaco_timer_test.erl')
-rw-r--r--lib/megaco/test/megaco_timer_test.erl56
1 files changed, 27 insertions, 29 deletions
diff --git a/lib/megaco/test/megaco_timer_test.erl b/lib/megaco/test/megaco_timer_test.erl
index d4dcdf77e6..96d2005835 100644
--- a/lib/megaco/test/megaco_timer_test.erl
+++ b/lib/megaco/test/megaco_timer_test.erl
@@ -27,13 +27,13 @@
t/0, t/1,
init_per_testcase/2, end_per_testcase/2,
- all/1,
+ all/0,groups/0,init_per_group/2,end_per_group/2,
- simple/1,
+
simple_init/1,
simple_usage/1,
- integer_timer/1,
+
integer_timer_start_and_expire/1,
integer_timer_start_and_stop/1%% ,
@@ -88,32 +88,30 @@ end_per_testcase(Case, Config) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-all(suite) ->
- Cases =
- [
- simple,
- integer_timer%% ,
-%% incr_timer
- ],
- Cases.
-
-
-simple(suite) ->
- Cases =
- [
- simple_init,
- simple_usage
- ],
- Cases.
-
-
-integer_timer(suite) ->
- Cases =
- [
- integer_timer_start_and_expire,
- integer_timer_start_and_stop
- ],
- Cases.
+all() ->
+Cases = [{group, simple}, {group, integer_timer}],
+ Cases.
+
+groups() ->
+ [{simple, [],
+ begin Cases = [simple_init, simple_usage], Cases end},
+ {integer_timer, [],
+ begin
+ Cases = [integer_timer_start_and_expire,
+ integer_timer_start_and_stop],
+ Cases
+ end}].
+
+init_per_group(_GroupName, Config) ->
+ Config.
+
+end_per_group(_GroupName, Config) ->
+ Config.
+
+
+
+
+
%% incr_timer(suite) ->