Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -168,13 +168,13 @@ namespace MonoTests.System.Timers
timer.Enabled = true;
Assert.Fail ("#2");
} catch (Exception ex) {
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#3");
Assert.IsFalse (timer.Enabled);
Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#3");
Assert.IsTrue (timer.Enabled);
}
}
[Test]
[ExpectedException (typeof (ArgumentException))]
[ExpectedException (typeof (ArgumentOutOfRangeException))]
public void Interval_TooHigh_Enabled_Throw ()
{
timer.Interval = 100;
@ -201,7 +201,6 @@ namespace MonoTests.System.Timers
}
[Test]
[ExpectedException (typeof (ObjectDisposedException))]
public void Disposed_ThrowOnEnabled ()
{
timer.Interval = 100;