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

	* ServiceControllerPermissionAttributeTest.cs: Removed *Choice
	security actions.

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

diff --git a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ChangeLog b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ChangeLog
index 85f046e2de26f75c91a170c7290a4793fdd4a968..d48efbd611aacb13787126d4c5361b3cb01bde80 100644 (file)
--- a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ChangeLog
+++ b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * ServiceControllerPermissionAttributeTest.cs: Removed *Choice 
+       security actions.
+
 2005-05-31  Sebastien Pouliot  <sebastien@ximian.com>
 
        * ServiceControllerPermissionAttributeTest.cs: Character #133 isn't

diff --git a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
index 36cdfde1048342f46a972b94d4b65eaf2efeb761..132aac91868001a07df834b5a6922264d41b96eb 100644 (file)
--- a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
+++ b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
@@ -72,14 +72,6 @@ namespace MonoTests.System.ServiceProcess {
                        Assert.AreEqual (SecurityAction.RequestOptional, a.Action, "Action=RequestOptional");
                        a.Action = SecurityAction.RequestRefuse;
                        Assert.AreEqual (SecurityAction.RequestRefuse, a.Action, "Action=RequestRefuse");
-#if NET_2_0
-                       a.Action = SecurityAction.DemandChoice;
-                       Assert.AreEqual (SecurityAction.DemandChoice, a.Action, "Action=DemandChoice");
-                       a.Action = SecurityAction.InheritanceDemandChoice;
-                       Assert.AreEqual (SecurityAction.InheritanceDemandChoice, a.Action, "Action=InheritanceDemandChoice");
-                       a.Action = SecurityAction.LinkDemandChoice;
-                       Assert.AreEqual (SecurityAction.LinkDemandChoice, a.Action, "Action=LinkDemandChoice");
-#endif
                }
 
                [Test]