2007-09-06 Robert Jordan <robertj@gmx.net>

	* TimerTest.cs: Factored our more test cases from bug #82701.

svn path=/trunk/mcs/; revision=85401

diff --git a/mcs/class/System/Test/System.Timers/ChangeLog b/mcs/class/System/Test/System.Timers/ChangeLog
index c4cf5c555014c5ea5ad27e6087edc55501ee5e59..a4a374fa5ee76d2b53e402b2109b07b1f0e1c2ae 100644 (file)
--- a/mcs/class/System/Test/System.Timers/ChangeLog
+++ b/mcs/class/System/Test/System.Timers/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-06  Robert Jordan  <robertj@gmx.net>
+
+       * TimerTest.cs: Factored our more test cases from bug #82701.
+
 2007-09-05  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * TimerTest.cs: Added NotWorking test for bug #82701. Added ctor

diff --git a/mcs/class/System/Test/System.Timers/TimerTest.cs b/mcs/class/System/Test/System.Timers/TimerTest.cs
index 521290326ff548b63ce63f2e389f8d0e586ea074..c3f4163cbf8d5f24cd59cf1809b315065db6b6f4 100644 (file)
--- a/mcs/class/System/Test/System.Timers/TimerTest.cs
+++ b/mcs/class/System/Test/System.Timers/TimerTest.cs
@@ -215,7 +215,14 @@ namespace MonoTests.System.Timers
 
                        ST.Thread.Sleep (400);
                        timer.Stop ();
-                       Assert.IsTrue (_elapsedCount > 2);
+
+                       if (_elapsedCount == -2)
+                               Assert.Fail ("#1 get_Enabled != false");
+
+                       if (_elapsedCount == -1)
+                               Assert.Fail ("#2 get_Enabled != true");
+
+                       Assert.IsTrue (_elapsedCount > 2,  "#3 loss of events");
                }
 
                [Test]
@@ -227,13 +234,13 @@ namespace MonoTests.System.Timers
 
                void EnabledInElapsed_Elapsed (object sender, ElapsedEventArgs e)
                {
-                       if (_elapsedCount == -1)
+                       if (_elapsedCount < 0)
                                return;
 
                        _elapsedCount++;
                        Timer t = sender as Timer;
                        if (t.Enabled) {
-                               _elapsedCount = -1;
+                               _elapsedCount = -2;
                                return;
                        }
                        t.Enabled = true;