diff options
| author | Lukas Larsson <[email protected]> | 2010-10-12 10:58:21 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-17 17:28:29 +0100 |
| commit | a31f11aa72f04c65d66836e40611dbd2910922c9 (patch) | |
| tree | f8a77ca2347173d3758a84cd7ee665f47a5e50a6 /lib/cosEventDomain/test/event_domain_SUITE.erl | |
| parent | 186fd1fab5ddc7959e4dd422228abb49f2314b42 (diff) | |
| download | otp-a31f11aa72f04c65d66836e40611dbd2910922c9.tar.gz otp-a31f11aa72f04c65d66836e40611dbd2910922c9.tar.bz2 otp-a31f11aa72f04c65d66836e40611dbd2910922c9.zip | |
Update cosEventDomain tests to conform with common_test standard
Diffstat (limited to 'lib/cosEventDomain/test/event_domain_SUITE.erl')
| -rw-r--r-- | lib/cosEventDomain/test/event_domain_SUITE.erl | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/lib/cosEventDomain/test/event_domain_SUITE.erl b/lib/cosEventDomain/test/event_domain_SUITE.erl index 06c194b44e..33a62be801 100644 --- a/lib/cosEventDomain/test/event_domain_SUITE.erl +++ b/lib/cosEventDomain/test/event_domain_SUITE.erl @@ -22,7 +22,7 @@ -module(event_domain_SUITE). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include_lib("orber/include/corba.hrl"). -include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl"). -include_lib("cosNotification/include/CosNotification.hrl"). @@ -56,21 +56,29 @@ %%----------------------------------------------------------------- %% External exports %%----------------------------------------------------------------- --export([all/1, event_domain_api/1, event_domain_factory_api/1, - cases/0, init_all/1, finish_all/1, +-export([all/0,groups/0,init_per_group/2,end_per_group/2, event_domain_api/1, event_domain_factory_api/1, + cases/0, init_per_suite/1, end_per_suite/1, init_per_testcase/2, end_per_testcase/2, app_test/1]). %%----------------------------------------------------------------- %% Internal exports %%----------------------------------------------------------------- -all(doc) -> ["API tests for the cosEventDomain interfaces", ""]; -all(suite) -> {req, - [mnesia, orber, cosNotification], - {conf, init_all, cases(), finish_all}}. +all() -> +cases(). + +groups() -> + []. + +init_per_group(_GroupName, Config) -> + Config. + +end_per_group(_GroupName, Config) -> + Config. + -cases() -> - [event_domain_api, event_domain_factory_api, app_test]. +cases() -> +[event_domain_api, event_domain_factory_api, app_test]. %%----------------------------------------------------------------- %% Init and cleanup functions. @@ -86,7 +94,7 @@ end_per_testcase(_Case, Config) -> test_server:timetrap_cancel(Dog), ok. -init_all(Config) when is_list(Config) -> +init_per_suite(Config) when is_list(Config) -> mnesia:delete_schema([node()]), mnesia:create_schema([node()]), ok = corba:orb_init([{flags, 16#02}, @@ -102,7 +110,7 @@ init_all(Config) when is_list(Config) -> cosEventDomainApp:start(), Config. -finish_all(Config) when is_list(Config) -> +end_per_suite(Config) when is_list(Config) -> cosEventDomainApp:stop(), cosEventDomainApp:uninstall(), cosNotificationApp:stop(), |