revert r60023 and really fixed compilation problems caused by r60017 by providing...

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index abf423e3f93af0e3b520bf4c4b4f8cae7668594b..2cdadbbd776d5a15ad041364c87cbc251013a697 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -89,15 +89,15 @@ CPPUNIT_NS_BEGIN
 // compare wxStrings directly with C strings
 inline void
 assertEquals(const char *expected,
-             const wxString& actual,
+             const char *actual,
              CppUnit::SourceLine sourceLine,
              const std::string& message)
 {
-    assertEquals(wxString(expected), actual, sourceLine, message);
+    assertEquals(wxString(expected), wxString(actual), sourceLine, message);
 }
 
 inline void
-assertEquals(const wchar_t *expected,
+assertEquals(const char *expected,
              const wxString& actual,
              CppUnit::SourceLine sourceLine,
              const std::string& message)
@@ -105,30 +105,85 @@ assertEquals(const wchar_t *expected,
     assertEquals(wxString(expected), actual, sourceLine, message);
 }
 
-// and another to be able to specify (usually literal) ints as expected values
-// for functions returning size_t
 inline void
-assertEquals(int expected,
-             size_t actual,
+assertEquals(const wxString& expected,
+             const char *actual,
              CppUnit::SourceLine sourceLine,
              const std::string& message)
 {
-    assertEquals(size_t(expected), actual, sourceLine, message);
+    assertEquals(expected, wxString(actual), sourceLine, message);
+}
+
+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, slightly different, for checking that result of potentially
-// different time_t type is the same as given time_t value
 inline void
-assertEquals(time_t expected,
-             long actual,
+assertEquals(const wxString& expected,
+             const wchar_t *actual,
              CppUnit::SourceLine sourceLine,
              const std::string& message)
 {
-    assertEquals(expected, time_t(actual), sourceLine, message);
+    assertEquals(expected, wxString(actual), sourceLine, message);
 }
 
 CPPUNIT_NS_END
 
+// define an assertEquals() overload for the given types, this is a helper and
+// shouldn't be used directly because of VC6 complications, see below
+#define WX_CPPUNIT_ASSERT_EQUALS(T1, T2)                                      \
+    inline void                                                               \
+    assertEquals(T1 expected,                                                 \
+                 T2 actual,                                                   \
+                 CppUnit::SourceLine sourceLine,                              \
+                 const std::string& message)                                  \
+    {                                                                         \
+        if ( !assertion_traits<T1>::equal(expected,actual) )                  \
+        {                                                                     \
+            Asserter::failNotEqual( assertion_traits<T1>::toString(expected), \
+                                    assertion_traits<T2>::toString(actual),   \
+                                    sourceLine,                               \
+                                    message );                                \
+        }                                                                     \
+    }
+
+// this macro allows us to specify (usually literal) ints as expected values
+// for functions returning integral types different from "int"
+//
+// FIXME-VC6: due to incorrect resolution of overloaded/template functions in
+//            this compiler (it basically doesn't use the template version at
+//            all if any overloaded function matches partially even if none of
+//            them matches fully) we also need to provide extra overloads
+
+#ifdef __VISUALC6__
+    #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
+
+    CPPUNIT_NS_BEGIN
+        WX_CPPUNIT_ASSERT_EQUALS(int, int)
+    CPPUNIT_NS_END
+#else // !VC6
+    #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(unsigned)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
+
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string
 //
@@ -151,6 +206,10 @@ CPPUNIT_NS_END
 #define WX_ASSERT_MESSAGE(msg, cond) \
     CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond))
 
+#define WX_ASSERT_EQUAL_MESSAGE(msg, expected, actual) \
+    CPPUNIT_ASSERT_EQUAL_MESSAGE(std::string(wxString::Format msg .mb_str()), \
+                                 (expected), (actual))
+
 ///////////////////////////////////////////////////////////////////////////////
 // define stream inserter for wxString if it's not defined in the main library,
 // we need it to output the test failures involving wxString
@@ -169,6 +228,8 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 #endif
 }
 
+#endif // !wxUSE_STD_IOSTREAM
+
 // VC6 doesn't provide overloads for operator<<(__int64) in its stream classes
 // so do it ourselves
 #if defined(__VISUALC6__) && defined(wxLongLong_t)
@@ -191,8 +252,6 @@ inline std::ostream& operator<<(std::ostream& ostr, unsigned wxLongLong_t llu)
 
 #endif // VC6 && wxLongLong_t
 
-#endif // !wxUSE_STD_IOSTREAM
-
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.
 //