Author: spouliot
Date: 2005-06-20 12:51:03 -0400 (Mon, 20 Jun 2005)
New Revision: 46250

Modified:
   trunk/mcs/class/corlib/Test/System.Security/ChangeLog
   trunk/mcs/class/corlib/Test/System.Security/PermissionSetTest.cs
Log:
2005-06-20  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * PermissionSetTest.cs: Added tests for AddPermission with non-CAS 
        permissions. Added tests for ContainsNonCodeAccessPermissions.



Modified: trunk/mcs/class/corlib/Test/System.Security/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security/ChangeLog       2005-06-20 
16:50:56 UTC (rev 46249)
+++ trunk/mcs/class/corlib/Test/System.Security/ChangeLog       2005-06-20 
16:51:03 UTC (rev 46250)
@@ -1,3 +1,8 @@
+2005-06-20  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * PermissionSetTest.cs: Added tests for AddPermission with non-CAS 
+       permissions. Added tests for ContainsNonCodeAccessPermissions.
+
 2005-06-16  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * PermissionSetTest.cs: Added tests for AddPermission and IsSubsetOf.

Modified: trunk/mcs/class/corlib/Test/System.Security/PermissionSetTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security/PermissionSetTest.cs    
2005-06-20 16:50:56 UTC (rev 46249)
+++ trunk/mcs/class/corlib/Test/System.Security/PermissionSetTest.cs    
2005-06-20 16:51:03 UTC (rev 46250)
@@ -47,7 +47,8 @@
                        Assert ("PermissionStateNone.IsUnrestricted", 
!ps.IsUnrestricted ());
                        Assert ("PermissionStateNone.IsEmpty", ps.IsEmpty ());
                        Assert ("PermissionStateNone.IsReadOnly", 
!ps.IsReadOnly);
-                       AssertEquals 
("PermissionStateNone.ToXml().ToString()==ToString()", ps.ToXml ().ToString (), 
ps.ToString ());
+                       AssertEquals 
("PermissionStateNone.ToXml().ToString()==ToString()", ps.ToXml ().ToString (), 
ps.ToString ());
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
                }
 
                [Test]
@@ -57,7 +58,8 @@
                        Assert ("PermissionStateUnrestricted.IsUnrestricted", 
ps.IsUnrestricted ());
                        Assert ("PermissionStateUnrestricted.IsEmpty", 
!ps.IsEmpty ());
                        Assert ("PermissionStateUnrestricted.IsReadOnly", 
!ps.IsReadOnly);
-                       AssertEquals 
("PermissionStateUnrestricted.ToXml().ToString()==ToString()", ps.ToXml 
().ToString (), ps.ToString ());
+                       AssertEquals 
("PermissionStateUnrestricted.ToXml().ToString()==ToString()", ps.ToXml 
().ToString (), ps.ToString ());
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
                }
 
                [Test]
@@ -73,7 +75,8 @@
                        Assert ("PermissionStateNull.IsEmpty", !ps.IsEmpty ());
 #endif
                        Assert ("PermissionStateNull.IsReadOnly", 
!ps.IsReadOnly);
-                       AssertEquals 
("PermissionStateNull.ToXml().ToString()==ToString()", ps.ToXml ().ToString (), 
ps.ToString ());
+                       AssertEquals 
("PermissionStateNull.ToXml().ToString()==ToString()", ps.ToXml ().ToString (), 
ps.ToString ());
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
                }
 
                [Test]
@@ -88,7 +91,8 @@
                        Assert ("PermissionSetPermissionSet.IsUnrestricted", 
!ps.IsUnrestricted ());
                        Assert ("PermissionSetPermissionSet.IsEmpty", 
!ps.IsEmpty ());
                        Assert ("PermissionSetPermissionSet.IsReadOnly", 
!ps.IsReadOnly);
-                       AssertEquals 
("PermissionSetPermissionSet.ToXml().ToString()==ToString()", ps.ToXml 
().ToString (), ps.ToString ());
+                       AssertEquals 
("PermissionSetPermissionSet.ToXml().ToString()==ToString()", ps.ToXml 
().ToString (), ps.ToString ());
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
                }
 
                [Test]
@@ -96,7 +100,8 @@
                {
                        NamedPermissionSet nps = new NamedPermissionSet 
("Test", PermissionState.Unrestricted);
                        PermissionSet ps = new PermissionSet (nps);
-                       Assert ("IsUnrestricted", ps.IsUnrestricted ());
+                       Assert ("IsUnrestricted", ps.IsUnrestricted ());
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
                }
 
                [Test]
@@ -191,6 +196,33 @@
                        AssertEquals ("Count", 1, ps.Count);
                        Assert ("IsEmpty", !ps.IsEmpty ());
                }
+
+               [Test]
+               public void AddPermission_NonCasPermission_Unrestricted ()
+               {
+                       PermissionSet ps = new PermissionSet 
(PermissionState.Unrestricted);
+                       ps.AddPermission (new PrincipalPermission ("name", 
"role"));
+                       AssertEquals ("Count", 0, ps.Count);
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
+               }
+
+               [Test]
+               public void AddPermission_NonCasPermissionNone_Unrestricted ()
+               {
+                       PermissionSet ps = new PermissionSet 
(PermissionState.Unrestricted);
+                       ps.AddPermission (new PrincipalPermission 
(PermissionState.None));
+                       AssertEquals ("Count", 0, ps.Count);
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
+               }
+
+               [Test]
+               public void 
AddPermission_NonCasPermissionUnrestricted_Unrestricted ()
+               {
+                       PermissionSet ps = new PermissionSet 
(PermissionState.Unrestricted);
+                       ps.AddPermission (new PrincipalPermission 
(PermissionState.Unrestricted));
+                       AssertEquals ("Count", 0, ps.Count);
+                       Assert ("ContainsNonCodeAccessPermissions", 
!ps.ContainsNonCodeAccessPermissions ());
+               }
 
                [Test]
                public void AddPermission_NoCopy ()

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to