Merge pull request #463 from strawd/concurrent-requests

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

diff --git a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
index 652160d14bc5c4bfa1fed86077469fb5059b3114..4a5fba96433f5d34cb525a71da93f67b59710c9a 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
@@ -37,24 +37,11 @@ namespace MonoTests.System.Data.Common {
 
        public class NonAbstractDBDataPermission : DBDataPermission {
 
-#if !NET_2_0
-               public NonAbstractDBDataPermission () 
-                       : base ()
-               {
-               }
-
-               public NonAbstractDBDataPermission (DBDataPermission permission, bool allowBlankPassword)
-                       : base (permission)
-               {
-                       AllowBlankPassword = allowBlankPassword;
-               }
-#else
                // make Copy and CreateInstance work :)
                public NonAbstractDBDataPermission () 
                        : base (PermissionState.None)
                {
                }
-#endif
                public NonAbstractDBDataPermission (PermissionState state)
                        : base (state)
                {
@@ -82,6 +69,9 @@ namespace MonoTests.System.Data.Common {
        }
 
        [TestFixture]
+#if MOBILE
+       [Ignore ("CAS is not supported and parts will be linked away")]
+#endif
        public class DBDataPermissionTest {
 
                private const string defaultConnectString = "Data Source=localhost;Integrated Security=SSPI;Initial Catalog=Northwind;";
@@ -97,44 +87,6 @@ namespace MonoTests.System.Data.Common {
                                Assert.AreEqual (count, dbdp.ToXml ().Children.Count, msg + ".Count");
                }
 
-#if !NET_2_0
-               [Test]
-               public void Constructor_Empty ()
-               {
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission ();
-                       Check ("Empty", dbdp, false, false, 0);
-               }
-#elif !NET_1_1
-               [Test]
-               [ExpectedException (typeof (ArgumentOutOfRangeException))]
-               public void Constructor_PermissionStateBoolean_Invalid ()
-               {
-                       PermissionState ps = (PermissionState) Int32.MinValue;
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-               }
-
-               [Test]
-               public void Constructor_PermissionStateBoolean_None ()
-               {
-                       PermissionState ps = PermissionState.None;
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-                       Check ("None,False", dbdp, false, false, 0);
-
-                       dbdp = new NonAbstractDBDataPermission (ps, true);
-                       Check ("None,True", dbdp, true, false, 0);
-               }
-
-               [Test]
-               public void Constructor_PermissionStateBoolean_Unrestricted ()
-               {
-                       PermissionState ps = PermissionState.Unrestricted;
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-                       Check ("Unrestricted,False", dbdp, false, true, 0);
-
-                       dbdp = new NonAbstractDBDataPermission (ps, true);
-                       Check ("Unrestricted,True", dbdp, true, true, 0);
-               }
-#endif
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
                public void Constructor_DBDataPermission_Null ()
@@ -187,11 +139,7 @@ namespace MonoTests.System.Data.Common {
                }
 
                [Test]
-#if NET_2_0
                [ExpectedException (typeof (ArgumentOutOfRangeException))]
-#else
-               [ExpectedException (typeof (ArgumentException))]
-#endif
                public void Constructor_PermissionState_Invalid ()
                {
                        PermissionState ps = (PermissionState) Int32.MinValue;
@@ -552,7 +500,7 @@ namespace MonoTests.System.Data.Common {
                {
                        NonAbstractDBDataPermission empty = new NonAbstractDBDataPermission (PermissionState.None);
                        NonAbstractDBDataPermission union = (NonAbstractDBDataPermission) empty.Union (empty);
-                       Assert.IsNotNull (union, "Empty U Empty");
+                       Assert.IsNull (union, "Empty U Empty");
 
                        NonAbstractDBDataPermission dbdp1 = new NonAbstractDBDataPermission (PermissionState.None);
                        dbdp1.Add (defaultConnectString, String.Empty, KeyRestrictionBehavior.AllowOnly);