Update ic tests to conform with common_test standard

1 files changed, 20 insertions, 11 deletions

diff --git a/lib/ic/test/ic_register_SUITE.erl b/lib/ic/test/ic_register_SUITE.erl
index 0ddf8ff95c..6531030dc8 100644
--- a/lib/ic/test/ic_register_SUITE.erl
+++ b/lib/ic/test/ic_register_SUITE.erl
@@ -26,12 +26,12 @@
 %%-----------------------------------------------------------------
 -module(ic_register_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, init_all/1, finish_all/1, ifr_reg_unreg/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_suite/1, end_per_suite/1, ifr_reg_unreg/1]).
 -export([ifr_inheritence_reg/1,ifr_reg_unreg_with_inheritence/1]).
 -export([ifr_reg_unreg_with_inheritence_bad_order/1]).
 
@@ -57,20 +57,29 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+all() -> 
+cases().
 
-cases() ->
-    [ifr_reg_unreg,ifr_reg_unreg_with_inheritence,
-     ifr_reg_unreg_with_inheritence_bad_order,ifr_inheritence_reg].
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+cases() -> 
+[ifr_reg_unreg, ifr_reg_unreg_with_inheritence,
+ ifr_reg_unreg_with_inheritence_bad_order,
+ ifr_inheritence_reg].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
 
-init_all(Config) ->
+init_per_suite(Config) ->
     io:format("Setting up.....~n"),
     mnesia:stop(),
     mnesia:delete_schema([node()]),
@@ -85,7 +94,7 @@ init_all(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     io:format("Setting down.....~n"),
     orber:stop(),
     orber:uninstall(),