Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include testdate.h before catch.hpp in unit tests

Browse Source 
This ensures that dates are printed out correctly if comparing them
fails.

It might be better to avoid always including this header, but this is
the simplest solution.
This commit is contained in:
Vadim Zeitlin
2017-11-30 21:52:46 +01:00
parent 0e65d91a38
commit 179dced0e0
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/datetime/datetimetest.cpp
View File

@@ -24,8 +24,6 @@
#include "wx/wxcrt.h" // for wxStrstr() #include "wx/wxcrt.h" // for wxStrstr()
#include "testdate.h"
// to test Today() meaningfully we must be able to change the system date which // 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 // is not usually the case, but if we're under Win32 we can try it -- define
// the macro below to do it // the macro below to do it

2
tests/testdate.h
View File

@@ -11,6 +11,8 @@
#include "wx/datetime.h" #include "wx/datetime.h"
#include <ostream>
// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects // need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects
inline std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) inline std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt)
{ {

4
tests/testprec.h
View File

@@ -4,6 +4,10 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/stopwatch.h" #include "wx/stopwatch.h"
#include "wx/evtloop.h" #include "wx/evtloop.h"
// This needs to be included before catch.hpp to be taken into account.
#include "testdate.h"
#include "wx/catch_cppunit.h" #include "wx/catch_cppunit.h"
// Custom test macro that is only defined when wxUIActionSimulator is available // Custom test macro that is only defined when wxUIActionSimulator is available