X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem.Security.Permissions%2FUrlIdentityPermissionTest.cs;h=3b9cf6f9c002477643169717dffcf8d56d06daf0;hb=dc81fa58167996936120d7e171f328d33793eeb1;hp=d5b1cc8e573fd101e53c53666013b8a32dfa0dff;hpb=699e59742843044f6efa1726b7cb64f19d909e64;p=mono.git

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionTest.cs
index d5b1cc8e573..3b9cf6f9c00 100644
--- a/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionTest.cs
@@ -62,15 +62,17 @@ namespace MonoTests.System.Security.Permissions {
 		{
 			UrlIdentityPermission uip = new UrlIdentityPermission (PermissionState.None);
 #if NET_2_0
+			// that cause a NullReferenceException before 2.0
 			Assert.AreEqual (String.Empty, uip.Url, "Url");
 #endif
 			SecurityElement se = uip.ToXml ();
 			// only class and version are present
 			Assert.AreEqual (2, se.Attributes.Count, "Xml-Attributes");
 			Assert.IsNull (se.Children, "Xml-Children");
-
-//			UrlIdentityPermission copy = (UrlIdentityPermission)uip.Copy ();
-//			Assert.IsFalse (Object.ReferenceEquals (uip, copy), "ReferenceEquals");
+#if NET_2_0
+			UrlIdentityPermission copy = (UrlIdentityPermission)uip.Copy ();
+			Assert.IsFalse (Object.ReferenceEquals (uip, copy), "ReferenceEquals");
+#endif
 		}
 
 #if !NET_2_0
@@ -83,13 +85,29 @@ namespace MonoTests.System.Security.Permissions {
 		}
 #endif
 
+#if NET_2_0
+		[Test]
+		[Category ("NotWorking")]
+		public void PermissionStateUnrestricted ()
+		{
+			// In 2.0 Unrestricted are permitted for identity permissions
+			UrlIdentityPermission uip = new UrlIdentityPermission (PermissionState.Unrestricted);
+			Assert.AreEqual (String.Empty, uip.Url, "Url");
+			SecurityElement se = uip.ToXml ();
+			// only class and version are present
+			Assert.AreEqual (3, se.Attributes.Count, "Xml-Attributes");
+			Assert.IsNull (se.Children, "Xml-Children");
+			// and they aren't equals to None
+			Assert.IsFalse (uip.Equals (new UrlIdentityPermission (PermissionState.None)));
+		}
+#else
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void PermissionState_Unrestricted ()
 		{
 			UrlIdentityPermission uip = new UrlIdentityPermission (PermissionState.Unrestricted);
 		}
-
+#endif
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void PermissionState_Bad ()
@@ -120,7 +138,13 @@ namespace MonoTests.System.Security.Permissions {
 		}
 
 		[Test]
+#if NET_2_0
+		// this was working in beta1 but is broken in Nov CTP
+		[ExpectedException (typeof (NullReferenceException))]
+		[Category ("NotWorking")]
+#else
 		[ExpectedException (typeof (ArgumentNullException))]
+#endif
 		public void Url_Null ()
 		{
 			UrlIdentityPermission uip = new UrlIdentityPermission (PermissionState.None);
@@ -160,7 +184,9 @@ namespace MonoTests.System.Security.Permissions {
 				Assert.IsNull (uip.Intersect (null), s);
 			}
 		}
-
+#if NET_2_0
+		[Category ("NotWorking")]
+#endif
 		[Test]
 		public void Intersect_None ()
 		{
@@ -212,6 +238,9 @@ namespace MonoTests.System.Security.Permissions {
 			}
 		}
 
+#if NET_2_0
+		[Category ("NotWorking")]
+#endif
 		[Test]
 		public void IsSubset_None ()
 		{
@@ -304,17 +333,27 @@ namespace MonoTests.System.Security.Permissions {
 				Assert.IsTrue (union.Url.StartsWith (uip.Url), s);
 			}
 		}
-
-		[Test]
 #if NET_2_0
-		[ExpectedException (typeof (ArgumentException))]
+		[Category ("NotWorking")]
 #endif
+		[Test]
 		public void Union_Different ()
 		{
 			UrlIdentityPermission uip1 = new UrlIdentityPermission (GoodUrls [0]);
 			UrlIdentityPermission uip2 = new UrlIdentityPermission (GoodUrls [1]);
 			UrlIdentityPermission result = (UrlIdentityPermission)uip1.Union (uip2);
+#if NET_2_0
+			Assert.IsNotNull (result, "Mono U Novell");
+			// new XML format is used to contain more than one site
+			SecurityElement se = result.ToXml ();
+			Assert.AreEqual (2, se.Children.Count, "Childs");
+			Assert.AreEqual (GoodUrls [0], (se.Children [0] as SecurityElement).Attribute ("Url"), "Url#1");
+			Assert.AreEqual (GoodUrls [1], (se.Children [1] as SecurityElement).Attribute ("Url"), "Url#2");
+			// strangely it is still versioned as 'version="1"'.
+			Assert.AreEqual ("1", se.Attribute ("version"), "Version");
+#else
 			Assert.IsNull (result, "Mono U Novell");
+#endif
 		}
 
 		[Test]