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

	* CodeAccessSecurityAttributeTest.cs,
	EnvironmentPermissionAttributeTest.cs,
	FileDialogPermissionAttributeTest.cs,
	FileIOPermissionAttributeTest.cs,
	GacIdentityPermissionAttributeTest.cs,
	HostProtectionAttributeTest.cs,
	IsolatedStorageFilePermissionAttributeTest.cs,
	IsolatedStoragePermissionAttributeTest.cs,
	KeyContainerPermissionAttributeTest.cs,
	PermissionSetAttributeTest.cs, PrincipalPermissionAttributeTest.cs,
	PublisherIdentityPermissionAttributeTest.cs,
	ReflectionPermissionAttributeTest.cs,
	RegistryPermissionAttributeTest.cs, SecurityAttributeTest.cs,
	SecurityPermissionAttributeTest.cs,
	SiteIdentityPermissionAttributeTest.cs,
	StrongNameIdentityPermissionAttributeTest.cs,
	UIPermissionAttributeTest.cs, UrlIdentityPermissionAttributeTest.cs,
	ZoneIdentityPermissionAttributeTest.cs: Removed *Choice security
	actions.

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

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog b/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog
index 24dce0e9c7bfacabffb4c6a48e3c2c5e5653ccb1..0ef15e1e035f9be74675b80da83bb1d55713ac6c 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog
@@ -1,3 +1,25 @@
+2005-09-22  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * CodeAccessSecurityAttributeTest.cs, 
+       EnvironmentPermissionAttributeTest.cs, 
+       FileDialogPermissionAttributeTest.cs, 
+       FileIOPermissionAttributeTest.cs, 
+       GacIdentityPermissionAttributeTest.cs,
+       HostProtectionAttributeTest.cs, 
+       IsolatedStorageFilePermissionAttributeTest.cs,
+       IsolatedStoragePermissionAttributeTest.cs,
+       KeyContainerPermissionAttributeTest.cs,
+       PermissionSetAttributeTest.cs, PrincipalPermissionAttributeTest.cs,
+       PublisherIdentityPermissionAttributeTest.cs,
+       ReflectionPermissionAttributeTest.cs,
+       RegistryPermissionAttributeTest.cs, SecurityAttributeTest.cs,
+       SecurityPermissionAttributeTest.cs,
+       SiteIdentityPermissionAttributeTest.cs,
+       StrongNameIdentityPermissionAttributeTest.cs,
+       UIPermissionAttributeTest.cs, UrlIdentityPermissionAttributeTest.cs,
+       ZoneIdentityPermissionAttributeTest.cs: Removed *Choice security 
+       actions.
+
 2005-06-16  Sebastien Pouliot  <sebastien@ximian.com>
 
        * PrincipalPermissionTest.cs: Added more tests for IsSubsetOf method.

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/CodeAccessSecurityAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/CodeAccessSecurityAttributeTest.cs
index 8f1857d8303bfaf49f4ac2aaf44251d0e774def0..f35c9c6d6df4f9a9f03a76bdafab32da7c7df93d 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/CodeAccessSecurityAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/CodeAccessSecurityAttributeTest.cs
@@ -73,14 +73,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
index 6919efd434473683b3a522afb4141c2594a23154..8ae3e4119a277b9a7f6f72c6e035d2150c937e7e 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
@@ -81,14 +81,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/FileDialogPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/FileDialogPermissionAttributeTest.cs
index 4b4b29906a1fcb5f02e570600e86de7f88108d5e..56c21b52ac5f18ff3acb976cd22f6f89ad688f12 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/FileDialogPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/FileDialogPermissionAttributeTest.cs
@@ -72,14 +72,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
index 86de2b53491d4b01eee8d6c2419653f3955acc48..8b54433ea0b9c8e826b7a9846dccae0bed6c196f 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
@@ -86,14 +86,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/GacIdentityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/GacIdentityPermissionAttributeTest.cs
index 70afeeecf618a3a09c37e5f6b18a76bb5b0a6a39..08b97f03cda637ea28ea4c11028661ed18d6605c 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/GacIdentityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/GacIdentityPermissionAttributeTest.cs
@@ -71,14 +71,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]
@@ -115,4 +107,4 @@ namespace MonoTests.System.Security.Permissions {
        }
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/HostProtectionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/HostProtectionAttributeTest.cs
index b59ad28e99135767accfaf4be21f46b968c19bb2..a195ca56d799f3e2c6eda5186075e7b0f9da3720 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/HostProtectionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/HostProtectionAttributeTest.cs
@@ -79,13 +79,6 @@ namespace MonoTests.System.Security.Permissions {
                        new HostProtectionAttribute (SecurityAction.Demand);
                }
 
