From ba5a2a41565e994ffff087f918133688775f1943 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 12 Oct 2010 11:00:23 +0200
Subject: Update et tests to conform with common_test standard

---
 lib/et/test/et.spec         |  3 +--
 lib/et/test/et_test_lib.erl |  2 +-
 lib/et/test/et_wx_SUITE.erl | 22 ++++++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/et/test/et.spec b/lib/et/test/et.spec
index 69cd8d7582..f363993ab7 100644
--- a/lib/et/test/et.spec
+++ b/lib/et/test/et.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../et_test"}}.
-
+{suites,"et_test",all}.
diff --git a/lib/et/test/et_test_lib.erl b/lib/et/test/et_test_lib.erl
index 084e1de03b..c1bfeb9fc0 100644
--- a/lib/et/test/et_test_lib.erl
+++ b/lib/et/test/et_test_lib.erl
@@ -95,7 +95,7 @@ wx_init_per_suite(Config) ->
 					  exit({skipped, "Can not test on MacOSX"});
 				      {unix, _} ->
 					  io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
-					  case proplists:get_value(xserver, Config, none) of
+					  case ct:get_config(xserver, none) of
 					      none   -> ignore;
 					      Server -> os:putenv("DISPLAY", Server)
 					  end;
diff --git a/lib/et/test/et_wx_SUITE.erl b/lib/et/test/et_wx_SUITE.erl
index 91b1cb72a2..85926619fa 100644
--- a/lib/et/test/et_wx_SUITE.erl
+++ b/lib/et/test/et_wx_SUITE.erl
@@ -18,8 +18,8 @@
 
 -module(et_wx_SUITE).
 
--export([all/1, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_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]).
 
 -compile(export_all).
 
@@ -36,14 +36,20 @@ init_per_testcase(Func,Config) ->
     et_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     et_test_lib:end_per_testcase(Func,Config).
-end_per_testcase(Func,Config) -> %% For test_server
-    et_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all(suite) ->
-    [
-     start_all_windows
-    ].
+all() -> 
+[start_all_windows].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 %% The test cases
 
-- 
cgit v1.2.3