2005-09-21 Sebastien Pouliot <sebastien@ximian.com>

	* AspNetHostingPermissionTest.cs: 2.0 RC fixed the "unrestricted" XML
	so the test case has been updated.
	* AspNetHostingPermissionAttributeTest.cs: Removed actions that have
	been killed in 2.0 RC.

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

diff --git a/mcs/class/System/Test/System.Web/AspNetHostingPermissionAttributeTest.cs b/mcs/class/System/Test/System.Web/AspNetHostingPermissionAttributeTest.cs
index de0cbb93b4f20eb64b22fc27daf4acb562bee24a..067db8c4710696954f826919af474b7302f73097 100644 (file)
--- a/mcs/class/System/Test/System.Web/AspNetHostingPermissionAttributeTest.cs
+++ b/mcs/class/System/Test/System.Web/AspNetHostingPermissionAttributeTest.cs
@@ -71,14 +71,6 @@ namespace MonoTests.System.Web {
                        Assert.AreEqual (SecurityAction.RequestOptional, a.Action, "Action=RequestOptional");\r
                        a.Action = SecurityAction.RequestRefuse;\r
                        Assert.AreEqual (SecurityAction.RequestRefuse, a.Action, "Action=RequestRefuse");\r
-#if NET_2_0\r
-                       a.Action = SecurityAction.DemandChoice;\r
-                       Assert.AreEqual (SecurityAction.DemandChoice, a.Action, "Action=DemandChoice");\r
-                       a.Action = SecurityAction.InheritanceDemandChoice;\r
-                       Assert.AreEqual (SecurityAction.InheritanceDemandChoice, a.Action, "Action=InheritanceDemandChoice");\r
-                       a.Action = SecurityAction.LinkDemandChoice;\r
-                       Assert.AreEqual (SecurityAction.LinkDemandChoice, a.Action, "Action=LinkDemandChoice");\r
-#endif\r
                }\r
 \r
                [Test]\r

diff --git a/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs b/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs
index adb1fe8c7e4d77b672245237b13bffd5b0220adb..d7656949d31af9621bcf50bb7016db137f9b0f80 100644 (file)
--- a/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs
+++ b/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs
@@ -5,7 +5,7 @@
 // Author:\r
 //     Sebastien Pouliot  <sebastien@ximian.com>\r
 //\r
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)\r
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)\r
 //\r
 // Permission is hereby granted, free of charge, to any person obtaining\r
 // a copy of this software and associated documentation files (the\r
@@ -33,8 +33,6 @@ using System.Security;
 using System.Security.Permissions;\r
 using System.Web;\r
 \r
-//using System.Diagnostics;\r
-\r
 namespace MonoTests.System.Web {\r
 \r
        [TestFixture]\r
@@ -92,8 +90,13 @@ namespace MonoTests.System.Web {
                        Assert.AreEqual (AspNetHostingPermissionLevel.Unrestricted, anhp.Level, "Level");\r
                        Assert.IsTrue (anhp.IsUnrestricted (), "IsUnrestricted");\r
 \r
-                       SecurityElement se = anhp.ToXml ();\r
-                       Assert.IsNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted");\r
+                       SecurityElement se = anhp.ToXml ();
+#if NET_2_0
+                       // fixed in 2.0 RC\r
+                       Assert.IsNotNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted");
+#else\r
+                       Assert.IsNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted");
+#endif\r
                        Assert.AreEqual ("Unrestricted", se.Attribute ("Level"), "Xml-Level");\r
                        Assert.IsNull (se.Children, "Xml-Children");\r
 \r

diff --git a/mcs/class/System/Test/System.Web/ChangeLog b/mcs/class/System/Test/System.Web/ChangeLog
index b7bfde708aabc374f01fab247e67c2df7a3f16fd..dd4ceeb02f392a4ae51ff38f3122125e55071971 100644 (file)
--- a/mcs/class/System/Test/System.Web/ChangeLog
+++ b/mcs/class/System/Test/System.Web/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-21  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AspNetHostingPermissionTest.cs: 2.0 RC fixed the "unrestricted" XML
+       so the test case has been updated.
+       * AspNetHostingPermissionAttributeTest.cs: Removed actions that have
+       been killed in 2.0 RC.
+
 2005-01-19  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AspNetHostingPermissionTest.cs: Re-fixed for NET_1_1. Fx 1.1 SP1