Merge pull request #1514 from directhex/master

[mono.git] / mcs / class / System.Data / Test / System.Data.OleDb / OleDbPermissionAttributeTest.cs

diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs
index f645b6212cf1ac78d62b7da289d58a11a975c984..22e213f016c388bfd627abdb31a738f2cf2fe79f 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs
@@ -1,4 +1,4 @@
-//\r
+//\r
 // OleDbPermissionAttributeTest.cs -\r
 //     NUnit Test Cases for OleDbPermissionAttribute\r
 //\r
@@ -50,10 +50,8 @@ namespace MonoTests.System.Data.OleDb {
                        Assert.AreEqual (KeyRestrictionBehavior.AllowOnly, a.KeyRestrictionBehavior, "KeyRestrictionBehavior");\r
                        Assert.AreEqual (String.Empty, a.KeyRestrictions, "KeyRestrictions");\r
                        Assert.AreEqual (String.Empty, a.Provider, "Provider");\r
-#if NET_2_0\r
                        Assert.IsFalse (a.ShouldSerializeConnectionString (), "ShouldSerializeConnectionString");\r
                        Assert.IsFalse (a.ShouldSerializeKeyRestrictions (), "ShouldSerializeConnectionString");\r
-#endif\r
                        OleDbPermission odp = (OleDbPermission)a.CreatePermission ();\r
                        Assert.IsFalse (odp.IsUnrestricted (), "IsUnrestricted");\r
                }\r
@@ -79,14 +77,6 @@ namespace MonoTests.System.Data.OleDb {
                        Assert.AreEqual (SecurityAction.RequestOptional, a.Action, "Action=RequestOptional");\r
                        a.Action = SecurityAction.RequestRefuse;\r
                        Assert.AreEqual (SecurityAction.RequestRefuse, a.Action, "Action=RequestRefuse");\r
-#if NET_2_0\r
-                       a.Action = SecurityAction.DemandChoice;\r
-                       Assert.AreEqual (SecurityAction.DemandChoice, a.Action, "Action=DemandChoice");\r
-                       a.Action = SecurityAction.InheritanceDemandChoice;\r
-                       Assert.AreEqual (SecurityAction.InheritanceDemandChoice, a.Action, "Action=InheritanceDemandChoice");\r
-                       a.Action = SecurityAction.LinkDemandChoice;\r
-                       Assert.AreEqual (SecurityAction.LinkDemandChoice, a.Action, "Action=LinkDemandChoice");\r
-#endif\r
                }\r
 \r
                [Test]\r
@@ -147,11 +137,7 @@ namespace MonoTests.System.Data.OleDb {
                }\r
 \r
                [Test]\r
-#if NET_2_0\r
                [ExpectedException (typeof (ArgumentOutOfRangeException))]\r
-#else\r
-               [ExpectedException (typeof (ArgumentException))]\r
-#endif\r
                public void KeyRestrictionBehavior_Invalid ()\r
                {\r
                        OleDbPermissionAttribute a = new OleDbPermissionAttribute (SecurityAction.Assert);\r
@@ -190,12 +176,8 @@ namespace MonoTests.System.Data.OleDb {
                        Assert.AreEqual ("Mono", a.Provider, "Mono");\r
 \r
                        OleDbPermission odp = (OleDbPermission) a.CreatePermission ();\r
-#if NET_2_0\r
                        // provider isn't even supplied to permission in fx 2.0\r
                        Assert.AreEqual (String.Empty, odp.Provider, "CreatePermission.Provider");\r
-#else\r
-                       Assert.AreEqual ("Mono", odp.Provider, "CreatePermission.Provider");\r
-#endif\r
                }\r
 \r
                [Test]\r