Fix crashes after using "wildcard" wxEvtHandler::Disconnect().

[wxWidgets.git] / tests / events / stopwatch.cpp

diff --git a/tests/events/stopwatch.cpp b/tests/events/stopwatch.cpp
index a590dc326dee4ea5dca36852b89b1e9794bdca71..a3827877b6bde68e0f85ba0e08c13c175d9304ab 100644 (file)
--- a/tests/events/stopwatch.cpp
+++ b/tests/events/stopwatch.cpp
@@ -26,6 +26,14 @@
 #include "wx/stopwatch.h"
 #include "wx/utils.h"
 
+namespace
+{
+
+const long tolerance = 50;  // in ms
+const int sleepTime = 500;
+
+} // anonymous namespace
+
 // --------------------------------------------------------------------------
 // test class
 // --------------------------------------------------------------------------
@@ -39,10 +47,12 @@ private:
     CPPUNIT_TEST_SUITE( StopWatchTestCase );
         CPPUNIT_TEST( Misc );
         CPPUNIT_TEST( BackwardsClockBug );
+        CPPUNIT_TEST( RestartBug );
     CPPUNIT_TEST_SUITE_END();
 
     void Misc();
     void BackwardsClockBug();
+    void RestartBug();
 
     DECLARE_NO_COPY_CLASS(StopWatchTestCase)
 };
@@ -50,19 +60,26 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( StopWatchTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StopWatchTestCase, "StopWatchTestCase" );
 
 void StopWatchTestCase::Misc()
 {
-    static const long tolerance = 100;  // in ms
-
     wxStopWatch sw;
     long t;
+    wxLongLong usec;
 
     sw.Pause();         // pause it immediately
 
-    wxSleep(2);
+    // verify that almost no time elapsed
+    usec = sw.TimeInMicro();
+    WX_ASSERT_MESSAGE
+    (
+        ("Elapsed time was %" wxLongLongFmtSpec "dus", usec),
+        usec < tolerance*1000
+    );
+
+    wxSleep(1);
     t = sw.Time();
 
     // check that the stop watch doesn't advance while paused
@@ -73,26 +90,29 @@ void StopWatchTestCase::Misc()
     );
 
     sw.Resume();
-    wxSleep(3);
+    wxMilliSleep(sleepTime);
     t = sw.Time();
-    // check that it did advance now by ~3s
+    // check that it did advance now by ~1.5s
     WX_ASSERT_MESSAGE
     (
         ("Actual time value is %ld", t),
-        t > 3000 - tolerance && t < 3000 + tolerance
+        t > sleepTime - tolerance && t < sleepTime + tolerance
     );
 
     sw.Pause();
+
+    // check that this sleep won't be taken into account below
+    wxMilliSleep(sleepTime);
     sw.Resume();
 
-    wxSleep(2);
+    wxMilliSleep(sleepTime);
     t = sw.Time();
 
     // and it should advance again
     WX_ASSERT_MESSAGE
     (
         ("Actual time value is %ld", t),
-        t > 5000 - tolerance && t < 5000 + tolerance
+        t > 2*sleepTime - tolerance && t < 2*sleepTime + tolerance
     );
 }
 
@@ -111,3 +131,22 @@ void StopWatchTestCase::BackwardsClockBug()
         }
     }
 }
+
+void StopWatchTestCase::RestartBug()
+{
+    wxStopWatch sw;
+    sw.Pause();
+
+    // Calling Start() should resume the stopwatch if it was paused.
+    static const int offset = 5000;
+    sw.Start(offset);
+    wxMilliSleep(sleepTime);
+
+    long t = sw.Time();
+    WX_ASSERT_MESSAGE
+    (
+        ("Actual time value is %ld", t),
+        t > offset + sleepTime - tolerance &&
+            t < offset + sleepTime + tolerance
+    );
+}