[bcl] Remove more NET_2_0 checks from class libs

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

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
index f1e15738937e19ec0e3549abe3959afedfaee646..0a0083381f12a75d7b617b187c31abf290dcf632 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
@@ -389,7 +389,6 @@ namespace MonoTests.System.Windows.Forms
                        try {\r
                                nud.Value = 1000;\r
                                Assert.Fail ("#A1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#A2");\r
                                Assert.IsNotNull (ex.Message, "#A3");\r
@@ -397,19 +396,10 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual ("Value", ex.ParamName, "#A5");\r
                                Assert.IsNull (ex.InnerException, "#A6");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");\r
-                               Assert.IsNotNull (ex.Message, "#A3");\r
-                               Assert.IsNull (ex.ParamName, "#A4");\r
-                               Assert.IsNull (ex.InnerException, "#A5");\r
-                       }\r
-#endif\r
 \r
                        try {\r
                                nud.Value = 1000;\r
                                Assert.Fail ("#B1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#B2");\r
                                Assert.IsNotNull (ex.Message, "#B3");\r
@@ -417,19 +407,10 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual ("Value", ex.ParamName, "#B5");\r
                                Assert.IsNull (ex.InnerException, "#B6");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");\r
-                               Assert.IsNotNull (ex.Message, "#B3");\r
-                               Assert.IsNull (ex.ParamName, "#B4");\r
-                               Assert.IsNull (ex.InnerException, "#B5");\r
-                       }\r
-#endif\r
 \r
                        try {\r
                                nud.Value = -1000;\r
                                Assert.Fail ("#C1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#C2");\r
                                Assert.IsNotNull (ex.Message, "#C3");\r
@@ -437,14 +418,6 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual ("Value", ex.ParamName, "#C5");\r
                                Assert.IsNull (ex.InnerException, "#C6");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#C2");\r
-                               Assert.IsNotNull (ex.Message, "#C3");\r
-                               Assert.IsNull (ex.ParamName, "#C4");\r
-                               Assert.IsNull (ex.InnerException, "#C5");\r
-                       }\r
-#endif\r
 \r
                        nud.BeginInit ();\r
 \r
@@ -458,7 +431,6 @@ namespace MonoTests.System.Windows.Forms
                        try {\r
                                nud.Value = -1000;\r
                                Assert.Fail ("#E1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#E2");\r
                                Assert.IsNotNull (ex.Message, "#E3");\r
@@ -466,14 +438,6 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual ("Value", ex.ParamName, "#E5");\r
                                Assert.IsNull (ex.InnerException, "#E6");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#E2");\r
-                               Assert.IsNotNull (ex.Message, "#E3");\r
-                               Assert.IsNull (ex.ParamName, "#E4");\r
-                               Assert.IsNull (ex.InnerException, "#E5");\r
-                       }\r
-#endif\r
                }\r
 \r
                void NumericUpDown_TextChanged (object sender, EventArgs e)\r
@@ -900,7 +864,6 @@ namespace MonoTests.System.Windows.Forms
                        try {\r
                                dud.SelectedIndex = -2;\r
                                Assert.Fail ("#A1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#A2");\r
                                Assert.IsNotNull (ex.Message, "#A3");\r
@@ -908,19 +871,10 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual ("SelectedIndex", ex.ParamName, "#A5");\r
                                Assert.IsNull (ex.InnerException, "#A6");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");\r
-                               Assert.IsNotNull (ex.Message, "#A3");\r
-                               Assert.IsNull (ex.ParamName, "#A4");\r
-                               Assert.IsNull (ex.InnerException, "#A5");\r
-                       }\r
-#endif\r
 \r
                        try {\r
                                dud.SelectedIndex = 1;\r
                                Assert.Fail ("#B1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#A2");\r
                                Assert.IsNotNull (ex.Message, "#A3");\r
@@ -928,14 +882,6 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual ("SelectedIndex", ex.ParamName, "#A5");\r
                                Assert.IsNull (ex.InnerException, "#A6");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");\r
-                               Assert.IsNotNull (ex.Message, "#B3");\r
-                               Assert.IsNull (ex.ParamName, "#B4");\r
-                               Assert.IsNull (ex.InnerException, "#B5");\r
-                       }\r
-#endif\r
                }\r
 \r
                [Test]\r
@@ -1048,7 +994,6 @@ namespace MonoTests.System.Windows.Forms
                        private readonly string _text;\r
                }\r
                \r
-#if NET_2_0\r
                [Test]\r
                public void Defaults ()\r
                {\r
@@ -1085,6 +1030,5 @@ namespace MonoTests.System.Windows.Forms
                                throw new Exception ("The method or operation is not implemented.");\r
                        }\r
                }\r
-#endif \r
        }\r
 }\r