[bcl] Remove more NET_2_0 checks from class libs

[mono.git] / mcs / class / Managed.Windows.Forms / Test / System.Windows.Forms / TimerTest.cs

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TimerTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TimerTest.cs
index 2e5781a198b60edc59a07b702eb0f55d29165fcc..110dc71a6642bd9c65bb8b7904c4fb82fb58a38c 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TimerTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TimerTest.cs
@@ -23,11 +23,7 @@ namespace MonoTests.System.Windows.Forms
                bool Ticked;\r
                \r
                [Test ()]\r
-#if NET_2_0\r
                [ExpectedException (typeof (ArgumentOutOfRangeException))]\r
-#else\r
-               [ExpectedException (typeof (ArgumentException))]\r
-#endif\r
                public void IntervalException1 ()\r
                {\r
                        Timer timer = new Timer ();\r
@@ -35,11 +31,7 @@ namespace MonoTests.System.Windows.Forms
                }\r
 \r
                [Test ()]\r
-#if NET_2_0\r
                [ExpectedException (typeof (ArgumentOutOfRangeException))]\r
-#else\r
-               [ExpectedException (typeof (ArgumentException), "'-1' is not a valid value for Interval. Interval must be greater than 0.")]\r
-#endif\r
                public void IntervalException2 ()\r
                {\r
                        Timer timer = new Timer ();\r
@@ -54,11 +46,7 @@ namespace MonoTests.System.Windows.Forms
                }\r
 \r
                [Test ()]\r
-#if NET_2_0\r
                [ExpectedException (typeof (ArgumentOutOfRangeException))]\r
-#else\r
-               [ExpectedException (typeof (ArgumentException), "'-2147483648' is not a valid value for Interval. Interval must be greater than 0.")]\r
-#endif\r
                public void IntervalException4 ()\r
                {\r
                        Timer timer = new Timer ();\r
@@ -99,7 +87,6 @@ namespace MonoTests.System.Windows.Forms
                        }\r
                }\r
                \r
-#if NET_2_0\r
                [Test]\r
                public void TagTest ()\r
                {\r
@@ -107,7 +94,6 @@ namespace MonoTests.System.Windows.Forms
                        timer.Tag = "a";\r
                        Assert.AreEqual ("a", timer.Tag, "1");\r
                }\r
-#endif\r
 \r
                /* Application.DoEvents and Sleep are not guarenteed on Linux\r
                [Test]\r
@@ -150,9 +136,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (false, timer.Enabled, "E1");\r
                        Assert.AreEqual (100, timer.Interval, "I1");\r
                        Assert.AreEqual (null, timer.Site, "S1");\r
-#if NET_2_0\r
                        Assert.AreEqual (null, timer.Tag, "T1");\r
-#endif\r
                }\r
 \r
                [Test] // bug #325033\r