allow comparison of int with 64 bit integer type (see #10637)

[wxWidgets.git] / include / wx / cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 81dcbe2ef2c75afa1d4906ba334158f0ee984c73..bd131dd57af4e7afe52bcd709060a4a4d1d23bf7 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -87,6 +87,15 @@ CPPUNIT_NS_BEGIN
 
 // 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 char *actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals(wxString(expected), wxString(actual), sourceLine, message);
+}
+
 inline void
 assertEquals(const char *expected,
              const wxString& actual,
@@ -96,6 +105,15 @@ assertEquals(const char *expected,
     assertEquals(wxString(expected), actual, sourceLine, message);
 }
 
+inline void
+assertEquals(const wxString& expected,
+             const char *actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals(expected, wxString(actual), sourceLine, message);
+}
+
 inline void
 assertEquals(const wchar_t *expected,
              const wxString& actual,
@@ -105,6 +123,15 @@ assertEquals(const wchar_t *expected,
     assertEquals(wxString(expected), actual, sourceLine, message);
 }
 
+inline void
+assertEquals(const wxString& expected,
+             const wchar_t *actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals(expected, wxString(actual), sourceLine, message);
+}
+
 CPPUNIT_NS_END
 
 // define an assertEquals() overload for the given types, this is a helper and
@@ -137,6 +164,7 @@ CPPUNIT_NS_END
     #define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
         CPPUNIT_NS_BEGIN \
             WX_CPPUNIT_ASSERT_EQUALS(int, T) \
+            WX_CPPUNIT_ASSERT_EQUALS(T, int) \
             WX_CPPUNIT_ASSERT_EQUALS(T, T) \
         CPPUNIT_NS_END
 
@@ -147,12 +175,19 @@ CPPUNIT_NS_END
     #define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
         CPPUNIT_NS_BEGIN \
             WX_CPPUNIT_ASSERT_EQUALS(int, T) \
+            WX_CPPUNIT_ASSERT_EQUALS(T, int) \
         CPPUNIT_NS_END
 #endif // VC6/!VC6
 
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(size_t)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
+
+#if defined(wxLongLong_t) && !defined(wxLongLongIsLong)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)
+#endif
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string