2004-08-24 Sebastien Pouliot <sebastien@ximian.com>
authorSebastien Pouliot <sebastien@ximian.com>
Tue, 24 Aug 2004 17:09:24 +0000 (17:09 -0000)
committerSebastien Pouliot <sebastien@ximian.com>
Tue, 24 Aug 2004 17:09:24 +0000 (17:09 -0000)
* AllMembershipConditionTest.cs: Renamed GetHashCode and
ToString tests to remove compiler warnings.
* ApplicationDirectoryMembershipConditionTest.cs: Renamed GetHashCode
and ToString tests to remove compiler warnings.
* ApplicationMembershipConditionTest.cs: Renamed GetHashCode and
ToString tests to remove compiler warnings.
* DomainApplicationMembershipConditionTest.cs: Renamed GetHashCode and
ToString tests to remove compiler warnings.
* GacMembershipConditionTest.cs: Added some new unit tests for
FromXml to match other *MembershipCondition classes.
* PublisherMembershipConditionTest.cs: Renamed GetHashCode and
ToString tests to remove compiler warnings.
* SiteMembershipConditionTest.cs: Completed. Converted existing unit
tests to NUnit 2.2 format.
* UrlMembershipConditionTest.cs: Completed. Converted existing unit
tests to NUnit 2.2 format.
* ZoneMembershipConditionTest.cs: Added some new unit tests to match
other *MembershipCondition classes.

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

mcs/class/corlib/Test/System.Security.Policy/AllMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/ApplicationDirectoryMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/ApplicationMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/ChangeLog
mcs/class/corlib/Test/System.Security.Policy/DomainApplicationMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/GacMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/PublisherMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/SiteMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/UrlMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/ZoneMembershipConditionTest.cs

