X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ece5e6a47aef257ddf8488782d34712dbfb3e7f1..3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d:/tests/log/logtest.cpp diff --git a/tests/log/logtest.cpp b/tests/log/logtest.cpp index c03862816d..8c24835b43 100644 --- a/tests/log/logtest.cpp +++ b/tests/log/logtest.cpp @@ -19,43 +19,132 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/filefn.h" #endif // WX_PRECOMP +#include "wx/scopeguard.h" + +#if WXWIN_COMPATIBILITY_2_8 + // we override deprecated DoLog() and DoLogString() in this test, suppress + // warnings about it + #if wxCHECK_VISUALC_VERSION(7) + #pragma warning(disable: 4996) + #endif // VC++ 7+ +#endif // WXWIN_COMPATIBILITY_2_8 + +// all calls to wxLogXXX() functions from this file will use this log component +#define wxLOG_COMPONENT "test" + // ---------------------------------------------------------------------------- -// test logger +// test loggers // ---------------------------------------------------------------------------- -// simple log sink which just stores the messages logged for each level -class TestLog : public wxLog +// base class for all test loggers which simply store all logged messages for +// future examination in the test code +class TestLogBase : public wxLog { public: - TestLog() { } + TestLogBase() { } - wxString GetLog(wxLogLevel level) const + const wxString& GetLog(wxLogLevel level) const { return m_logs[level]; } + const wxLogRecordInfo& GetInfo(wxLogLevel level) const + { + return m_logsInfo[level]; + } + void Clear() { for ( unsigned n = 0; n < WXSIZEOF(m_logs); n++ ) + { m_logs[n].clear(); + m_logsInfo[n] = wxLogRecordInfo(); + } } protected: - virtual void DoLog(wxLogLevel level, const wxString& str, time_t WXUNUSED(t)) + wxString m_logs[wxLOG_Trace + 1]; + wxLogRecordInfo m_logsInfo[wxLOG_Trace + 1]; + + wxDECLARE_NO_COPY_CLASS(TestLogBase); +}; + +// simple log sink which just stores the messages logged for each level +class TestLog : public TestLogBase +{ +public: + TestLog() { } + +protected: + virtual void DoLogRecord(wxLogLevel level, + const wxString& msg, + const wxLogRecordInfo& info) + { + m_logs[level] = msg; + m_logsInfo[level] = info; + } + +private: + wxDECLARE_NO_COPY_CLASS(TestLog); +}; + +#if WXWIN_COMPATIBILITY_2_8 + +// log sink overriding the old DoLogXXX() functions should still work too + +// this one overrides DoLog(char*) +class CompatTestLog : public TestLogBase +{ +public: + CompatTestLog() { } + +protected: + virtual void DoLog(wxLogLevel level, const char *str, time_t WXUNUSED(t)) { m_logs[level] = str; } - wxSUPPRESS_DOLOG_HIDE_WARNING() + // get rid of the warning about hiding the other overload + virtual void DoLog(wxLogLevel WXUNUSED(level), + const wchar_t *WXUNUSED(str), + time_t WXUNUSED(t)) + { + } private: - wxString m_logs[wxLOG_Trace + 1]; + wxDECLARE_NO_COPY_CLASS(CompatTestLog); +}; - wxDECLARE_NO_COPY_CLASS(TestLog); +// and this one overload DoLogString(wchar_t*) +class CompatTestLog2 : public wxLog +{ +public: + CompatTestLog2() { } + + const wxString& Get() const { return m_msg; } + +protected: + virtual void DoLogString(const wchar_t *msg, time_t WXUNUSED(t)) + { + m_msg = msg; + } + + // get rid of the warning + virtual void DoLogString(const char *WXUNUSED(msg), time_t WXUNUSED(t)) + { + } + +private: + wxString m_msg; + + wxDECLARE_NO_COPY_CLASS(CompatTestLog2); }; +#endif // WXWIN_COMPATIBILITY_2_8 + // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -72,16 +161,28 @@ private: CPPUNIT_TEST_SUITE( LogTestCase ); CPPUNIT_TEST( Functions ); CPPUNIT_TEST( Null ); + CPPUNIT_TEST( Component ); #if wxDEBUG_LEVEL CPPUNIT_TEST( Trace ); #endif // wxDEBUG_LEVEL +#if WXWIN_COMPATIBILITY_2_8 + CPPUNIT_TEST( CompatLogger ); + CPPUNIT_TEST( CompatLogger2 ); +#endif // WXWIN_COMPATIBILITY_2_8 + CPPUNIT_TEST( SysError ); CPPUNIT_TEST_SUITE_END(); void Functions(); void Null(); + void Component(); #if wxDEBUG_LEVEL void Trace(); #endif // wxDEBUG_LEVEL +#if WXWIN_COMPATIBILITY_2_8 + void CompatLogger(); + void CompatLogger2(); +#endif // WXWIN_COMPATIBILITY_2_8 + void SysError(); TestLog *m_log; wxLog *m_logOld; @@ -137,25 +238,121 @@ void LogTestCase::Null() CPPUNIT_ASSERT_EQUAL( "Important warning", m_log->GetLog(wxLOG_Warning) ); } +void LogTestCase::Component() +{ + wxLogMessage("Message"); + CPPUNIT_ASSERT_EQUAL( wxLOG_COMPONENT, + m_log->GetInfo(wxLOG_Message).component ); + + // completely disable logging for this component + wxLog::SetComponentLevel("test/ignore", wxLOG_FatalError); + + // but enable it for one of its subcomponents + wxLog::SetComponentLevel("test/ignore/not", wxLOG_Max); + + #undef wxLOG_COMPONENT + #define wxLOG_COMPONENT "test/ignore" + + // this shouldn't be output as this component is ignored + wxLogError("Error"); + CPPUNIT_ASSERT_EQUAL( "", m_log->GetLog(wxLOG_Error) ); + + // and so are its subcomponents + #undef wxLOG_COMPONENT + #define wxLOG_COMPONENT "test/ignore/sub/subsub" + wxLogError("Error"); + CPPUNIT_ASSERT_EQUAL( "", m_log->GetLog(wxLOG_Error) ); + + // but one subcomponent is not + #undef wxLOG_COMPONENT + #define wxLOG_COMPONENT "test/ignore/not" + wxLogError("Error"); + CPPUNIT_ASSERT_EQUAL( "Error", m_log->GetLog(wxLOG_Error) ); + + // restore the original value + #undef wxLOG_COMPONENT + #define wxLOG_COMPONENT "test" +} + #if wxDEBUG_LEVEL +namespace +{ + +const char *TEST_MASK = "test"; + +// this is a test vararg function (a real one, not a variadic-template-like as +// wxVLogTrace(), so care should be taken with its arguments) +void TraceTest(const char *format, ...) +{ + va_list argptr; + va_start(argptr, format); + wxVLogTrace(TEST_MASK, format, argptr); + va_end(argptr); +} + +} // anonymous namespace + void LogTestCase::Trace() { - static const char *TEST_MASK = "test"; + // we use wxLogTrace() or wxVLogTrace() from inside TraceTest() + // interchangeably here, it shouldn't make any difference wxLogTrace(TEST_MASK, "Not shown"); CPPUNIT_ASSERT_EQUAL( "", m_log->GetLog(wxLOG_Trace) ); wxLog::AddTraceMask(TEST_MASK); - wxLogTrace(TEST_MASK, "Shown"); + TraceTest("Shown"); CPPUNIT_ASSERT_EQUAL( wxString::Format("(%s) Shown", TEST_MASK), m_log->GetLog(wxLOG_Trace) ); wxLog::RemoveTraceMask(TEST_MASK); m_log->Clear(); - wxLogTrace(TEST_MASK, "Not shown again"); + TraceTest("Not shown again"); CPPUNIT_ASSERT_EQUAL( "", m_log->GetLog(wxLOG_Trace) ); } #endif // wxDEBUG_LEVEL + +#if WXWIN_COMPATIBILITY_2_8 + +void LogTestCase::CompatLogger() +{ + CompatTestLog log; + wxLog * const logOld = wxLog::SetActiveTarget(&log); + wxON_BLOCK_EXIT1( wxLog::SetActiveTarget, logOld ); + + wxLogError("Old error"); + CPPUNIT_ASSERT_EQUAL( "Old error", log.GetLog(wxLOG_Error) ); +} + +void LogTestCase::CompatLogger2() +{ + CompatTestLog2 log; + wxLog * const logOld = wxLog::SetActiveTarget(&log); + wxON_BLOCK_EXIT1( wxLog::SetActiveTarget, logOld ); + + wxLogWarning("Old warning"); + CPPUNIT_ASSERT_EQUAL( "Old warning", log.Get() ); +} + +#endif // WXWIN_COMPATIBILITY_2_8 + +void LogTestCase::SysError() +{ + wxString s; + wxLogSysError("Success"); + CPPUNIT_ASSERT( m_log->GetLog(wxLOG_Error).StartsWith("Success (", &s) ); + CPPUNIT_ASSERT( s.StartsWith("error 0") ); + + wxLogSysError(17, "Error"); + CPPUNIT_ASSERT( m_log->GetLog(wxLOG_Error).StartsWith("Error (", &s) ); + CPPUNIT_ASSERT( s.StartsWith("error 17") ); + + wxOpen("no-such-file", 0, 0); + wxLogSysError("Not found"); + CPPUNIT_ASSERT( m_log->GetLog(wxLOG_Error).StartsWith("Not found (", &s) ); + WX_ASSERT_MESSAGE( ("Error message is \"(%s\"", s), s.StartsWith("error 2") ); +} +