aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ic/test/java_client_erl_server_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-12 10:40:35 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:25:13 +0100
commit1137a924c290f72ed9c2213b38caaef8230cb005 (patch)
treea37692ae6abd8eb27c57d377654b258fa0e57ce6 /lib/ic/test/java_client_erl_server_SUITE.erl
parent87e168ba95f57d6d5de88c2b2f06d37039bb40e5 (diff)
downloadotp-1137a924c290f72ed9c2213b38caaef8230cb005.tar.gz
otp-1137a924c290f72ed9c2213b38caaef8230cb005.tar.bz2
otp-1137a924c290f72ed9c2213b38caaef8230cb005.zip
Update ic tests to conform with common_test standard
Diffstat (limited to 'lib/ic/test/java_client_erl_server_SUITE.erl')
-rw-r--r--lib/ic/test/java_client_erl_server_SUITE.erl34
1 files changed, 20 insertions, 14 deletions
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index 67bc536e28..f2683896ed 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -22,10 +22,10 @@
%%%----------------------------------------------------------------------
-module(java_client_erl_server_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
--export([all/1,init_all/1,finish_all/1,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,init_per_suite/1,end_per_suite/1,init_per_testcase/2,end_per_testcase/2]).
-export([marshal_ll/1,marshal_ull/1,
marshal_l/1,marshal_ul/1,
marshal_s/1,marshal_us/1,
@@ -36,19 +36,25 @@
%% Top of cases
-all(doc) ->
- "Test of IC with a Java-client and an Erlang generic server. "
- "The communication is via Erlang distribution.";
-all(suite) -> {conf,init_all,cases(),finish_all}.
+all() ->
+cases().
-cases() -> [marshal_ll,marshal_ull,
- marshal_l,marshal_ul,
- marshal_s,marshal_us,
- marshal_c,marshal_wc,
- marshal_str,
- marshal_any_3,marshal_any_2].
+groups() ->
+ [].
+
+init_per_group(_GroupName, Config) ->
+ Config.
+
+end_per_group(_GroupName, Config) ->
+ Config.
+
+
+cases() ->
+[marshal_ll, marshal_ull, marshal_l, marshal_ul,
+ marshal_s, marshal_us, marshal_c, marshal_wc,
+ marshal_str, marshal_any_3, marshal_any_2].
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
case case code:priv_dir(jinterface) of
{error,bad_name} ->
false;
@@ -76,7 +82,7 @@ find_executable([E|T]) ->
Path -> Path
end.
-finish_all(Config) -> Config.
+end_per_suite(Config) -> Config.