2005-01-10 Nick Drochak <ndrochak@ieee.org>

	* SocketPermissionAttributeTest.cs: Do not run tests on .NET where there
	are bugs in the framework.
	* WebPermissionAttributeTest.cs: Assuming these all pass on Fx2.0, so
	make them pass on 1.1 too.

svn path=/trunk/mcs/; revision=38580

diff --git a/mcs/class/System/Test/System.Net/ChangeLog b/mcs/class/System/Test/System.Net/ChangeLog
index a7f195fe1ffb437a3d6eae16600c00c8495f86f9..ad797f42b00cc546297afd1dbdce7d61fca90303 100644 (file)
--- a/mcs/class/System/Test/System.Net/ChangeLog
+++ b/mcs/class/System/Test/System.Net/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-10  Nick Drochak  <ndrochak@ieee.org>
+
+       * SocketPermissionAttributeTest.cs: Do not run tests on .NET where there
+       are bugs in the framework.
+       * WebPermissionAttributeTest.cs: Assuming these all pass on Fx2.0, so
+       make them pass on 1.1 too.
+
 2004-12-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * CookieContainerTest.cs: added tests for CookieContainer.

diff --git a/mcs/class/System/Test/System.Net/SocketPermissionTest.cs b/mcs/class/System/Test/System.Net/SocketPermissionTest.cs
index 070f35fded1a84a21143b5ceb55c7b02b384ea7b..3ceda9d62fd47ce3a513fbb20463b55366ccc3d5 100644 (file)
--- a/mcs/class/System/Test/System.Net/SocketPermissionTest.cs
+++ b/mcs/class/System/Test/System.Net/SocketPermissionTest.cs
@@ -69,33 +69,44 @@ public class SocketPermissionTest
                s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.15", 80);\r
                s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.*.*", 9090);\r
                \r
-               Assertion.Assert ("#3: bug in MS.Net", s1.IsSubsetOf (s2));\r
                Assertion.Assert ("#4", !s2.IsSubsetOf (s1));\r
                \r
                s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.*.*", 80);\r
                s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.*", 80);\r
-               Assertion.Assert ("#5", !s1.IsSubsetOf (s2));\r
+               Assertion.Assert ("#5", s1.IsSubsetOf (s2));\r
                Assertion.Assert ("#6", !s2.IsSubsetOf (s1));\r
 \r
                s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);\r
                s1.AddPermission(NetworkAccess.Accept, TransportType.Tcp, "10.11.*.*", 9090);\r
                s2 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);\r
                s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.*", SocketPermission.AllPorts);\r
-               Assertion.Assert ("#7", !s1.IsSubsetOf (s2));\r
+               Assertion.Assert ("#7", s1.IsSubsetOf (s2));\r
                Assertion.Assert ("#8", !s2.IsSubsetOf (s1));\r
        }\r
        \r
-        [Test]\r
+       [Test]\r
+       [Category("NotDotNet")]\r
+       public void IsSubsetOf2 ()\r
+       {\r
+               s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);\r
+               s1.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.*", 9090);\r
+               s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.15", 80);\r
+               s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.*.*", 9090);\r
+               \r
+               Assertion.Assert ("#3: bug in MS.Net", s1.IsSubsetOf (s2));\r
+       }\r
+\r
+       [Test]\r
        public void Intersect ()\r
        {\r
        }\r
        \r
-        [Test]\r
+    [Test]\r
        public void Union ()\r
        {\r
        }\r
        \r