index 5e5220306bbc13c5f3cb606558b279c8366b3945..728969d2f9f8c8c55a20c038546c5d214534baae 100644 (file)
@@ -179,7 +179,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void GetHashCode ()
+               public void GetHashCode_ ()
                {
                        AllMembershipCondition all = new AllMembershipCondition ();
                        AllMembershipCondition copy = (AllMembershipCondition)all.Copy ();
@@ -187,7 +187,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void ToString ()
+               public void ToString_ ()
                {
                        AllMembershipCondition all = new AllMembershipCondition ();
                        Assert.AreEqual ("All code", all.ToString ());
index c87e30a9acf4d63bc924f1ae8a6fb0b3f5e1581c..f86b0def45467c8cdd73e3e82120feb69f62d183 100644 (file)
@@ -195,7 +195,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void GetHashCode ()
+               public void GetHashCode_ ()
                {
                        ApplicationDirectoryMembershipCondition ad = new ApplicationDirectoryMembershipCondition ();
                        ApplicationDirectoryMembershipCondition copy = (ApplicationDirectoryMembershipCondition)ad.Copy ();
@@ -203,7 +203,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void ToString ()
+               public void ToString_ ()
                {
                        ApplicationDirectoryMembershipCondition ad = new ApplicationDirectoryMembershipCondition ();
                        Assert.AreEqual ("ApplicationDirectory", ad.ToString ());
index e5e832b5cff878f36f6842bfe4d412ae9d4ecf3c..fdb24bf773d779fa5b34483dd062468de5c8f5b1 100644 (file)
@@ -205,7 +205,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void GetHashCode ()
+               public void GetHashCode_ ()
                {
                        ApplicationMembershipCondition app = new ApplicationMembershipCondition ();
                        Assert.AreEqual (-1, app.GetHashCode ());
@@ -214,7 +214,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void ToString ()
+               public void ToString_ ()
                {
                        ApplicationMembershipCondition app = new ApplicationMembershipCondition ();
                        Assert.AreEqual ("Application", app.ToString ());
index 1926fdce564476ca8c8e72408b784ffa3c9ae479..cde05a2608d98ff9fa6d05d57bc454cb5a5f66ab 100644 (file)
@@ -1,3 +1,24 @@
+2004-08-24  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AllMembershipConditionTest.cs: Renamed GetHashCode and 
+       ToString tests to remove compiler warnings.
+       * ApplicationDirectoryMembershipConditionTest.cs: Renamed GetHashCode
+       and ToString tests to remove compiler warnings.
+       * ApplicationMembershipConditionTest.cs: Renamed GetHashCode and 
+       ToString tests to remove compiler warnings.
+       * DomainApplicationMembershipConditionTest.cs: Renamed GetHashCode and
+       ToString tests to remove compiler warnings.
+       * GacMembershipConditionTest.cs: Added some new unit tests for 
+       FromXml to match other *MembershipCondition classes.
+       * PublisherMembershipConditionTest.cs: Renamed GetHashCode and 
+       ToString tests to remove compiler warnings.
+       * SiteMembershipConditionTest.cs: Completed. Converted existing unit
+       tests to NUnit 2.2 format.
+       * UrlMembershipConditionTest.cs: Completed. Converted existing unit 
+       tests to NUnit 2.2 format.
+       * ZoneMembershipConditionTest.cs: Added some new unit tests to match
+       other *MembershipCondition classes.
+
 2004-08-23  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AllMembershipConditionTest.cs: New. Unit tests in NUnit 2.2 format.
index 1ff8ed1d2b8b2f2158fb2f6a51100c64311f4574..3bef5df2aad5918bd6a1b47f5ec5a85548f954e4 100644 (file)
@@ -179,7 +179,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void GetHashCode ()
+               public void GetHashCode_ ()
                {
                        DomainApplicationMembershipCondition domapp = new DomainApplicationMembershipCondition ();
                        Assert.AreEqual (-1, domapp.GetHashCode ());
@@ -188,7 +188,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void ToString ()
+               public void ToString_ ()
                {
                        DomainApplicationMembershipCondition domapp = new DomainApplicationMembershipCondition ();
                        Assert.AreEqual ("Domain", domapp.ToString ());
index 9b26279aa99c30327f6d6efe0ec73bb41fbc9520..339db451836a3fe7d63edbd96b93f0388d92ba91 100644 (file)
@@ -32,7 +32,6 @@ using NUnit.Framework;
 using System;
 using System.Security;
 using System.Security.Policy;
-using System.Security.Permissions;
 
 namespace MonoTests.System.Security.Policy {
 
@@ -117,13 +116,39 @@ namespace MonoTests.System.Security.Policy {
                        gac.FromXml (se);
                }
 
+               [Test]
+               public void FromXml_NoClass ()
+               {
+                       GacMembershipCondition gac = new GacMembershipCondition ();
+                       SecurityElement se = gac.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("version", se.Attribute ("version"));
+                       gac.FromXml (w);
+                       // doesn't even care of the class attribute presence
+               }
+
                [Test]
                public void FromXml_InvalidVersion ()
                {
                        GacMembershipCondition gac = new GacMembershipCondition ();
                        SecurityElement se = gac.ToXml ();
-                       se.Attributes ["version"] = "2";
-                       gac.FromXml (se);
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       w.AddAttribute ("version", "2");
+                       gac.FromXml (w);
+               }
+
+               [Test]
+               public void FromXml_NoVersion ()
+               {
+                       GacMembershipCondition gac = new GacMembershipCondition ();
+                       SecurityElement se = gac.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       gac.FromXml (w);
                }
 
                [Test]
index 07a08753aad43580c3ba6694df0abcdb81b577c2..b50370804f9af19d9584435d64a53c4d7324a4f3 100644 (file)
@@ -245,7 +245,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void GetHashCode ()
+               public void GetHashCode_ ()
                {
                        PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
                        PublisherMembershipCondition copy = (PublisherMembershipCondition)pmc.Copy ();
@@ -254,7 +254,7 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void ToString ()
+               public void ToString_ ()
                {
                        PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
                        string s = "Publisher - 3082010A0282010100AA99BD39A81827F42B3D0B4C3F7C772EA7CBB5D18C0DC23A74D793B5E0A04B3F595ECE454F9A7929F149CC1A47EE55C2083E1220F855F2EE5FD3E0CA96BC30DEFE58C82732D08554E8F09110BBF32BBE19E5039B0B861DF3B0398CB8FD0B1D3C7326AC572BCA29A215908215E277A34052038B9DC270BA1FE934F6F335924E5583F8DA30B620DE5706B55A4206DE59CBF2DFA6BD154771192523D2CB6F9B1979DF6A5BF176057929FCC356CA8F440885558ACBC80F464B55CB8C96774A87E8A94106C7FF0DE968576372C36957B443CF323A30DC1BE9D543262A79FE95DB226724C92FD034E3E6FB514986B83CD0255FD6EC9E036187A96840C7F8E203E6CF050203010001";
index f5e5b88c61c9d889a79242391f446ca58c3c0d9d..fe2110ee93a999c1268fbef630924a5d85f829bd 100755 (executable)
@@ -1,23 +1,43 @@
 //
-// SiteMembershipConditionTest.cs - NUnit Test Cases for SiteMembershipCondition
+// SiteMembershipConditionTest.cs - 
+//     NUnit Test Cases for SiteMembershipCondition
 //
 // Author:
-//     Sebastien Pouliot (spouliot@motus.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2004 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using NUnit.Framework;
 using System;
 using System.Collections;
 using System.Security;
-using System.Security.Permissions;
 using System.Security.Policy;
 
 namespace MonoTests.System.Security.Policy {
 
        [TestFixture]
-       public class SiteMembershipConditionTest : Assertion {
+       public class SiteMembershipConditionTest {
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
@@ -51,122 +71,141 @@ namespace MonoTests.System.Security.Policy {
                public void SiteMembershipCondition_GoMonoWebSite () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("www.go-mono.com");
-                       AssertEquals ("Site", "www.go-mono.com", smc.Site);
-                       AssertEquals ("ToString", "Site - www.go-mono.com", smc.ToString ());
+                       Assert.AreEqual ("www.go-mono.com", smc.Site, "Site");
+                       Assert.AreEqual ("Site - www.go-mono.com", smc.ToString (), "ToString");
 
                        SiteMembershipCondition smc2 = (SiteMembershipCondition) smc.Copy ();
-                       AssertEquals ("Copy.Site", smc.Site, smc2.Site);
-                       AssertEquals ("Copy.GetHashCode", smc.GetHashCode (), smc2.GetHashCode ());
+                       Assert.AreEqual (smc.Site, smc2.Site, "Copy.Site");
+                       Assert.AreEqual (smc.GetHashCode (), smc2.GetHashCode (), "Copy.GetHashCode");
 
                        SecurityElement se = smc2.ToXml ();
                        SiteMembershipCondition smc3 = new SiteMembershipCondition ("*");
                        smc3.FromXml (se);
-                       AssertEquals ("ToXml/FromXml", smc.Site, smc3.Site);
+                       Assert.AreEqual (smc.Site, smc3.Site, "ToXml/FromXml");
 
-                       Assert ("Equals", smc.Equals (smc2));
+                       Assert.IsTrue (smc.Equals (smc2), "Equals");
                        SiteMembershipCondition smc4 = new SiteMembershipCondition ("go-mono.com");
-                       Assert ("!Equals", !smc.Equals (smc4));
+                       Assert.IsFalse (smc.Equals (smc4), "!Equals");
                }
 
                [Test]
                public void Site_AllGoMonoSite () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       AssertEquals ("Site", "*.go-mono.com", smc.Site);
-                       AssertEquals ("ToString", "Site - *.go-mono.com", smc.ToString ());
+                       Assert.AreEqual ("*.go-mono.com", smc.Site, "Site");
+                       Assert.AreEqual ("Site - *.go-mono.com", smc.ToString (), "ToString");
 
                        SiteMembershipCondition smc2 = (SiteMembershipCondition) smc.Copy ();
-                       AssertEquals ("Copy.Site", smc.Site, smc2.Site);
-                       AssertEquals ("Copy.GetHashCode", smc.GetHashCode (), smc2.GetHashCode ());
+                       Assert.AreEqual (smc.Site, smc2.Site, "Copy.Site");
+                       Assert.AreEqual (smc.GetHashCode (), smc2.GetHashCode (), "Copy.GetHashCode");
 
                        SecurityElement se = smc2.ToXml ();
                        SiteMembershipCondition smc3 = new SiteMembershipCondition ("*");
                        smc3.FromXml (se);
-                       AssertEquals ("ToXml/FromXml", smc.Site, smc3.Site);
+                       Assert.AreEqual (smc.Site, smc3.Site, "ToXml/FromXml");
 
-                       Assert ("Equals", smc.Equals (smc2));
+                       Assert.IsTrue (smc.Equals (smc2), "Equals");
                        SiteMembershipCondition smc4 = new SiteMembershipCondition ("go-mono.com");
-                       Assert ("!Equals", !smc.Equals (smc4));
+                       Assert.IsFalse (smc.Equals (smc4), "!Equals");
                }
 
                [Test]
-               public void CheckNull () 
+               public void Check () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       Assert ("Check(null)", !smc.Check (null));
-               }
 
-               [Test]
-               public void CheckPositive () 
-               {
-                       SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       Evidence e = new Evidence ();
-                       e.AddHost (new Site ("*.go-mono.com"));
-                       Assert ("Check(+)", smc.Check (e));
+                       Evidence e = null;
+                       Assert.IsFalse (smc.Check (e), "Check(null)");
+                       e = new Evidence ();
+                       Assert.IsFalse (smc.Check (e), "Check (empty)");
+                       e.AddHost (new Zone (SecurityZone.MyComputer));
+                       Assert.IsFalse (smc.Check (e), "Check (zone)");
+                       
+                       Site s = new Site ("*.go-mono.com");
+                       e.AddAssembly (s);
+                       Assert.IsFalse (smc.Check (e), "Check (site-assembly)");
+                       e.AddHost (s);
+                       Assert.IsTrue (smc.Check (e), "Check (site-host)");
+
+                       e = new Evidence ();
+                       e.AddHost (new Site ("www.go-mono.com"));
+                       Assert.IsTrue (smc.Check (e), "Check(+-)");
+
+                       e = new Evidence ();
+                       e.AddHost (new Site ("*.go-mono.org"));
+                       Assert.IsFalse (smc.Check (e), "Check(-)");
                }
 
                [Test]
-               public void CheckPositive_Partial () 
+               public void Equals () 
                {
-                       SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       Evidence e = new Evidence ();
-                       e.AddHost (new Site ("www.go-mono.com"));
-                       Assert ("Check(+-)", smc.Check (e));
+                       SiteMembershipCondition smc1 = new SiteMembershipCondition ("*.go-mono.com");
+                       Assert.IsFalse (smc1.Equals (null), "Null");
+                       SiteMembershipCondition smc2 = new SiteMembershipCondition ("*.Go-Mono.com");
+                       Assert.IsTrue (smc1.Equals (smc2), "CaseSensitive");
                }
 
                [Test]
-               public void CheckNegative () 
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void FromXml_Null () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       Evidence e = new Evidence ();
-                       e.AddHost (new Site ("*.go-mono.org"));
-                       Assert ("Check(-)", !smc.Check (e));
+                       smc.FromXml (null);
                }
 
                [Test]
-               public void CheckNegative_NoSiteEvidence () 
+               [ExpectedException (typeof (ArgumentException))]
+               public void FromXml_InvalidTag () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       Evidence e = new Evidence ();
-                       e.AddHost (new Zone (SecurityZone.MyComputer));
-                       Assert ("Check(?)", !smc.Check (e));
+                       SecurityElement se = smc.ToXml ();
+                       se.Tag = "IMonoship";
+                       smc.FromXml (se);
                }
 
                [Test]
-               public void EqualsCaseSensitive () 
+               public void FromXml_InvalidClass ()
                {
-                       SiteMembershipCondition smc1 = new SiteMembershipCondition ("*.go-mono.com");
-                       SiteMembershipCondition smc2 = new SiteMembershipCondition ("*.Go-Mono.com");
-                       Assert ("CaseSensitive", smc1.Equals (smc2));
+                       SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
+                       SecurityElement se = smc.ToXml ();
+                       se.Attributes ["class"] = "Hello world";
+                       smc.FromXml (se);
                }
 
                [Test]
-               public void EqualsNull () 
+               public void FromXml_NoClass ()
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       Assert ("EqualsNull", !smc.Equals (null));
+                       SecurityElement se = smc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("version", se.Attribute ("version"));
+                       smc.FromXml (w);
+                       // doesn't even care of the class attribute presence
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentNullException))]
-               public void FromXmlNull () 
+               public void FromXml_InvalidVersion ()
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
-                       smc.FromXml (null);
+                       SecurityElement se = smc.ToXml ();
+                       se.Attributes ["version"] = "2";
+                       smc.FromXml (se);
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void FromXmlInvalid () 
+               public void FromXml_NoVersion ()
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
                        SecurityElement se = smc.ToXml ();
-                       se.Tag = "IMonoship";
-                       smc.FromXml (se);
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       smc.FromXml (w);
                }
 
                [Test]
-               public void FromXmlPolicyLevel () 
+               public void FromXml_PolicyLevel () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
                        SecurityElement se = smc.ToXml ();
@@ -176,22 +215,22 @@ namespace MonoTests.System.Security.Policy {
                                PolicyLevel pl = e.Current as PolicyLevel;
                                SiteMembershipCondition spl = new SiteMembershipCondition ("*");
                                spl.FromXml (se, pl);
-                               Assert ("FromXml(PolicyLevel='" + pl.Label + "')", spl.Equals (smc));
+                               Assert.IsTrue (spl.Equals (smc), "FromXml(PolicyLevel='" + pl.Label + "')");
                        }
                        // yes!
                }
 
                [Test]
-               public void ToXmlNull () 
+               public void ToXml_Null () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
                        // no ArgumentNullException here
                        SecurityElement se = smc.ToXml (null);
-                       AssertNotNull ("ToXml(null)", se);
+                       Assert.IsNotNull (se, "ToXml(null)");
                }
 
                [Test]
-               public void ToXmlPolicyLevel () 
+               public void ToXml_PolicyLevel () 
                {
                        SiteMembershipCondition smc = new SiteMembershipCondition ("*.go-mono.com");
                        SecurityElement se = smc.ToXml ();
@@ -202,7 +241,7 @@ namespace MonoTests.System.Security.Policy {
                                PolicyLevel pl = e.Current as PolicyLevel;
                                SiteMembershipCondition spl = new SiteMembershipCondition ("*");
                                spl.FromXml (se, pl);
-                               AssertEquals ("ToXml(PolicyLevel='" + pl.Label + "')", s, spl.ToXml (pl).ToString ());
+                               Assert.AreEqual (s, spl.ToXml (pl).ToString (), "ToXml(PolicyLevel='" + pl.Label + "')");
                        }
                        // yes!
                }
@@ -216,7 +255,7 @@ namespace MonoTests.System.Security.Policy {
                        SiteMembershipCondition smc2 = new SiteMembershipCondition ("*");
                        smc2.FromXml (se);
 
-                       AssertEquals ("ToFromXmlRoundTrip", smc1.GetHashCode (), smc2.GetHashCode ());
+                       Assert.AreEqual (smc1.GetHashCode (), smc2.GetHashCode (), "ToFromXmlRoundTrip");
                }
        }
 }
index 26baa92967f2844d6712aeb4fad494b84635f68d..2108f791baeb841bfb4c4434502b45f948a089e6 100755 (executable)
@@ -2,22 +2,41 @@
 // UrlMembershipConditionTest.cs - NUnit Test Cases for UrlMembershipCondition
 //
 // Author:
-//     Sebastien Pouliot (spouliot@motus.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2004 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using NUnit.Framework;
 using System;
 using System.Collections;
 using System.Security;
-using System.Security.Permissions;
 using System.Security.Policy;
 
 namespace MonoTests.System.Security.Policy {
 
        [TestFixture]
-       public class UrlMembershipConditionTest : Assertion {
+       public class UrlMembershipConditionTest {
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
@@ -49,96 +68,130 @@ namespace MonoTests.System.Security.Policy {
                public void UrlMembershipCondition_GoMonoWebUrl () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com/");
-                       AssertEquals ("Url", "http://www.go-mono.com/", umc.Url);
-                       AssertEquals ("ToString", "Url - http://www.go-mono.com/", umc.ToString ());
+                       Assert.AreEqual ("http://www.go-mono.com/", umc.Url, "Url");
+                       Assert.AreEqual ("Url - http://www.go-mono.com/", umc.ToString (), "ToString");
 
                        UrlMembershipCondition umc2 = (UrlMembershipCondition) umc.Copy ();
-                       AssertEquals ("Copy.Url", umc.Url, umc2.Url);
-                       AssertEquals ("Copy.GetHashCode", umc.GetHashCode (), umc2.GetHashCode ());
+                       Assert.AreEqual (umc.Url, umc2.Url, "Copy.Url");
+                       Assert.AreEqual (umc.GetHashCode (), umc2.GetHashCode (), "Copy.GetHashCode");
 
                        SecurityElement se = umc2.ToXml ();
                        UrlMembershipCondition umc3 = new UrlMembershipCondition ("*");
                        umc3.FromXml (se);
-                       AssertEquals ("ToXml/FromXml", umc.Url, umc3.Url);
+                       Assert.AreEqual (umc.Url, umc3.Url, "ToXml/FromXml");
 
-                       Assert ("Equals", umc.Equals (umc2));
+                       Assert.IsTrue (umc.Equals (umc2), "Equals");
                        UrlMembershipCondition umc4 = new UrlMembershipCondition ("http://www.go-mono.com");
                        // note that a last slash is added to Url - so it's equal
-                       Assert ("Equals-AutoAddedLastSlash", umc.Equals (umc4));
+                       Assert.IsTrue (umc.Equals (umc4), "Equals-AutoAddedLastSlash");
                }
 
                [Test]
                public void Url_AllGoMonoUrl () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com/*");
-                       AssertEquals ("Url", "http://www.go-mono.com/*", umc.Url);
-                       AssertEquals ("ToString", "Url - http://www.go-mono.com/*", umc.ToString ());
+                       Assert.AreEqual ("http://www.go-mono.com/*", umc.Url, "Url");
+                       Assert.AreEqual ("Url - http://www.go-mono.com/*", umc.ToString (), "ToString");
 
                        UrlMembershipCondition umc2 = (UrlMembershipCondition) umc.Copy ();
-                       AssertEquals ("Copy.Url", umc.Url, umc2.Url);
-                       AssertEquals ("Copy.GetHashCode", umc.GetHashCode (), umc2.GetHashCode ());
+                       Assert.AreEqual (umc.Url, umc2.Url, "Copy.Url");
+                       Assert.AreEqual (umc.GetHashCode (), umc2.GetHashCode (), "Copy.GetHashCode");
 
                        SecurityElement se = umc2.ToXml ();
                        UrlMembershipCondition umc3 = new UrlMembershipCondition ("*");
                        umc3.FromXml (se);
-                       AssertEquals ("ToXml/FromXml", umc.Url, umc3.Url);
+                       Assert.AreEqual (umc.Url, umc3.Url, "ToXml/FromXml");
 
-                       Assert ("Equals", umc.Equals (umc2));
+                       Assert.IsTrue (umc.Equals (umc2), "Equals");
                        UrlMembershipCondition umc4 = new UrlMembershipCondition ("http://www.go-mono.com/");
-                       Assert ("Equals-*", umc.Equals (umc4));
+                       Assert.IsTrue (umc.Equals (umc4), "Equals-*");
                }
 
                [Test]
+#if !NET_2_0
                [ExpectedException (typeof (ArgumentException))]
-               [Ignore ("not currently supported by Mono - CAS related")]
+#endif
                public void Url_InvalidSite ()
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.*");
+#if NET_2_0
+                       Assert.AreEqual ("http://www.go-mono.*", umc.Url, "Url");
+                       Assert.AreEqual ("Url - http://www.go-mono.*", umc.ToString (), "ToString");
+#endif
                }
 
                [Test]
                public void Url_NoProtocol () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("www.go-mono.com");
+#if NET_2_0
+                       Assert.AreEqual ("www.go-mono.com", umc.Url, "Url");
+                       Assert.AreEqual ("Url - www.go-mono.com", umc.ToString (), "ToString");
+#else
                        // note: no last slash here
-                       AssertEquals ("Url", "file://WWW.GO-MONO.COM", umc.Url);
-                       AssertEquals ("ToString", "Url - file://WWW.GO-MONO.COM", umc.ToString ());
+                       Assert.AreEqual ("file://WWW.GO-MONO.COM", umc.Url, "Url");
+                       Assert.AreEqual ("Url - file://WWW.GO-MONO.COM", umc.ToString (), "ToString");
+#endif
                }
 
                [Test]
                public void Url_WellKnownProtocol () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
-                       AssertEquals ("Url", "http://www.go-mono.com/", umc.Url);
-                       AssertEquals ("ToString", "Url - http://www.go-mono.com/", umc.ToString ());
-
+#if NET_2_0
+                       Assert.AreEqual ("http://www.go-mono.com", umc.Url, "http-Url");
+                       Assert.AreEqual ("Url - http://www.go-mono.com", umc.ToString (), "http-ToString");
+#else
+                       Assert.AreEqual ("http://www.go-mono.com/", umc.Url, "http-Url");
+                       Assert.AreEqual ("Url - http://www.go-mono.com/", umc.ToString (), "http-ToString");
+#endif
                        umc = new UrlMembershipCondition ("https://www.go-mono.com");
-                       AssertEquals ("Url", "https://www.go-mono.com/", umc.Url);
-                       AssertEquals ("ToString", "Url - https://www.go-mono.com/", umc.ToString ());
+#if NET_2_0
+                       Assert.AreEqual ("https://www.go-mono.com", umc.Url, "https-Url");
+                       Assert.AreEqual ("Url - https://www.go-mono.com", umc.ToString (), "https-ToString");
+#else
+                       Assert.AreEqual ("https://www.go-mono.com/", umc.Url, "https-Url");
+                       Assert.AreEqual ("Url - https://www.go-mono.com/", umc.ToString (), "https-ToString");
+#endif
 
                        umc = new UrlMembershipCondition ("ftp://www.go-mono.com");
-                       AssertEquals ("Url", "ftp://www.go-mono.com/", umc.Url);
-                       AssertEquals ("ToString", "Url - ftp://www.go-mono.com/", umc.ToString ());
+#if NET_2_0
+                       Assert.AreEqual ("ftp://www.go-mono.com", umc.Url, "ftp-Url");
+                       Assert.AreEqual ("Url - ftp://www.go-mono.com", umc.ToString (), "ftp-ToString");
+#else
+                       Assert.AreEqual ("ftp://www.go-mono.com/", umc.Url, "ftp-Url");
+                       Assert.AreEqual ("Url - ftp://www.go-mono.com/", umc.ToString (), "ftp-ToString");
+#endif
 
                        umc = new UrlMembershipCondition ("file://www.go-mono.com");
-                       AssertEquals ("Url", "file://WWW.GO-MONO.COM", umc.Url);
-                       AssertEquals ("ToString", "Url - file://WWW.GO-MONO.COM", umc.ToString ());
+#if NET_2_0
+                       Assert.AreEqual ("file://www.go-mono.com", umc.Url, "file-Url");
+                       Assert.AreEqual ("Url - file://www.go-mono.com", umc.ToString (), "file-ToString");
+#else
+                       Assert.AreEqual ("file://WWW.GO-MONO.COM", umc.Url, "file-Url");
+                       Assert.AreEqual ("Url - file://WWW.GO-MONO.COM", umc.ToString (), "file-ToString");
+#endif
                }
 
                [Test]
                public void Url_UnknownProtocol () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("mono://www.go-mono.com");
-                       AssertEquals ("Url", "mono://www.go-mono.com/", umc.Url);
-                       AssertEquals ("ToString", "Url - mono://www.go-mono.com/", umc.ToString ());
+#if NET_2_0
+                       Assert.AreEqual ("mono://www.go-mono.com", umc.Url, "Url");
+                       Assert.AreEqual ("Url - mono://www.go-mono.com", umc.ToString (), "ToString");
+#else
+                       Assert.AreEqual ("mono://www.go-mono.com/", umc.Url, "Url");
+                       Assert.AreEqual ("Url - mono://www.go-mono.com/", umc.ToString (), "ToString");
+#endif
                }
 
                [Test]
                public void Url_RelativePath () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com/path/../newpath/index.html");
-                       AssertEquals ("Url", "http://www.go-mono.com/path/../newpath/index.html", umc.Url);
-                       AssertEquals ("ToString", "Url - http://www.go-mono.com/path/../newpath/index.html", umc.ToString ());
+                       Assert.AreEqual ("http://www.go-mono.com/path/../newpath/index.html", umc.Url, "Url");
+                       Assert.AreEqual ("Url - http://www.go-mono.com/path/../newpath/index.html", umc.ToString (), "ToString");
                }
 
                [Test]
@@ -158,19 +211,24 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void CheckNull () 
+               public void Check () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
-                       Assert ("Check(null)", !umc.Check (null));
-               }
 
-               [Test]
-               public void CheckPositive () 
-               {
-                       UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
-                       Evidence e = new Evidence ();
-                       e.AddHost (new Url ("http://www.go-mono.com"));
-                       Assert ("Check(+)", umc.Check (e));
+                       Evidence e = null;
+                       Assert.IsFalse (umc.Check (e), "Check(null)");
+
+                       e = new Evidence ();
+                       Assert.IsFalse (umc.Check (e), "Check(empty)");
+
+                       e.AddHost (new Zone (SecurityZone.MyComputer));
+                       Assert.IsFalse (umc.Check (e), "Check(zone)");
+
+                       Url u = new Url ("http://www.go-mono.com");
+                       e.AddAssembly (u);
+                       Assert.IsFalse (umc.Check (e), "Check(url-assembly)");
+                       e.AddHost (u);
+                       Assert.IsTrue (umc.Check (e), "Check(url-host)");
                }
 
                [Test]
@@ -179,7 +237,7 @@ namespace MonoTests.System.Security.Policy {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com/*");
                        Evidence e = new Evidence ();
                        e.AddHost (new Url ("http://www.go-mono.com/index.html"));
-                       Assert ("Check(+-)", umc.Check (e));
+                       Assert.IsTrue (umc.Check (e), "Check(+-)");
                }
 
                [Test]
@@ -188,16 +246,7 @@ namespace MonoTests.System.Security.Policy {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
                        Evidence e = new Evidence ();
                        e.AddHost (new Url ("http://www.go-mono.org"));
-                       Assert ("Check(-)", !umc.Check (e));
-               }
-
-               [Test]
-               public void CheckNegative_NoUrlEvidence () 
-               {
-                       UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
-                       Evidence e = new Evidence ();
-                       e.AddHost (new Zone (SecurityZone.MyComputer));
-                       Assert ("Check(?)", !umc.Check (e));
+                       Assert.IsFalse (umc.Check (e), "Check(-)");
                }
 
                [Test]
@@ -208,7 +257,7 @@ namespace MonoTests.System.Security.Policy {
                        e.AddHost (new Url ("http://www.go-mono.org")); // the bad
                        e.AddHost (new Url ("http://www.go-mono.com")); // the good
                        e.AddHost (new Zone (SecurityZone.MyComputer)); // and the ugly (couldn't resist ;)
-                       Assert ("Check(n)", umc.Check (e));
+                       Assert.IsTrue (umc.Check (e), "Check(n)");
                        // check all Url evidence (i.e. do not stop at the first Url evidence)
                }
 
@@ -217,7 +266,7 @@ namespace MonoTests.System.Security.Policy {
                {
                        UrlMembershipCondition umc1 = new UrlMembershipCondition ("http://www.go-mono.com");
                        UrlMembershipCondition umc2 = new UrlMembershipCondition ("http://www.Go-Mono.com");
-                       Assert ("CaseSensitive", umc1.Equals (umc2));
+                       Assert.IsTrue (umc1.Equals (umc2), "CaseSensitive");
                }
 
                [Test]
@@ -225,19 +274,19 @@ namespace MonoTests.System.Security.Policy {
                {
                        UrlMembershipCondition umc1 = new UrlMembershipCondition ("file://MONO");
                        UrlMembershipCondition umc2 = new UrlMembershipCondition ("file://mono");
-                       Assert ("CaseSensitive", umc1.Equals (umc2));
+                       Assert.IsTrue (umc1.Equals (umc2), "CaseSensitive");
                }
 
                [Test]
                public void EqualsNull () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
-                       Assert ("EqualsNull", !umc.Equals (null));
+                       Assert.IsFalse (umc.Equals (null), "EqualsNull");
                }
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-               public void FromXmlNull () 
+               public void FromXml_Null () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
                        umc.FromXml (null);
@@ -245,7 +294,7 @@ namespace MonoTests.System.Security.Policy {
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-               public void FromXmlInvalid () 
+               public void FromXml_InvalidTag () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
                        SecurityElement se = umc.ToXml ();
@@ -254,7 +303,52 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void FromXmlPolicyLevel () 
+               public void FromXml_InvalidClass ()
+               {
+                       UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
+                       SecurityElement se = umc.ToXml ();
+                       se.Attributes ["class"] = "Hello world";
+                       umc.FromXml (se);
+               }
+
+               [Test]
+               public void FromXml_NoClass ()
+               {
+                       UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
+                       SecurityElement se = umc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("version", se.Attribute ("version"));
+                       umc.FromXml (w);
+                       // doesn't even care of the class attribute presence
+               }
+
+               [Test]
+               public void FromXml_InvalidVersion ()
+               {
+                       UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
+                       SecurityElement se = umc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       w.AddAttribute ("version", "2");
+                       w.AddAttribute ("Url", se.Attribute ("Url"));
+                       umc.FromXml (w);
+               }
+
+               [Test]
+               public void FromXml_NoVersion ()
+               {
+                       UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
+                       SecurityElement se = umc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       umc.FromXml (w);
+               }
+
+               [Test]
+               public void FromXml_PolicyLevel () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
                        SecurityElement se = umc.ToXml ();
@@ -264,22 +358,22 @@ namespace MonoTests.System.Security.Policy {
                                PolicyLevel pl = e.Current as PolicyLevel;
                                UrlMembershipCondition spl = new UrlMembershipCondition ("*");
                                spl.FromXml (se, pl);
-                               Assert ("FromXml(PolicyLevel='" + pl.Label + "')", spl.Equals (umc));
+                               Assert.IsTrue (spl.Equals (umc), "FromXml(PolicyLevel='" + pl.Label + "')");
                        }
                        // yes!
                }
 
                [Test]
-               public void ToXmlNull () 
+               public void ToXml_Null () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
                        // no ArgumentNullException here
                        SecurityElement se = umc.ToXml (null);
-                       AssertNotNull ("ToXml(null)", se);
+                       Assert.IsNotNull (se, "ToXml(null)");
                }
 
                [Test]
-               public void ToXmlPolicyLevel () 
+               public void ToXml_PolicyLevel () 
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition ("http://www.go-mono.com");
                        SecurityElement se = umc.ToXml ();
@@ -290,7 +384,7 @@ namespace MonoTests.System.Security.Policy {
                                PolicyLevel pl = e.Current as PolicyLevel;
                                UrlMembershipCondition spl = new UrlMembershipCondition ("*");
                                spl.FromXml (se, pl);
-                               AssertEquals ("ToXml(PolicyLevel='" + pl.Label + "')", s, spl.ToXml (pl).ToString ());
+                               Assert.AreEqual (s, spl.ToXml (pl).ToString (), "ToXml(PolicyLevel='" + pl.Label + "')");
                        }
                        // yes!
                }
@@ -304,7 +398,7 @@ namespace MonoTests.System.Security.Policy {
                        UrlMembershipCondition umc2 = new UrlMembershipCondition ("*");
                        umc2.FromXml (se);
 
-                       AssertEquals ("ToFromXmlRoundTrip", umc1.GetHashCode (), umc2.GetHashCode ());
+                       Assert.AreEqual (umc1.GetHashCode (), umc2.GetHashCode (), "ToFromXmlRoundTrip");
                }
        }
 }
index 699219d8350eff8a79c0046c14d87b19c960dba5..35573f8294d8c8fe1aaed089d6dda754744e400a 100644 (file)
@@ -1,5 +1,6 @@
 //
-// ZoneMembershipConditionTest.cs - NUnit Test Cases for ZoneMembershipCondition
+// ZoneMembershipConditionTest.cs -
+//     NUnit Test Cases for ZoneMembershipCondition
 //
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
@@ -30,7 +31,6 @@ using NUnit.Framework;
 using System;
 using System.Collections;
 using System.Security;
-using System.Security.Permissions;
 using System.Security.Policy;
 
 namespace MonoTests.System.Security.Policy {
@@ -114,7 +114,9 @@ namespace MonoTests.System.Security.Policy {
                        Assert.IsTrue (zmc.ToString ().StartsWith ("Zone - "), "ToString-1");
                        Assert.IsTrue (zmc.ToString ().EndsWith (zmc.SecurityZone.ToString ()), "ToString-2");
 
+#if NET_2_0
                        Assert.AreEqual (zmc.SecurityZone.GetHashCode (), zmc.GetHashCode (), "GetHashCode");
+#endif
 
                        return zmc; // for further tests
                }
@@ -241,7 +243,7 @@ namespace MonoTests.System.Security.Policy {
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-               public void FromXmlNull ()
+               public void FromXml_Null ()
                {
                        ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
                        zmc.FromXml (null);
@@ -249,7 +251,7 @@ namespace MonoTests.System.Security.Policy {
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-               public void FromXmlInvalid ()
+               public void FromXml_InvalidTag ()
                {
                        ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
                        SecurityElement se = zmc.ToXml ();
@@ -258,7 +260,52 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void FromXmlPolicyLevel ()
+               public void FromXml_InvalidClass ()
+               {
+                       ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
+                       SecurityElement se = zmc.ToXml ();
+                       se.Attributes ["class"] = "Hello world";
+                       zmc.FromXml (se);
+               }
+
+               [Test]
+               public void FromXml_NoClass ()
+               {
+                       ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
+                       SecurityElement se = zmc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("version", se.Attribute ("version"));
+                       zmc.FromXml (w);
+                       // doesn't even care of the class attribute presence
+               }
+
+               [Test]
+               public void FromXml_InvalidVersion ()
+               {
+                       ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
+                       SecurityElement se = zmc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       w.AddAttribute ("version", "2");
+                       w.AddAttribute ("Zone", se.Attribute ("Zone"));
+                       zmc.FromXml (w);
+               }
+
+               [Test]
+               public void FromXml_NoVersion ()
+               {
+                       ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
+                       SecurityElement se = zmc.ToXml ();
+
+                       SecurityElement w = new SecurityElement (se.Tag);
+                       w.AddAttribute ("class", se.Attribute ("class"));
+                       zmc.FromXml (w);
+               }
+
+               [Test]
+               public void FromXml_PolicyLevel ()
                {
                        ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
                        SecurityElement se = zmc.ToXml ();
@@ -274,7 +321,16 @@ namespace MonoTests.System.Security.Policy {
                }
 
                [Test]
-               public void ToXmlPolicyLevel ()
+               public void ToXml_Null ()
+               {
+                       ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
+                       // no ArgumentNullException here
+                       SecurityElement se = zmc.ToXml (null);
+                       Assert.IsNotNull (se, "ToXml(null)");
+               }
+
+               [Test]
+               public void ToXml_PolicyLevel ()
                {
                        ZoneMembershipCondition zmc = new ZoneMembershipCondition (SecurityZone.MyComputer);
                        SecurityElement se = zmc.ToXml ();