X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eab67251b703ec913004b409dcb8ca73d214def..33e478497fa5b722a3d84dca2ccffb10ce181910:/tests/testprec.h

diff --git a/tests/testprec.h b/tests/testprec.h
index 3342bb01a8..f7d0e66c5c 100644
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -5,13 +5,42 @@
 #if (defined(__VISUALC__) && (__VISUALC__ >= 1300)) || \
     (defined(__GNUC__) && (__GNUC__ >= 3))
     #define wxHAVE_U_ESCAPE
+
+    // and disable warning that using them results in with MSVC 8+
+    #if wxCHECK_VISUALC_VERSION(8)
+        // universal-character-name encountered in source
+        #pragma warning(disable:4428)
+    #endif
 #endif
 
 // thrown when assert fails in debug build
-class TestAssertFailure { };
+class TestAssertFailure
+{
+public:
+    TestAssertFailure(const wxString& file,
+                      int line,
+                      const wxString& func,
+                      const wxString& cond,
+                      const wxString& msg)
+        : m_file(file),
+          m_line(line),
+          m_func(func),
+          m_cond(cond),
+          m_msg(msg)
+    {
+    }
+
+    const wxString m_file;
+    const int m_line;
+    const wxString m_func;
+    const wxString m_cond;
+    const wxString m_msg;
+
+    wxDECLARE_NO_ASSIGN_CLASS(TestAssertFailure);
+};
 
 // macro to use for the functions which are supposed to fail an assertion
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
     // some old cppunit versions don't define CPPUNIT_ASSERT_THROW so roll our
     // own
     #define WX_ASSERT_FAILS_WITH_ASSERT(cond) \
@@ -23,7 +52,7 @@ class TestAssertFailure { };
                 CPPUNIT_FAIL("expected assertion not generated"); \
         }
 #else
-    // there are no assertions in non-debug build so just check that it fails
+    // there are no assertions in this build so just check that it fails
     #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
 #endif
 
@@ -36,3 +65,17 @@ typedef bool (*ProcessEventFunc)(wxEvent&);
 
 extern void SetFilterEventFunc(FilterEventFunc func);
 extern void SetProcessEventFunc(ProcessEventFunc func);
+
+extern bool IsNetworkAvailable();
+
+// helper class setting the locale to "C" for its lifetime
+class CLocaleSetter
+{
+public:
+    CLocaleSetter() : m_locOld(setlocale(LC_ALL, "C")) { }
+    ~CLocaleSetter() { setlocale(LC_ALL, m_locOld); }
+
+private:
+    const char * const m_locOld;
+    wxDECLARE_NO_COPY_CLASS(CLocaleSetter);
+};