Merge branch 'dev' into bmk/snmp/snmpc/OTP-9004

1 files changed, 26 insertions, 16 deletions

diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index ee77ef0c4e..bd87ce24d9 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,10 +22,12 @@
 %%%----------------------------------------------------------------------
 
 -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,fin_per_testcase/2]).
+-export([all/0, suite/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 +38,27 @@
 
 %% 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}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-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].
+all() -> 
+    cases().
 
-init_all(Config) when is_list(Config) ->
+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_per_suite(Config) when is_list(Config) ->
     case case code:priv_dir(jinterface) of
 	     {error,bad_name} -> 
 		 false;
@@ -76,7 +86,7 @@ find_executable([E|T]) ->
 	Path -> Path
     end.
 
-finish_all(Config) -> Config.
+end_per_suite(Config) -> Config.
 
 
 
@@ -98,7 +108,7 @@ init_per_testcase(_Case, Config) ->
     WatchDog = test_server:timetrap(test_server:seconds(20)),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     DataDir = ?config(data_dir, Config),
     code:del_path(DataDir),
     WatchDog = ?config(watchdog, Config),