From 357687bd39fcedff912a0b6a95f1b60038eebd01 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 12 Oct 2010 10:58:55 +0200
Subject: Update cosTransaction tests to conform with common_test standard

---
 lib/cosTransactions/test/transactions_SUITE.erl | 31 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'lib/cosTransactions/test/transactions_SUITE.erl')

diff --git a/lib/cosTransactions/test/transactions_SUITE.erl b/lib/cosTransactions/test/transactions_SUITE.erl
index da6ef86e82..9a8aa8981a 100644
--- a/lib/cosTransactions/test/transactions_SUITE.erl
+++ b/lib/cosTransactions/test/transactions_SUITE.erl
@@ -28,7 +28,7 @@
 -include_lib("cosTransactions/include/CosTransactions.hrl").
 -include("etrap_test_lib.hrl").
  
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(20)).
 
@@ -36,21 +36,30 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, resource_api/1, etrap_api/1,
-	init_per_testcase/2, end_per_testcase/2, app_test/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
+	 init_per_suite/1, end_per_suite/1, resource_api/1, etrap_api/1,
+	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
  
 %%-----------------------------------------------------------------
 %% Func: all/1
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosTransactions interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
+all() -> 
+cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
  
-cases() ->
-    [etrap_api, resource_api, app_test].
+cases() -> 
+[etrap_api, resource_api, app_test].
 
 
 	
@@ -76,7 +85,7 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     mnesia:delete_schema([node()]),
     mnesia:create_schema([node()]),
     orber:install([node()]),
@@ -89,7 +98,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     application:stop(orber),
     application:stop(mnesia),
     mnesia:delete_schema([node()]),
-- 
cgit v1.2.3