From b90ee8c262e32636facdcf416d5462c6dbfcfe10 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sun, 3 Aug 2008 15:07:09 +0000 Subject: [PATCH] 2008-08-03 Zoltan Varga * TimerTest.cs: Simplify the EnabledInElapsed test to prevent various races. svn path=/trunk/mcs/; revision=109506 --- mcs/class/System/Test/System.Timers/ChangeLog | 4 +++ .../System/Test/System.Timers/TimerTest.cs | 25 +++++-------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/mcs/class/System/Test/System.Timers/ChangeLog b/mcs/class/System/Test/System.Timers/ChangeLog index b7424279faf..ce1d2342d2e 100644 --- a/mcs/class/System/Test/System.Timers/ChangeLog +++ b/mcs/class/System/Test/System.Timers/ChangeLog @@ -1,3 +1,7 @@ +2008-08-03 Zoltan Varga + + * TimerTest.cs: Simplify the EnabledInElapsed test to prevent various races. + 2007-10-30 Robert Jordan * TimerTest.cs: Enable test for bug #82701/#325368. diff --git a/mcs/class/System/Test/System.Timers/TimerTest.cs b/mcs/class/System/Test/System.Timers/TimerTest.cs index 6771742a42d..79643c9beca 100644 --- a/mcs/class/System/Test/System.Timers/TimerTest.cs +++ b/mcs/class/System/Test/System.Timers/TimerTest.cs @@ -46,7 +46,6 @@ namespace MonoTests.System.Timers public void SetUp () { timer = new Timer (); - _elapsedCount = 0; } [TearDown] @@ -208,20 +207,16 @@ namespace MonoTests.System.Timers [Test] // bug #325368 public void EnabledInElapsed () { + _elapsedCount = 0; + timer = new Timer (50); timer.AutoReset = false; timer.Elapsed += new ElapsedEventHandler (EnabledInElapsed_Elapsed); timer.Start (); - ST.Thread.Sleep (400); + ST.Thread.Sleep (200); timer.Stop (); - 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"); + Assert.IsTrue (_elapsedCount == 2, "#1 loss of events"); } [Test] @@ -233,18 +228,10 @@ namespace MonoTests.System.Timers void EnabledInElapsed_Elapsed (object sender, ElapsedEventArgs e) { - if (_elapsedCount < 0) - return; - _elapsedCount++; Timer t = sender as Timer; - if (t.Enabled) { - _elapsedCount = -2; - return; - } - t.Enabled = true; - if (!t.Enabled) - _elapsedCount = -1; + if (_elapsedCount == 1) + t.Enabled = true; } } -- 2.25.1