aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-12 11:00:23 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:28:29 +0100
commitba5a2a41565e994ffff087f918133688775f1943 (patch)
tree79f9cd1b478d0f35b646f925703137007c8b27f6
parent663982e3e8d2dc34353e342240fa80aca25a8923 (diff)
downloadotp-ba5a2a41565e994ffff087f918133688775f1943.tar.gz
otp-ba5a2a41565e994ffff087f918133688775f1943.tar.bz2
otp-ba5a2a41565e994ffff087f918133688775f1943.zip
Update et tests to conform with common_test standard
-rw-r--r--lib/et/test/et.spec3
-rw-r--r--lib/et/test/et_test_lib.erl2
-rw-r--r--lib/et/test/et_wx_SUITE.erl22
3 files changed, 16 insertions, 11 deletions
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