X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FTest%2FSystem.Data.Common%2FDBDataPermissionTest.cs;h=4a5fba96433f5d34cb525a71da93f67b59710c9a;hb=559ad5b34bc086b51af2e589b32ea2eae0f78820;hp=ff8bd76f393dbadac8b95c70ba30b8e8e1caa555;hpb=0b3c3126ea203240ba9864ab9082c44935f32f4f;p=mono.git

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 ff8bd76f393..4a5fba96433 100644
--- 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)
 		{
@@ -152,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;
@@ -517,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);