-               [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void HostProtectionAttribute_DemandChoice ()
-               {
-                       new HostProtectionAttribute (SecurityAction.DemandChoice);
-               }
-
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void HostProtectionAttribute_Deny ()
@@ -100,13 +93,6 @@ namespace MonoTests.System.Security.Permissions {
                        new HostProtectionAttribute (SecurityAction.InheritanceDemand);
                }
 
-               [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void HostProtectionAttribute_InheritanceDemandChoice ()
-               {
-                       new HostProtectionAttribute (SecurityAction.InheritanceDemandChoice);
-               }
-
                [Test]
                public void HostProtectionAttribute_LinkDemand ()
                {
@@ -114,13 +100,6 @@ namespace MonoTests.System.Security.Permissions {
                        DefaultTests (hpa);
                }
 
-               [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void HostProtectionAttribute_LinkDemandChoice ()
-               {
-                       new HostProtectionAttribute (SecurityAction.LinkDemandChoice);
-               }
-
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void HostProtectionAttribute_PermitOnly ()

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStorageFilePermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStorageFilePermissionAttributeTest.cs
index a60d76417ab25511f69777096358b9ece64aa901..a6fd0b59b30a053a6acab82b004a627d55469c45 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStorageFilePermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStorageFilePermissionAttributeTest.cs
@@ -72,14 +72,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStoragePermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStoragePermissionAttributeTest.cs
index 3eefdc15cdbc002b951ab48380ac6b0e4b151d1b..12fcf9e1f1fe29fbb0c5ae1b08a4144337a6483e 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStoragePermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/IsolatedStoragePermissionAttributeTest.cs
@@ -73,14 +73,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/KeyContainerPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/KeyContainerPermissionAttributeTest.cs
index a119607987aa4f310fa521fd3642625aff3372fd..e61c9ca4933d3c5835b8944ecf098fcfae01740d 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/KeyContainerPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/KeyContainerPermissionAttributeTest.cs
@@ -80,14 +80,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/PermissionSetAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/PermissionSetAttributeTest.cs
index f7f25730123784d164741f1209629d398954d13d..51557368cf3190c0cedd19b985799586a7c7130b 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/PermissionSetAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/PermissionSetAttributeTest.cs
@@ -79,14 +79,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/PrincipalPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/PrincipalPermissionAttributeTest.cs
index 3820c2b361eb6526ee74f72f9c48054cc044e6fe..c67c3d5140b2d3957ecb6e6130543cb5334fda84 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/PrincipalPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/PrincipalPermissionAttributeTest.cs
@@ -75,14 +75,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/PublisherIdentityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/PublisherIdentityPermissionAttributeTest.cs
index e18d7914a9d4aecad4c9c67591fb567884538791..12a443fd05c1692378fc16777bb85b8e5fa505b3 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/PublisherIdentityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/PublisherIdentityPermissionAttributeTest.cs
@@ -118,14 +118,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/ReflectionPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/ReflectionPermissionAttributeTest.cs
index f3ededd1ebf480c47df8fd8a7b10d38d50c190bc..d426642d6a02451f4c188677ea9cdd9e424fa0c1 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/ReflectionPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/ReflectionPermissionAttributeTest.cs
@@ -75,14 +75,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/RegistryPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/RegistryPermissionAttributeTest.cs
index 3860ac003a6198ca34121a3b7dfc9937a312a113..bc10d58ee330b2e9a7e742642d93cc2061cbe28f 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/RegistryPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/RegistryPermissionAttributeTest.cs
@@ -85,14 +85,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/SecurityAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/SecurityAttributeTest.cs
index 024d4ff19f1cd5a66ab7e38dcf7002f7c4a88fad..8b5df35de1043623a1fb11cc56310d1b656b46bd 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/SecurityAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/SecurityAttributeTest.cs
@@ -73,14 +73,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionAttributeTest.cs
index 4099d44f718314fb7528194eab6a6b8bcd83a4e1..60ff5ad475f27a6a591aeb8856127250d64ed8b8 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionAttributeTest.cs
@@ -88,14 +88,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/SiteIdentityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/SiteIdentityPermissionAttributeTest.cs
index 3adc28b23fcd6287f875b8c22b6ae7ac72b7338f..6f618079d27bbfdd7b83e402c339222e4696aa50 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/SiteIdentityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/SiteIdentityPermissionAttributeTest.cs
@@ -86,14 +86,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/StrongNameIdentityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/StrongNameIdentityPermissionAttributeTest.cs
index ab04bdda72c386628297d5702c89fe5c3ab0cb32..5d81ad0f529236cd07a92cecc73f9701501eef95 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/StrongNameIdentityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/StrongNameIdentityPermissionAttributeTest.cs
@@ -77,14 +77,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/UIPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/UIPermissionAttributeTest.cs
index c61af2022803318604818028019d2a9211f4e912..a29984913c33f2bbb4cdedc9eed98aa68cc9a168 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/UIPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/UIPermissionAttributeTest.cs
@@ -72,14 +72,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionAttributeTest.cs
index e7d9472b305c579fcd52cc9c7c2497231481685c..7b1f176e00b8ef876014dd5fc78a7a160343afdb 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/UrlIdentityPermissionAttributeTest.cs
@@ -90,14 +90,6 @@ namespace MonoTests.System.Security.Permissions {
                        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]

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/ZoneIdentityPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/ZoneIdentityPermissionAttributeTest.cs
index 343173277ecbdc3e3886094f94b44f0937a457ab..bc0a0b5c41b1b11d83f62dca8613b9d7341d8722 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Permissions/ZoneIdentityPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/ZoneIdentityPermissionAttributeTest.cs
@@ -71,14 +71,6 @@ namespace MonoTests.System.Security.Permissions {
                        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