]> git.saurik.com Git - wxWidgets.git/commitdiff
Revert r66070: "Unload bogus XRC resources in "garbage" unit test."
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 21 Nov 2010 13:00:06 +0000 (13:00 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 21 Nov 2010 13:00:06 +0000 (13:00 +0000)
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

tests/misc/garbage.cpp

index 1f81940ca2c0e3dcb4017da70f5e706ef447545f..c866ea61ef6177ece97ba0e876c93b8c98d335dd 100644 (file)
@@ -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)