X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2a48d5cbc5b3764c6b578238ec6cc5f16c5dd0f..d9307d006e88025e28457290c9997f7c0f7c4fdc:/tests/scopeguard/scopeguardtest.cpp diff --git a/tests/scopeguard/scopeguardtest.cpp b/tests/scopeguard/scopeguardtest.cpp index 24c19fd981..3a6b3ff674 100644 --- a/tests/scopeguard/scopeguardtest.cpp +++ b/tests/scopeguard/scopeguardtest.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // RCS-ID: $Id$ // Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -21,6 +21,7 @@ #pragma hdrstop #endif +#include "wx/string.h" #include "wx/scopeguard.h" // ---------------------------------------------------------------------------- @@ -82,7 +83,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION(ScopeGuardTestCase); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ScopeGuardTestCase, "ScopeGuardTestCase"); @@ -232,9 +233,9 @@ void ScopeGuardTestCase::BlockExitSetVar() { wxON_BLOCK_EXIT_SET(s, "bye"); - WX_ASSERT_STR_EQUAL( "hi", s ); + CPPUNIT_ASSERT_EQUAL( "hi", s ); } - WX_ASSERT_STR_EQUAL( "bye", s ); + CPPUNIT_ASSERT_EQUAL( "bye", s ); ScopeGuardTestCase *p = this; {