diff options
| author | Lars Thorsen <[email protected]> | 2016-06-17 07:59:00 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2016-06-17 07:59:00 +0200 |
| commit | 29864ba25d395aa57b88cd9d4357aa5a935b7535 (patch) | |
| tree | eda5057896e315c46301b2e1d745d498ee2de4fe /lib/cosEvent/test/event_channel_SUITE.erl | |
| parent | 7c349de647fa1e56960201a72cc6c0d863137cd8 (diff) | |
| parent | 395f31e3d22c1f4e273830122862769c78a7fcc1 (diff) | |
| download | otp-29864ba25d395aa57b88cd9d4357aa5a935b7535.tar.gz otp-29864ba25d395aa57b88cd9d4357aa5a935b7535.tar.bz2 otp-29864ba25d395aa57b88cd9d4357aa5a935b7535.zip | |
Merge branch 'lars/test-case-conformance/OTP-13695'
* lars/test-case-conformance/OTP-13695:
[cosTransactions] Update the test suites to follow the new style
[cosTime] Update the test suites to follow the new style
[cosProperty] Update the test suites to follow the new style
[cosNotification] Update the test suites to follow the new style
[cosFileTransfer] Fix mispelled module name
[cosEvent] Fix mispelled module name
[cosEventDomain] Fix mispelled module name
[cosFileTransfer] Update the test suites to follow the new style
[cosEventDomain] Update the test suites to follow the new style
[cosEvent] Update the test suites to follow the new style
[orber] Update the test suites to follow the new style
[erl_docgen] Update the test suites to follow the new style
[ic] Correct memory deallocation error
[ic] Update the test suites to follow the new style
Diffstat (limited to 'lib/cosEvent/test/event_channel_SUITE.erl')
| -rw-r--r-- | lib/cosEvent/test/event_channel_SUITE.erl | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/cosEvent/test/event_channel_SUITE.erl b/lib/cosEvent/test/event_channel_SUITE.erl index d237db8e9b..bbae8d782a 100644 --- a/lib/cosEvent/test/event_channel_SUITE.erl +++ b/lib/cosEvent/test/event_channel_SUITE.erl @@ -32,7 +32,7 @@ %% Macros %%----------------------------------------------------------------- --define(default_timeout, ?t:minutes(5)). +-define(default_timeout, test_server:minutes(5)). -define(match(ExpectedRes, Expr), @@ -46,7 +46,7 @@ _ -> io:format("###### ERROR ERROR ######~n~p~n", [AcTuAlReS]), - ?line exit(AcTuAlReS) + exit(AcTuAlReS) end end()). @@ -87,12 +87,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 = proplists:get_value(watchdog, Config), test_server:timetrap_cancel(Dog), ok. @@ -131,8 +131,7 @@ app_test(_Config) -> -event_objects_api(doc) -> ["Testing the CosEvent API to setup a complete service", ""]; -event_objects_api(suite) -> []; +%% Testing the CosEvent API to setup a complete service event_objects_api(_Config) -> Ch = ?match({_,key,_,_,_,_}, cosEventApp:start_channel([{typecheck, true}, @@ -234,8 +233,7 @@ event_objects_api(_Config) -> ok. -events_api(doc) -> ["Testing the CosEvent API for sending events asynchronous", ""]; -events_api(suite) -> []; +%% Testing the CosEvent API for sending events asynchronous events_api(_Config) -> Ch = ?match({_,key,_,_,_,_}, cosEventApp:start_channel([{typecheck, true}, @@ -244,8 +242,7 @@ events_api(_Config) -> event_sender(Ch). -events_sync_api(doc) -> ["Testing the CosEvent API for sending events synchronous", ""]; -events_sync_api(suite) -> []; +%% Testing the CosEvent API for sending events synchronous events_sync_api(_Config) -> Ch = ?match({_,key,_,_,_,_}, cosEventApp:start_channel([{typecheck, true}, |