diff options
| author | Lukas Larsson <[email protected]> | 2010-10-12 10:38:22 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-17 17:25:13 +0100 |
| commit | 670f41232381c6c1a47101349567caf9303dea8f (patch) | |
| tree | bc066476eec16c41a0f2be54d9fa63eb9bf43919 /lib/orber/test/orber_firewall_ipv6_out_SUITE.erl | |
| parent | 486455c2ecae11713fc8750a127caf2c853bedee (diff) | |
| download | otp-670f41232381c6c1a47101349567caf9303dea8f.tar.gz otp-670f41232381c6c1a47101349567caf9303dea8f.tar.bz2 otp-670f41232381c6c1a47101349567caf9303dea8f.zip | |
Update orber tests to conform with common_test standard
Diffstat (limited to 'lib/orber/test/orber_firewall_ipv6_out_SUITE.erl')
| -rw-r--r-- | lib/orber/test/orber_firewall_ipv6_out_SUITE.erl | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl index dcd3adad8f..75711a1e1a 100644 --- a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl +++ b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl @@ -20,7 +20,7 @@ -module(orber_firewall_ipv6_out_SUITE). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include_lib("orber/include/corba.hrl"). -include_lib("orber/COSS/CosNaming/CosNaming.hrl"). -include_lib("orber/src/orber_iiop.hrl"). @@ -49,7 +49,7 @@ %%----------------------------------------------------------------- %% External 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, deny_port_api/1, deny_port_range_api/1, deny_host_api/1, allow_port_api/1, allow_port_range_api/1, allow_host_api/1, @@ -60,18 +60,26 @@ %% Args: %% Returns: %%----------------------------------------------------------------- -all(doc) -> ["API tests for orber's firewall functionallity."]; -all(suite) -> {req, - [mnesia], - {conf, init_all, cases(), finish_all}}. +all() -> +cases(). + +groups() -> + []. + +init_per_group(_GroupName, Config) -> + Config. + +end_per_group(_GroupName, Config) -> + Config. + %% NOTE - the fragment test cases must bu first since we explicitly set a request %% id. Otherwise, the request-id counter would be increased and we cannot know %% what it is. -cases() -> - [deny_port_api, deny_port_range_api, deny_host_api, - allow_port_api, allow_port_range_api, allow_host_api, - local_interface_api]. +cases() -> +[deny_port_api, deny_port_range_api, deny_host_api, + allow_port_api, allow_port_range_api, allow_host_api, + local_interface_api]. init_per_testcase(_Case, Config) -> @@ -88,7 +96,7 @@ end_per_testcase(_Case, Config) -> test_server:timetrap_cancel(Dog), ok. -init_all(Config) -> +init_per_suite(Config) -> case orber_test_lib:version_ok() of true -> if @@ -101,7 +109,7 @@ init_all(Config) -> Reason end. -finish_all(Config) -> +end_per_suite(Config) -> Config. |