X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FTest%2FSystem.Data.Common%2FDBDataPermissionAttributeTest.cs;h=5aac0c0eeb63314dda770c7a5347d55eb88ea877;hb=66fd6fd24dd58ff1432279df13a385b0a78263e2;hp=2fabc3f906d0669647960ddaed7334eb5cfda50e;hpb=1fabd87b02f8d2e359150ed7a9e92613e60383bc;p=mono.git

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 2fabc3f906d..5aac0c0eeb6 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
@@ -27,47 +27,47 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using NUnit.Framework;
 using System;
 using System.Data;
 using System.Data.Common;
 using System.Security;
 using System.Security.Permissions;
 
-namespace MonoTests.System.Data.Common {
-
-	public class NonAbstractDBDataPermissionAttribute : DBDataPermissionAttribute {
+using NUnit.Framework;
 
+namespace MonoTests.System.Data.Common
+{
+	public class NonAbstractDBDataPermissionAttribute : DBDataPermissionAttribute
+	{
 		public NonAbstractDBDataPermissionAttribute (SecurityAction action)
 			: base (action)
 		{
 		}
 
-		public override IPermission CreatePermission()
-		{
-	 		return null;
-		}
+		public override IPermission CreatePermission()
+		{
+	 		return null;
+		}
 	}
 
 	[TestFixture]
-	public class DBDataPermissionAttributeTest {
-
+#if MOBILE
+	[Ignore ("CAS is not supported and parts will be linked away")]
+#endif
+	public class DBDataPermissionAttributeTest
+	{
 		[Test]
 		public void Default ()
 		{
 			DBDataPermissionAttribute a = new NonAbstractDBDataPermissionAttribute (SecurityAction.Assert);
-#if !TARGET_JVM			
 			Assert.AreEqual (a.ToString (), a.TypeId.ToString (), "TypeId");
-#endif			
 			Assert.IsFalse (a.Unrestricted, "Unrestricted");
 			Assert.IsFalse (a.AllowBlankPassword, "AllowBlankPassword");
 			Assert.AreEqual (String.Empty, a.ConnectionString, "ConnectionString");
 			Assert.AreEqual (KeyRestrictionBehavior.AllowOnly, a.KeyRestrictionBehavior, "KeyRestrictionBehavior");
 			Assert.AreEqual (String.Empty, a.KeyRestrictions, "KeyRestrictions");
-#if NET_2_0
 			Assert.IsFalse (a.ShouldSerializeConnectionString (), "ShouldSerializeConnectionString");
 			Assert.IsFalse (a.ShouldSerializeKeyRestrictions (), "ShouldSerializeConnectionString");
-#endif
 		}
 
 		[Test]
@@ -96,7 +96,7 @@ namespace MonoTests.System.Data.Common {
 		[Test]
 		public void Action_Invalid ()
 		{
-			DBDataPermissionAttribute a = new NonAbstractDBDataPermissionAttribute ((SecurityAction)Int32.MinValue);
+			new NonAbstractDBDataPermissionAttribute ((SecurityAction)Int32.MinValue);
 			// no validation in attribute
 		}
 
@@ -134,15 +134,22 @@ namespace MonoTests.System.Data.Common {
 		}
 
 		[Test]
-#if NET_2_0
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-#else
-		[ExpectedException (typeof (ArgumentException))]
-#endif
 		public void KeyRestrictionBehavior_Invalid ()
 		{
 			DBDataPermissionAttribute a = new NonAbstractDBDataPermissionAttribute (SecurityAction.Assert);
-			a.KeyRestrictionBehavior = (KeyRestrictionBehavior)Int32.MinValue;
+			try {
+				a.KeyRestrictionBehavior = (KeyRestrictionBehavior) 666;
+				Assert.Fail ("#1");
+			} catch (ArgumentOutOfRangeException ex) {
+				// The KeyRestrictionBehavior enumeration value, 666, is invalid
+				Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.IsTrue (ex.Message.IndexOf ("KeyRestrictionBehavior") != -1, "#5");
+				Assert.IsTrue (ex.Message.IndexOf ("666") != -1, "#6");
+				Assert.IsNotNull (ex.ParamName, "#7");
+				Assert.AreEqual ("KeyRestrictionBehavior", ex.ParamName, "#8");
+			}
 		}
 
 		[Test]
@@ -165,7 +172,7 @@ namespace MonoTests.System.Data.Common {
 
 			object [] attrs = t.GetCustomAttributes (typeof (AttributeUsageAttribute), false);
 			Assert.AreEqual (1, attrs.Length, "AttributeUsage");
-			AttributeUsageAttribute aua = (AttributeUsageAttribute)attrs [0];
+			AttributeUsageAttribute aua = (AttributeUsageAttribute) attrs [0];
 			Assert.IsTrue (aua.AllowMultiple, "AllowMultiple");
 			Assert.IsFalse (aua.Inherited, "Inherited");
 			AttributeTargets at = AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method;