From a5f226861c387b03f64153945f67414c69c213fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 19 Jun 2011 22:46:42 +0000 Subject: [PATCH] Extract wxDateTime-related cppunit helpers in a separate header file. No real changes, just refactor the code to allow using CPPUNIT_ASSERT_EQUAL with wxDateTime in other tests in the future. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/datetime/datetimetest.cpp | 11 +---------- tests/testdate.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 tests/testdate.h diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index 8d1d4aa38b..f5af743b0c 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -22,18 +22,9 @@ #if wxUSE_DATETIME -#include "wx/datetime.h" #include "wx/wxcrt.h" // for wxStrstr() -// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects -static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) -{ - ostr << dt.FormatISOCombined(' '); - - return ostr; -} - -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t) +#include "testdate.h" // to test Today() meaningfully we must be able to change the system date which // is not usually the case, but if we're under Win32 we can try it -- define diff --git a/tests/testdate.h b/tests/testdate.h new file mode 100644 index 0000000000..5d28568da6 --- /dev/null +++ b/tests/testdate.h @@ -0,0 +1,25 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/testdate.h +// Purpose: Unit test helpers for dealing with wxDateTime. +// Author: Vadim Zeitlin +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TESTS_TESTDATE_H_ +#define _WX_TESTS_TESTDATE_H_ + +#include "wx/datetime.h" + +// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects +inline std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) +{ + ostr << dt.FormatISOCombined(' '); + + return ostr; +} + +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t) + +#endif // _WX_TESTS_TESTDATE_H_