From d161dc2b44f29f184e60efcd460ed27b1ee0a0e1 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 6 Dec 2010 10:55:15 +0100 Subject: Update tests to work with ts -> ct migrations script. --- lib/wx/test/wx_app_SUITE.erl | 3 --- lib/wx/test/wx_basic_SUITE.erl | 6 ++---- lib/wx/test/wx_class_SUITE.erl | 4 +--- lib/wx/test/wx_event_SUITE.erl | 6 ++---- lib/wx/test/wx_opengl_SUITE.erl | 4 +--- lib/wx/test/wx_xtra_SUITE.erl | 4 +--- 6 files changed, 7 insertions(+), 20 deletions(-) (limited to 'lib/wx/test') diff --git a/lib/wx/test/wx_app_SUITE.erl b/lib/wx/test/wx_app_SUITE.erl index 8fff324913..cba7800f14 100644 --- a/lib/wx/test/wx_app_SUITE.erl +++ b/lib/wx/test/wx_app_SUITE.erl @@ -50,9 +50,6 @@ fin_per_testcase(Case, Config) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -all() -> - all(suite). - all(suite) -> [ fields, diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl index 599aa371ba..16fcac66d2 100644 --- a/lib/wx/test/wx_basic_SUITE.erl +++ b/lib/wx/test/wx_basic_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. +%% Copyright Ericsson AB 2008-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 @@ -23,7 +23,7 @@ %%% Created : 3 Nov 2008 by Dan Gudmundsson %%%------------------------------------------------------------------- -module(wx_basic_SUITE). --export([all/0, init_per_suite/1, end_per_suite/1, +-export([all/1, init_per_suite/1, end_per_suite/1, init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]). -compile(export_all). @@ -45,8 +45,6 @@ fin_per_testcase(Func,Config) -> %% For test_server wx_test_lib:end_per_testcase(Func,Config). %% SUITE specification -all() -> - all(suite). all(suite) -> [ create_window, diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index 7b8d510d40..9d9e001d3d 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -24,7 +24,7 @@ %%%------------------------------------------------------------------- -module(wx_class_SUITE). --export([all/0, init_per_suite/1, end_per_suite/1, +-export([all/1, init_per_suite/1, end_per_suite/1, init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]). -compile(export_all). @@ -46,8 +46,6 @@ fin_per_testcase(Func,Config) -> %% For test_server wx_test_lib:end_per_testcase(Func,Config). %% SUITE specification -all() -> - all(suite). all(suite) -> [ calendarCtrl, diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl index dea10d892e..5204acb978 100644 --- a/lib/wx/test/wx_event_SUITE.erl +++ b/lib/wx/test/wx_event_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. +%% Copyright Ericsson AB 2008-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,7 +22,7 @@ %%% Created : 3 Nov 2008 by Dan Gudmundsson %%%------------------------------------------------------------------- -module(wx_event_SUITE). --export([all/0, init_per_suite/1, end_per_suite/1, +-export([all/1, init_per_suite/1, end_per_suite/1, init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]). -compile(export_all). @@ -44,8 +44,6 @@ fin_per_testcase(Func,Config) -> %% For test_server wx_test_lib:end_per_testcase(Func,Config). %% SUITE specification -all() -> - all(suite). all(suite) -> [ connect, diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl index 778d089bce..51c7064e7c 100644 --- a/lib/wx/test/wx_opengl_SUITE.erl +++ b/lib/wx/test/wx_opengl_SUITE.erl @@ -22,7 +22,7 @@ %%% Created : 3 Nov 2008 by Dan Gudmundsson %%%------------------------------------------------------------------- -module(wx_opengl_SUITE). --export([all/0, init_per_suite/1, end_per_suite/1, +-export([all/1, init_per_suite/1, end_per_suite/1, init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]). -compile(export_all). @@ -52,8 +52,6 @@ fin_per_testcase(Func,Config) -> %% For test_server wx_test_lib:end_per_testcase(Func,Config). %% SUITE specification -all() -> - all(suite). all(suite) -> [ canvas, diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl index d5888bbf94..bf0a467eac 100644 --- a/lib/wx/test/wx_xtra_SUITE.erl +++ b/lib/wx/test/wx_xtra_SUITE.erl @@ -23,7 +23,7 @@ %%% Created : 3 Nov 2008 by Dan Gudmundsson %%%------------------------------------------------------------------- -module(wx_xtra_SUITE). --export([all/0, init_per_suite/1, end_per_suite/1, +-export([all/1, init_per_suite/1, end_per_suite/1, init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]). -compile(export_all). @@ -45,8 +45,6 @@ fin_per_testcase(Func,Config) -> %% For test_server wx_test_lib:end_per_testcase(Func,Config). %% SUITE specification -all() -> - all(suite). all(suite) -> [ destroy_app, -- cgit v1.2.3