Merge pull request #3422 from xmcclure/tarjan-doublefan

[mono.git] / mcs / class / System.Data / Test / System.Data.Common / DBDataPermissionAttributeTest.cs

diff --git a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
index a8ff6acfa256b4b617a7ddcdf174e9f0366f5e9a..5aac0c0eeb63314dda770c7a5347d55eb88ea877 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
@@ -66,10 +66,8 @@ namespace MonoTests.System.Data.Common
                        Assert.AreEqual (String.Empty, a.ConnectionString, "ConnectionString");\r
                        Assert.AreEqual (KeyRestrictionBehavior.AllowOnly, a.KeyRestrictionBehavior, "KeyRestrictionBehavior");\r
                        Assert.AreEqual (String.Empty, a.KeyRestrictions, "KeyRestrictions");\r
-#if NET_2_0\r
                        Assert.IsFalse (a.ShouldSerializeConnectionString (), "ShouldSerializeConnectionString");\r
                        Assert.IsFalse (a.ShouldSerializeKeyRestrictions (), "ShouldSerializeConnectionString");\r
-#endif\r
                }\r
 \r
                [Test]\r
@@ -142,7 +140,6 @@ namespace MonoTests.System.Data.Common
                        try {\r
                                a.KeyRestrictionBehavior = (KeyRestrictionBehavior) 666;\r
                                Assert.Fail ("#1");\r
-#if NET_2_0\r
                        } catch (ArgumentOutOfRangeException ex) {\r
                                // The KeyRestrictionBehavior enumeration value, 666, is invalid\r
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#2");\r
@@ -153,17 +150,6 @@ namespace MonoTests.System.Data.Common
                                Assert.IsNotNull (ex.ParamName, "#7");\r
                                Assert.AreEqual ("KeyRestrictionBehavior", ex.ParamName, "#8");\r
                        }\r
-#else\r
-                       } catch (ArgumentException ex) {\r
-                               // The KeyRestrictionBehavior enumeration value, 666, is invalid\r
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");\r
-                               Assert.IsNull (ex.InnerException, "#3");\r
-                               Assert.IsNotNull (ex.Message, "#4");\r
-                               //Assert.IsTrue (ex.Message.IndexOf ("KeyRestrictionBehavior") != -1, "#5");\r
-                               //Assert.IsTrue (ex.Message.IndexOf ("666") != -1, "#6");\r
-                               //Assert.IsNull (ex.ParamName, "#7");\r
-                       }\r
-#endif\r
                }\r
 \r
                [Test]\r