From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 21 Nov 2010 13:00:06 +0000 (+0000)
Subject: Revert r66070: "Unload bogus XRC resources in "garbage" unit test."
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f9ee3f4710fcd55fe7012721a69cf08857eb1abe

Revert r66070: "Unload bogus XRC resources in "garbage" unit test."

This change is not needed any longer after r66219 which fixed the real
underlying problem, i.e. that attempting to load an invalid XRC file resulted
in failures when loading all subsequent XRC files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/tests/misc/garbage.cpp b/tests/misc/garbage.cpp
index 1f81940ca2..c866ea61ef 100644
--- a/tests/misc/garbage.cpp
+++ b/tests/misc/garbage.cpp
@@ -149,16 +149,7 @@ void GarbageTestCase::DoLoadFile(const wxString& fullname)
     delete htmlwin;
 */
     // test wxXmlResource
-    bool loaded = wxXmlResource::Get()->Load(fullname);
-    wxXmlResource::Get()->Unload(fullname);
-    if ( loaded )
-    {
-        CPPUNIT_FAIL
-        (
-            wxString::Format("Unexpectedly succeeded loading XRC from '%s'",
-                             fullname).ToStdString()
-        );
-    }
+    CPPUNIT_ASSERT( wxXmlResource::Get()->Load(fullname) == false );
 }
 
 void GarbageTestCase::DoLoadStream(wxInputStream& stream)