fixes potential crash under gatekeeper

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

diff --git a/tests/events/stopwatch.cpp b/tests/events/stopwatch.cpp
index f50da74306beaf553ccbbaea4ee9732f8b6a5d04..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"
 
 #include "wx/stopwatch.h"
 #include "wx/utils.h"
 

+namespace
+{
+
+const long tolerance = 50;  // in ms
+const int sleepTime = 500;
+
+} // anonymous namespace
+

 // --------------------------------------------------------------------------
 // test class
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // test class
 // --------------------------------------------------------------------------


@@ -39,10 +47,12 @@ private:
     CPPUNIT_TEST_SUITE( StopWatchTestCase );
         CPPUNIT_TEST( Misc );
         CPPUNIT_TEST( BackwardsClockBug );
     CPPUNIT_TEST_SUITE( StopWatchTestCase );
         CPPUNIT_TEST( Misc );
         CPPUNIT_TEST( BackwardsClockBug );

+        CPPUNIT_TEST( RestartBug );

     CPPUNIT_TEST_SUITE_END();
 
     void Misc();
     void BackwardsClockBug();
     CPPUNIT_TEST_SUITE_END();
 
     void Misc();
     void BackwardsClockBug();

+    void RestartBug();

 
     DECLARE_NO_COPY_CLASS(StopWatchTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(StopWatchTestCase)
 };


@@ -55,8 +65,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StopWatchTestCase, "StopWatchTestCase" );
 
 void StopWatchTestCase::Misc()
 {
 
 void StopWatchTestCase::Misc()
 {

-    static const long tolerance = 10;  // in ms
-

     wxStopWatch sw;
     long t;
     wxLongLong usec;
     wxStopWatch sw;
     long t;
     wxLongLong usec;


@@ -81,7 +89,6 @@ void StopWatchTestCase::Misc()
         t >= 0 && t < tolerance
     );
 
         t >= 0 && t < tolerance
     );
 

-    static const int sleepTime = 500;

     sw.Resume();
     wxMilliSleep(sleepTime);
     t = sw.Time();
     sw.Resume();
     wxMilliSleep(sleepTime);
     t = sw.Time();


@@ -124,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
+    );
+}