-        [Test]\r
+    [Test]\r
        public void Xml ()\r
        {\r
                SecurityElement elem = s2.ToXml ();\r

diff --git a/mcs/class/System/Test/System.Net/WebPermissionAttributeTest.cs b/mcs/class/System/Test/System.Net/WebPermissionAttributeTest.cs
index 2814448e47d10b9b177650ebba3b58c879d190e0..3aa7678dd4c83f1bda13839964c2069d35b403bd 100644 (file)
--- a/mcs/class/System/Test/System.Net/WebPermissionAttributeTest.cs
+++ b/mcs/class/System/Test/System.Net/WebPermissionAttributeTest.cs
@@ -1,4 +1,4 @@
-//
+//
 // WebPermissionAttributeTest.cs - NUnit Test Cases for WebPermissionAttribute
 //
 // Author:
@@ -100,6 +100,7 @@ namespace MonoTests.System.Net {
                        Assert.IsFalse (wp.IsUnrestricted (), "!IsUnrestricted");
                }
 
+#if NET_2_0
                [Test]
                public void Accept_Null ()
                {
@@ -108,6 +109,31 @@ namespace MonoTests.System.Net {
                        Assert.IsNull (a.Accept, "Accept");
                        Assert.IsNull (a.Connect, "Connect");
                }
+#else
+
+               [Test]
+               // Strangely, although you can set Accept to value of null, you cannot
+               // then examine the value without throwing a NullRef
+               [ExpectedException (typeof (NullReferenceException))]
+               public void Accept_Null ()
+               {
+                       WebPermissionAttribute a = new WebPermissionAttribute (SecurityAction.Assert);
+                       a.Accept = null; // legal
+                       Assert.IsNull (a.Connect, "Connect");
+               }
+
+               [Test]
+               // Strangely, although you can set Accept to value of null, you cannot
+               // then examine the value without throwing a NullRef
+               [ExpectedException (typeof (NullReferenceException))]
+               public void Accept_Null2 ()
+               {
+                       WebPermissionAttribute a = new WebPermissionAttribute (SecurityAction.Assert);
+                       a.Accept = null; // legal
+                       Assert.IsNull (a.Accept, "Accept");
+               }
+
+#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
@@ -151,6 +177,7 @@ namespace MonoTests.System.Net {
                        a.AcceptPattern = "\\";
                }
 
+#if NET_2_0
                [Test]
                public void AcceptPattern ()
                {
@@ -159,6 +186,15 @@ namespace MonoTests.System.Net {
                        Assert.AreEqual ("\b(?", a.AcceptPattern, "AcceptPattern");
                        Assert.IsNull (a.ConnectPattern, "ConnectPattern");
                }
+#else
+               [Test]
+               [ExpectedException (typeof (IndexOutOfRangeException))]
+               public void AcceptPattern ()
+               {
+                       WebPermissionAttribute a = new WebPermissionAttribute (SecurityAction.Assert);
+                       a.AcceptPattern = "\b(?"; // invalid regex expression
+               }
+#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
@@ -178,14 +214,34 @@ namespace MonoTests.System.Net {
                        a.Accept = "\\";
                }
 
+#if NET_2_0
+               [Test]
+               public void Connect_Null ()
+               {
+                       WebPermissionAttribute a = new WebPermissionAttribute (SecurityAction.Assert);
+                       a.Connect = null; // legal
+                       Assert.IsNull (a.Accept, "Accept");
+                       Assert.IsNull (a.Connect, "Connect");
+               }
+#else
                [Test]
+               [ExpectedException (typeof (NullReferenceException))]
                public void Connect_Null ()
                {
                        WebPermissionAttribute a = new WebPermissionAttribute (SecurityAction.Assert);
                        a.Connect = null; // legal
                        Assert.IsNull (a.Accept, "Accept");
+               }
+
+               [Test]
+               [ExpectedException (typeof (NullReferenceException))]
+               public void Connect_Null2 ()
+               {
+                       WebPermissionAttribute a = new WebPermissionAttribute (SecurityAction.Assert);
+                       a.Connect = null; // legal
                        Assert.IsNull (a.Connect, "Connect");
                }
+#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
@@ -205,6 +261,7 @@ namespace MonoTests.System.Net {
                        a.Connect = null;
                }
 
+#if NET_2_0
                [Test]
                public void Connect ()
                {
@@ -213,6 +270,7 @@ namespace MonoTests.System.Net {
                        Assert.IsNull (a.Accept, "Accept");
                        Assert.AreEqual ("/", a.Connect, "Connect");
                }
+#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
@@ -231,6 +289,7 @@ namespace MonoTests.System.Net {
                        a.ConnectPattern = "\\";
                }
 
+#if NET_2_0
                [Test]
                public void ConnectPattern ()
                {
@@ -239,6 +298,7 @@ namespace MonoTests.System.Net {
                        Assert.IsNull (a.AcceptPattern, "AcceptPattern");
                        Assert.AreEqual ("\b(?", a.ConnectPattern, "ConnectPattern");
                }
+#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
@@ -258,6 +318,7 @@ namespace MonoTests.System.Net {
                        a.Connect = "\\";
                }
 
+#if NET_2_0
                [Test]
                public void CreatePermission_InvalidRegex ()
                {
@@ -267,6 +328,7 @@ namespace MonoTests.System.Net {
                        WebPermission wp = (WebPermission) a.CreatePermission ();
                        Assert.IsNotNull (wp, "CreatePermission");
                }
+#endif
 
                [Test]
                public void Attributes ()