always call SetIcon() on the main frame of the sample; some small cleanup

[wxWidgets.git] / tests / testprec.h

diff --git a/tests/testprec.h b/tests/testprec.h
index 1ec2054d6bf853f258283122f534827d8cd7bae6..3342bb01a8808481b0a9eb864f4f06c86f3aa860 100644 (file)
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -1,32 +1,4 @@
 #include "wx/wxprec.h"
-
-#include <string>
-
-// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxString objects
-//
-// NB: at least for VC7.1 the specialization must be done before cppunit
-//     headers inclusion as otherwise it's just ignored!
-namespace CppUnit
-{
-
-template <typename T> struct assertion_traits;
-
-template <>
-struct assertion_traits<wxString>
-{
-    static bool equal(const wxString& s1, const wxString& s2)
-    {
-      return s1 == s2;
-    }
-
-    static std::string toString(const wxString& s)
-    {
-      return std::string(s.mb_str());
-    }
-};
-
-} // namespace CppUnit
-
 #include "wx/cppunit.h"
 
 // define wxHAVE_U_ESCAPE if the compiler supports \uxxxx character constants
@@ -35,6 +7,32 @@ struct assertion_traits<wxString>
     #define wxHAVE_U_ESCAPE
 #endif
 
-#define CPPUNIT_ASSERT_STR_EQUAL(s1, s2)                                      \
-    CPPUNIT_ASSERT_EQUAL( wxString(s1), wxString(s2) )
+// thrown when assert fails in debug build
+class TestAssertFailure { };
+
+// macro to use for the functions which are supposed to fail an assertion
+#ifdef __WXDEBUG__
+    // some old cppunit versions don't define CPPUNIT_ASSERT_THROW so roll our
+    // own
+    #define WX_ASSERT_FAILS_WITH_ASSERT(cond) \
+        { \
+            bool throwsAssert = false; \
+            try { cond ; } \
+            catch ( const TestAssertFailure& ) { throwsAssert = true; } \
+            if ( !throwsAssert ) \
+                CPPUNIT_FAIL("expected assertion not generated"); \
+        }
+#else
+    // there are no assertions in non-debug build so just check that it fails
+    #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
+#endif
+
+// these functions can be used to hook into wxApp event processing and are
+// currently used by the events propagation test
+class WXDLLIMPEXP_FWD_BASE wxEvent;
+
+typedef int (*FilterEventFunc)(wxEvent&);
+typedef bool (*ProcessEventFunc)(wxEvent&);
 
+extern void SetFilterEventFunc(FilterEventFunc func);
+extern void SetProcessEventFunc(ProcessEventFunc func);