aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosProperty/test/property_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-12 10:57:51 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:28:29 +0100
commit186fd1fab5ddc7959e4dd422228abb49f2314b42 (patch)
tree5987b68b10a42093d4eefcbd0243b8d1653eec69 /lib/cosProperty/test/property_SUITE.erl
parentb9143600d99578d49c5610c2eaa87dea653b72e0 (diff)
downloadotp-186fd1fab5ddc7959e4dd422228abb49f2314b42.tar.gz
otp-186fd1fab5ddc7959e4dd422228abb49f2314b42.tar.bz2
otp-186fd1fab5ddc7959e4dd422228abb49f2314b42.zip
Update cosProperty tests to conform with common_test standard
Diffstat (limited to 'lib/cosProperty/test/property_SUITE.erl')
-rw-r--r--lib/cosProperty/test/property_SUITE.erl31
1 files changed, 20 insertions, 11 deletions
diff --git a/lib/cosProperty/test/property_SUITE.erl b/lib/cosProperty/test/property_SUITE.erl
index 999f37c62c..8f3ce3e8c1 100644
--- a/lib/cosProperty/test/property_SUITE.erl
+++ b/lib/cosProperty/test/property_SUITE.erl
@@ -32,7 +32,7 @@
-include_lib("cosProperty/src/cosProperty.hrl").
-include_lib("cosProperty/include/CosPropertyService.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
%%--------------- DEFINES ------------------------------------
-define(default_timeout, ?t:minutes(20)).
@@ -86,7 +86,7 @@
%% External exports
%%-----------------------------------------------------------------
%% Fixed exports
--export([all/1, cases/0, init_all/1, finish_all/1,
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, cases/0, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, end_per_testcase/2]).
%% Test cases
-export([create_setdef_api/1, create_set_api/1, define_with_mode_api/1,
@@ -98,14 +98,23 @@
%% Args:
%% Returns:
%%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosProperty interfaces", ""];
-all(suite) -> {req,
- [mnesia, orber],
- {conf, init_all, cases(), finish_all}}.
+all() ->
+cases().
+
+groups() ->
+ [].
+
+init_per_group(_GroupName, Config) ->
+ Config.
+
+end_per_group(_GroupName, Config) ->
+ Config.
+
-cases() ->
- [create_setdef_api, create_set_api, define_with_mode_api, define_api,
- names_iterator_api, properties_iterator_api, app_test].
+cases() ->
+[create_setdef_api, create_set_api,
+ define_with_mode_api, define_api, names_iterator_api,
+ properties_iterator_api, app_test].
@@ -127,7 +136,7 @@ end_per_testcase(_Case, Config) ->
test_server:timetrap_cancel(Dog),
ok.
-init_all(Config) ->
+init_per_suite(Config) ->
Path = code:which(?MODULE),
code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
orber:jump_start(),
@@ -141,7 +150,7 @@ init_all(Config) ->
exit("Config not a list")
end.
-finish_all(Config) ->
+end_per_suite(Config) ->
Path = code:which(?MODULE),
code:del_path(filename:join(filename:dirname(Path), "idl_output")),
application:stop(cosProperty),