X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49297c840b6151d280b5747460383bc220e03a6a..4c1d5d5ae212f255662264677d21c7139f4c939d:/include/wx/cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index d961039112..e9cfbdfd9f 100644
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -29,6 +29,10 @@
     #pragma warn -8022
 #endif
 
+#ifndef CPPUNIT_STD_NEED_ALLOCATOR
+    #define CPPUNIT_STD_NEED_ALLOCATOR 0
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // Set the default format for the errors, which can be used by an IDE to jump
 // to the error location. This default gets overridden by the cppunit headers
@@ -51,6 +55,8 @@
 #include <cppunit/CompilerOutputter.h>
 #include "wx/afterstd.h"
 
+#include "wx/string.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // Set of helpful test macros.
@@ -77,23 +83,125 @@
 #define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \
     WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod))
 
-// Use this macro to compare a wxString with a literal string.
-#define WX_ASSERT_STR_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(wxString(p), s)
+CPPUNIT_NS_BEGIN
 
-// Use this macro to compare a size_t with a literal integer
-#define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m)
+// provide an overload of cppunit assertEquals(T, T) which can be used to
+// compare wxStrings directly with C strings
+inline void
+assertEquals(const char *expected,
+             const wxString& actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals(wxString(expected), actual, sourceLine, message);
+}
 
-///////////////////////////////////////////////////////////////////////////////
-// stream inserter for wxString
+inline void
+assertEquals(const wchar_t *expected,
+             const wxString& actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals(wxString(expected), actual, sourceLine, message);
+}
+
+// and another to be able to specify (usually literal) ints as expected values
+// for functions returning any of unsigned {int,long} or size_t
+inline void
+assertEquals(int expected,
+             unsigned actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals(unsigned(expected), actual, sourceLine, message);
+}
+
+inline void
+assertEquals(int expected,
+             unsigned long actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals((unsigned long)expected, actual, sourceLine, message);
+}
+
+// we also need this one to resolve ambiguity in the tests comparing unsigned
+// short (e.g. wxDateTime_t returned by several wxDateTime methods) with
+// literal integer constants
+inline void
+assertEquals(int expected,
+             unsigned short actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals((unsigned short)expected, actual, sourceLine, message);
+}
+
+CPPUNIT_NS_END
+
+// Use this macro to compare a wxArrayString with the pipe-separated elements
+// of the given string
 //
+// NB: it's a macro and not a function to have the correct line numbers in the
+//     test failure messages
+#define WX_ASSERT_STRARRAY_EQUAL(s, a)                                        \
+    {                                                                         \
+        wxArrayString expected(wxSplit(s, '|', '\0'));                        \
+                                                                              \
+        CPPUNIT_ASSERT_EQUAL( expected.size(), a.size() );                    \
+                                                                              \
+        for ( size_t n = 0; n < a.size(); n++ )                               \
+        {                                                                     \
+            CPPUNIT_ASSERT_EQUAL( expected[n], a[n] );                        \
+        }                                                                     \
+    }
+
+// Use this macro to assert with the given formatted message (it should contain
+// the format string and arguments in a separate pair of parentheses)
+#define WX_ASSERT_MESSAGE(msg, cond) \
+    CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond))
+
+///////////////////////////////////////////////////////////////////////////////
+// define stream inserter for wxString if it's not defined in the main library,
+// we need it to output the test failures involving wxString
+#if !wxUSE_STD_IOSTREAM
 
 #include "wx/string.h"
 
+#include <iostream>
+
 inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 {
-    return o << wxSafeConvertWX2MB(s);
+#if wxUSE_UNICODE
+    return o << (const char *)wxSafeConvertWX2MB(s.wc_str());
+#else
+    return o << s.c_str();
+#endif
 }
 
+// VC6 doesn't provide overloads for operator<<(__int64) in its stream classes
+// so do it ourselves
+#if defined(__VISUALC6__) && defined(wxLongLong_t)
+
+#include "wx/longlong.h"
+
+inline std::ostream& operator<<(std::ostream& ostr, wxLongLong_t ll)
+{
+    ostr << wxLongLong(ll).ToString();
+
+    return ostr;
+}
+
+inline std::ostream& operator<<(std::ostream& ostr, unsigned wxLongLong_t llu)
+{
+    ostr << wxULongLong(llu).ToString();
+
+    return ostr;
+}
+
+#endif // VC6 && wxLongLong_t
+
+#endif // !wxUSE_STD_IOSTREAM
 
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.