X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e5f6c1c4f79af395e094be3fa2957394e2e5825..3c01c5951189e13b8b4a5d7b288b54d4a57a30f8:/tests/regex/wxregextest.cpp diff --git a/tests/regex/wxregextest.cpp b/tests/regex/wxregextest.cpp index ee16ff81df..38286da82c 100644 --- a/tests/regex/wxregextest.cpp +++ b/tests/regex/wxregextest.cpp @@ -7,7 +7,7 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ # pragma hdrstop @@ -20,7 +20,6 @@ #if wxUSE_REGEX #include "wx/regex.h" -#include "wx/cppunit.h" #include "wx/tokenzr.h" #include @@ -170,7 +169,7 @@ void RegExReplaceTestCase::runTest() msgstr.Printf(_T("returns '%s' (expected '%s')"), text.c_str(), m_expected.c_str()); CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), text == m_expected); - msgstr.Printf(_T("matches %d times (expected %d)"), nRepl, m_count); + msgstr.Printf(_T("matches %d times (expected %d)"), (int)nRepl, (int)m_count); CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), nRepl == m_count); } @@ -328,7 +327,7 @@ wxString wxRegExTestSuite::FlagStr(int flags) } return _T(" (") + str.Mid(3) + _T(")"); -}; +} // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION(wxRegExTestSuite);