Test case fixes

3 files changed, 27 insertions, 24 deletions

diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index cedbd1ef19..ddb491be6c 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%%-------------------------------------------------------------------
 %%% File    : wx_class_SUITE.erl
@@ -113,12 +113,14 @@ treeCtrl(Config) ->
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     Panel = wxPanel:new(Frame, []),
     Tree = ?mt(wxTreeCtrl,wxTreeCtrl:new(Panel, [{style , ?wxTR_HAS_BUTTONS}])),
-    Root = ?mt(wxTreeItemId, wxTreeCtrl:addRoot(Tree, "Root", [])),
-    Item1 = ?mt(wxTreeItemId, wxTreeCtrl:appendItem(Tree, Root, "Item1", [])),
-    ?m(ok, wxTreeCtrl:setItemData(Tree, Item1, {data, item1})),
-    Item2 = ?mt(wxTreeItemId, wxTreeCtrl:appendItem(Tree, Root, "Item2", [])),
-    ?m(ok, wxTreeCtrl:setItemData(Tree, Item2, {data, item2})),
-    Item3 = ?mt(wxTreeItemId, wxTreeCtrl:appendItem(Tree, Root, "Item3", [])),
+    Root = wxTreeCtrl:addRoot(Tree, "Root", []),
+    ?m(true, is_integer(Root)),
+    Item1 = wxTreeCtrl:appendItem(Tree, Root, "Item1", []),
+    ?m(true, is_integer(Item1)),
+    ?m(ok,  wxTreeCtrl:setItemData(Tree, Item1, {data, item1})),
+    Item2 = wxTreeCtrl:appendItem(Tree, Root, "Item2", []),
+    ?m(ok,  wxTreeCtrl:setItemData(Tree, Item2, {data, item2})),
+    Item3 = wxTreeCtrl:appendItem(Tree, Root, "Item3", []),
     ?m(ok, wxTreeCtrl:setItemData(Tree, Item3, {data, item3})),
     
     Sizer = wxBoxSizer:new(?wxVERTICAL),
@@ -373,7 +375,7 @@ radioBox(Config) ->
     io:format("TrSortRadioBox ~p ~n", [TrSortRadioBox]),
     %% If I uncomment any of these lines, it will crash
 
-    ?m(_, catch wxControlWithItems:setClientData(TrSortRadioBox, 0, timestamp)),
+    io:format("~p~n", [catch wxControlWithItems:setClientData(TrSortRadioBox, 0, timestamp)]),
     %?m(_, wxListBox:append(TrSortRadioBox, "Session Id", session_id)),
     %?m(_, wxListBox:insert(TrSortRadioBox, "Session Id", 0, session_id)),
 
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index 6f21c60d14..d5888bbf94 100644
--- a/lib/wx/test/wx_xtra_SUITE.erl
+++ b/lib/wx/test/wx_xtra_SUITE.erl
@@ -69,10 +69,11 @@ destroy_app_test(N) when N > 0 ->
     Wx = ?mr(wx_ref, wx:new()),    
     Frame = wxFrame:new(Wx, 1, "Destroy"),
     ?m(ok, wxFrame:destroy(Frame)),
-    wx:destroy(),
     receive 
 	Msg -> Msg
-    after 150 -> destroy_app_test(N-1)
+    after 150 -> 
+	    wx:destroy(),
+	    destroy_app_test(N-1)
     end;
 destroy_app_test(_) -> 
     receive 
@@ -184,7 +185,7 @@ menu_item_debug(Config) ->
     Frame = wxFrame:new(Wx, -1, "Button Fix"),
     wxFrame:connect(Frame, close_window),
 
-    FramePanel = wxPanel:new(Frame),
+    wxPanel:new(Frame),
     create_menus(Frame),
     wxWindow:show(Frame),
     wx_test_lib:wx_destroy(Frame,Config).
diff --git a/lib/wx/test/wxt.erl b/lib/wx/test/wxt.erl
index a346a6bdb8..1f5b1cc3b1 100644
--- a/lib/wx/test/wxt.erl
+++ b/lib/wx/test/wxt.erl
@@ -1,19 +1,19 @@
 %%
 %% %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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%%-------------------------------------------------------------------
 %%% File    : wxt.erl
@@ -58,16 +58,16 @@ user(Mod,Tc) when is_atom(Tc) ->
 %% Resolves the name of test suites and test cases
 %% according to the alias definitions. Single atoms
 %% are assumed to be the name of a test suite. 
-resolve(Suite0) when atom(Suite0) ->
+resolve(Suite0) when is_atom(Suite0) ->
     case alias(Suite0) of
-	Suite when atom(Suite) ->
+	Suite when is_atom(Suite) ->
 	    {Suite, all};
 	{Suite, Case} ->
 	    {Suite, Case}
     end;
-resolve({Suite0, Case}) when atom(Suite0), atom(Case) ->
+resolve({Suite0, Case}) when is_atom(Suite0), is_atom(Case) ->
     case alias(Suite0) of
-	Suite when atom(Suite) ->
+	Suite when is_atom(Suite) ->
 	    {Suite, Case};
 	{Suite, Case2} ->
 	    {Suite, Case2}