In Test/System.Security.Cryptography.X509Certificates:

2009-06-26  Robert Jordan  <robertj@gmx.net>

	* X509CertificateCollectionTest.cs,
	X509ChainPolicyTest.cs: Upgrade to new NUnit style.

In Test/System.Security.Cryptography:
2009-06-26  Robert Jordan  <robertj@gmx.net>

	* OidCollectionTest.cs, OidEnumeratorTest.cs:
	Upgrade to new NUnit style.


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

6 files changed, 128 insertions, 118 deletions

diff --git a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/ChangeLog
index c1d162a92c1..5bf088696f2 100644
--- a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/ChangeLog
+++ b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-26  Robert Jordan  <robertj@gmx.net>
+
+	* X509CertificateCollectionTest.cs,
+	X509ChainPolicyTest.cs: Upgrade to new NUnit style.
+
 2009-03-26  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* X509ChainPolicyTest.cs: Add a small sleep between the Reset and
diff --git a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509CertificateCollectionTest.cs b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509CertificateCollectionTest.cs
index 6affe82e944..bcb8854963a 100644
--- a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509CertificateCollectionTest.cs
+++ b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509CertificateCollectionTest.cs
@@ -16,7 +16,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Security.Cryptography.X509Certificates {
 
 	[TestFixture]
-        public class X509CertificateCollectionTest : Assertion {
+        public class X509CertificateCollectionTest {
 
 		private static byte[] cert_a = { 0x30,0x82,0x01,0xFF,0x30,0x82,0x01,0x6C,0x02,0x05,0x02,0x72,0x00,0x06,0xE8,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x30,0x5F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x13,0x17,0x52,0x53,0x41,0x20,0x44,0x61,0x74,0x61,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x2C,0x20,0x49,0x6E,0x63,0x2E,0x31,0x2E,0x30,0x2C,0x06,0x03,0x55,0x04,0x0B,0x13,0x25,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x53,0x65,0x72,0x76,
 			0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x1E,0x17,0x0D,0x39,0x36,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x37,0x5A,0x17,0x0D,0x39,0x37,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x36,0x5A,0x30,0x61,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0A,0x43,0x61,0x6C,0x69,0x66,0x6F,0x72,0x6E,0x69,0x61,0x31,0x14,0x30,0x12,0x06,0x03,
@@ -59,14 +59,14 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		public void Constructor ()
 		{
 			X509CertificateCollection c = new X509CertificateCollection ();
-			AssertEquals ("Count", 0, c.Count);
+			Assert.AreEqual (0, c.Count, "Count");
 		}
 
 		[Test]
 		public void Constructor_CertificateArray ()
 		{
 			X509CertificateCollection c = new X509CertificateCollection (range);
-			AssertEquals ("Count", 2, c.Count);
+			Assert.AreEqual (2, c.Count, "Count");
 		}
 
 		[Test]
@@ -82,7 +82,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509CertificateCollection coll = new X509CertificateCollection (range);
 			X509CertificateCollection c = new X509CertificateCollection (coll);
-			AssertEquals ("Count", 2, c.Count);
+			Assert.AreEqual (2, c.Count, "Count");
 		}
 
 		[Test]
@@ -97,14 +97,14 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		public void Add ()
 		{
 			X509CertificateCollection c = new X509CertificateCollection ();
-			AssertEquals ("Add a", 0, c.Add (x509a));
-			AssertEquals ("1", 1, c.Count);
+			Assert.AreEqual (0, c.Add (x509a), "Add a");
+			Assert.AreEqual (1, c.Count, "1");
 
-			AssertEquals ("Add a(dup)", 1, c.Add (x509a));
-			AssertEquals ("2", 2, c.Count);
+			Assert.AreEqual (1, c.Add (x509a), "Add a(dup)");
+			Assert.AreEqual (2, c.Count, "2");
 
-			AssertEquals ("Add b", 2, c.Add (x509b));
-			AssertEquals ("3", 3, c.Count);
+			Assert.AreEqual (2, c.Add (x509b), "Add b");
+			Assert.AreEqual (3, c.Count, "3");
 		}
 
 		[Test]
@@ -121,13 +121,13 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			X509CertificateCollection c = new X509CertificateCollection ();
 
 			c.AddRange (range);
-			AssertEquals ("Range(a+b)", 2, c.Count);
+			Assert.AreEqual (2, c.Count, "Range(a+b)");
 
 			c.AddRange (range);
-			AssertEquals ("Duplicate(a+b)", 4, c.Count);
+			Assert.AreEqual (4, c.Count, "Duplicate(a+b)");
 
 			c.Add (x509c);
-			AssertEquals ("New(c)", 5, c.Count);
+			Assert.AreEqual (5, c.Count, "New(c)");
 		}
 
 		[Test]
@@ -146,20 +146,20 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			X509CertificateCollection c = new X509CertificateCollection ();
 
 			c.AddRange (c);
-			AssertEquals ("Self(none)", 0, c.Count);
+			Assert.AreEqual (0, c.Count, "Self(none)");
 
 			c.AddRange (coll);
-			AssertEquals ("Range(a+b)", 2, c.Count);
+			Assert.AreEqual (2, c.Count, "Range(a+b)");
 
 			c.AddRange (coll);
-			AssertEquals ("Duplicate(a+b)", 4, c.Count);
+			Assert.AreEqual (4, c.Count, "Duplicate(a+b)");
 
 			c.Add (x509c);
-			AssertEquals ("New(c)", 5, c.Count);
+			Assert.AreEqual (5, c.Count, "New(c)");
 
 			// This leads to an infinite loop until the runtime throws an OutOfMemoryException
 			//c.AddRange (c);
-			//AssertEquals ("Self(double)", 10, c.Count);
+			//Assert.AreEqual (10, c.Count, "Self(double)");
 		}
 
 		[Test]
@@ -175,16 +175,16 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		public void Contains () 
 		{
 			X509CertificateCollection c = new X509CertificateCollection ();
-			Assert ("Empty-A", !c.Contains (x509a));
-			Assert ("Empty-Null", !c.Contains (null));
+			Assert.IsTrue (!c.Contains (x509a), "Empty-A");
+			Assert.IsTrue (!c.Contains (null), "Empty-Null");
 
 			c.Add (x509a);
-			Assert ("A-A", c.Contains (x509a));
-			Assert ("A-B", !c.Contains (x509b));
+			Assert.IsTrue (c.Contains (x509a), "A-A");
+			Assert.IsTrue (!c.Contains (x509b), "A-B");
 
 			// works by value not by object reference
 			X509Certificate x = new X509Certificate (cert_a);
-			Assert ("A-x", c.Contains (x));
+			Assert.IsTrue (c.Contains (x), "A-x");
 		}
 
 		[Test]
@@ -221,27 +221,27 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			X509CertificateCollection c = new X509CertificateCollection ();
 			c.Add (x509a);
 			c.CopyTo (array, 0);
-			Assert ("CopyTo", x509a.Equals (array [0]));
+			Assert.IsTrue (x509a.Equals (array [0]), "CopyTo");
 		}
 
 		[Test]
 		public void IndexOf () 
 		{
 			X509CertificateCollection c = new X509CertificateCollection ();
-			AssertEquals ("Empty-A", -1, c.IndexOf (x509a));
-			AssertEquals ("Empty-Null", -1, c.IndexOf (null));
+			Assert.AreEqual (-1, c.IndexOf (x509a), "Empty-A");
+			Assert.AreEqual (-1, c.IndexOf (null), "Empty-Null");
 
 			c.Add (x509a);
-			AssertEquals ("A-A", 0, c.IndexOf (x509a));
-			AssertEquals ("A-B", -1, c.IndexOf (x509b));
+			Assert.AreEqual (0, c.IndexOf (x509a), "A-A");
+			Assert.AreEqual (-1, c.IndexOf (x509b), "A-B");
 
 			// works by object reference (not value)
 			X509Certificate x = new X509Certificate (cert_a);
-			Assert ("!ReferenceEquals", !Object.ReferenceEquals (x509a, x));
+			Assert.IsTrue (!Object.ReferenceEquals (x509a, x), "!ReferenceEquals");
 #if NET_2_0
-			AssertEquals ("A-x", 0, c.IndexOf (x));
+			Assert.AreEqual (0, c.IndexOf (x), "A-x");
 #else
-			AssertEquals ("A-x", -1, c.IndexOf (x));
+			Assert.AreEqual (-1, c.IndexOf (x), "A-x");
 #endif
 		}
 
@@ -250,13 +250,13 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509CertificateCollection c = new X509CertificateCollection ();
 			c.Add (x509a);
-			AssertEquals ("a=0", 0, c.IndexOf (x509a));
+			Assert.AreEqual (0, c.IndexOf (x509a), "a=0");
 			c.Add (x509c);
-			AssertEquals ("c=1", 1, c.IndexOf (x509c));
+			Assert.AreEqual (1, c.IndexOf (x509c), "c=1");
 
 			c.Insert (1, x509b);
-			AssertEquals ("1", 1, c.IndexOf (x509b));
-			AssertEquals ("2", 2, c.IndexOf (x509c));
+			Assert.AreEqual (1, c.IndexOf (x509b), "1");
+			Assert.AreEqual (2, c.IndexOf (x509c), "2");
 		}
 
 		[Test]
@@ -264,9 +264,9 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509CertificateCollection c = new X509CertificateCollection ();
 			c.Add (x509a);
-			AssertEquals ("Count==1", 1, c.Count);
+			Assert.AreEqual (1, c.Count, "Count==1");
 			c.Remove (x509a);
-			AssertEquals ("Remove,Count==0", 0, c.Count);
+			Assert.AreEqual (0, c.Count, "Remove Count==0");
 		}
 
 		[Test]
@@ -290,17 +290,17 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			try {
 				// don't fail in this block
 				c.Add (x509a);
-				AssertEquals ("Read,Count==1", 1, c.Count);
+				Assert.AreEqual (1, c.Count, "Read Count==1");
 
 				// works by object reference (not by value)
 				x = new X509Certificate (cert_a);
-				Assert ("!ReferenceEquals", !Object.ReferenceEquals (x509a, x));
+				Assert.IsTrue (!Object.ReferenceEquals (x509a, x), "!ReferenceEquals");
 			}
 			catch {}
 
 			// fail here! (well for 1.x)
 			c.Remove (x);
-			AssertEquals ("Remove-by-value,Count==0", 0, c.Count);
+			Assert.AreEqual (0, c.Count, "Remove-by-value Count==0");
 		}
 
 		[Test]
diff --git a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs
index bfa0b005233..8c74173c4c6 100644
--- a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs
+++ b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs
@@ -40,7 +40,7 @@ using System.Threading;
 namespace MonoTests.System.Security.Cryptography.X509Certificates {
 
 	[TestFixture]
-	public class X509ChainPolicyTest : Assertion {
+	public class X509ChainPolicyTest {
 
 		static string signingTimeOid = "1.2.840.113549.1.9.5";
 
@@ -55,15 +55,15 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			// default properties
-			AssertEquals ("ApplicationPolicy", 0, cp.ApplicationPolicy.Count);
-			AssertEquals ("CertificatePolicy", 0, cp.CertificatePolicy.Count);
-			AssertEquals ("ExtraStore", 0, cp.ExtraStore.Count);
-			AssertEquals ("RevocationFlag", X509RevocationFlag.ExcludeRoot, cp.RevocationFlag);
-			AssertEquals ("RevocationMode", X509RevocationMode.Online, cp.RevocationMode);
-			AssertEquals ("UrlRetrievalTimeout", 0, cp.UrlRetrievalTimeout.Ticks);
-			AssertEquals ("VerificationFlags", X509VerificationFlags.NoFlag, cp.VerificationFlags);
+			Assert.AreEqual (0, cp.ApplicationPolicy.Count, "ApplicationPolicy");
+			Assert.AreEqual (0, cp.CertificatePolicy.Count, "CertificatePolicy");
+			Assert.AreEqual (0, cp.ExtraStore.Count, "ExtraStore");
+			Assert.AreEqual (X509RevocationFlag.ExcludeRoot, cp.RevocationFlag, "RevocationFlag");
+			Assert.AreEqual (X509RevocationMode.Online, cp.RevocationMode, "RevocationMode");
+			Assert.AreEqual (0, cp.UrlRetrievalTimeout.Ticks, "UrlRetrievalTimeout");
+			Assert.AreEqual (X509VerificationFlags.NoFlag, cp.VerificationFlags, "VerificationFlags");
 			DateTime vt = cp.VerificationTime;
-			Assert ("VerificationTime", ((vt <= DateTime.Now) && (vt > DateTime.Now.AddMinutes (-1))));
+			Assert.IsTrue (((vt <= DateTime.Now) && (vt > DateTime.Now.AddMinutes (-1))), "VerificationTime");
 		}
 
 		[Test]
@@ -71,7 +71,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.ApplicationPolicy.Add (new Oid (signingTimeOid));
-			AssertEquals ("ApplicationPolicy", 1, cp.ApplicationPolicy.Count);
+			Assert.AreEqual (1, cp.ApplicationPolicy.Count, "ApplicationPolicy");
 		}
 
 		[Test]
@@ -80,10 +80,10 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			X509ChainPolicy cp = GetPolicy ();
 			cp.ApplicationPolicy.Add (new Oid (signingTimeOid));
 			OidCollection oc = cp.ApplicationPolicy;
-			AssertEquals ("ApplicationPolicy-1", 1, oc.Count);
+			Assert.AreEqual (1, oc.Count, "ApplicationPolicy-1");
 			cp.Reset ();
-			AssertEquals ("ApplicationPolicy-2", 1, oc.Count);
-			AssertEquals ("ApplicationPolicy-3", 0, cp.ApplicationPolicy.Count);
+			Assert.AreEqual (1, oc.Count, "ApplicationPolicy-2");
+			Assert.AreEqual (0, cp.ApplicationPolicy.Count, "ApplicationPolicy-3");
 		}
 
 		[Test]
@@ -91,7 +91,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.CertificatePolicy.Add (new Oid (signingTimeOid));
-			AssertEquals ("CertificatePolicy", 1, cp.CertificatePolicy.Count);
+			Assert.AreEqual (1, cp.CertificatePolicy.Count, "CertificatePolicy");
 		}
 
 		[Test]
@@ -100,10 +100,10 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			X509ChainPolicy cp = GetPolicy ();
 			cp.CertificatePolicy.Add (new Oid (signingTimeOid));
 			OidCollection oc = cp.CertificatePolicy;
-			AssertEquals ("CertificatePolicy-1", 1, oc.Count);
+			Assert.AreEqual (1, oc.Count, "CertificatePolicy-1");
 			cp.Reset ();
-			AssertEquals ("CertificatePolicy-2", 1, oc.Count);
-			AssertEquals ("CertificatePolicy-3", 0, cp.CertificatePolicy.Count);
+			Assert.AreEqual (1, oc.Count, "CertificatePolicy-2");
+			Assert.AreEqual (0, cp.CertificatePolicy.Count, "CertificatePolicy-3");
 		}
 
 		[Test]
@@ -111,7 +111,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.ExtraStore.Add (new X509Certificate2 ());
-			AssertEquals ("ExtraStore", 1, cp.ExtraStore.Count);
+			Assert.AreEqual (1, cp.ExtraStore.Count, "ExtraStore");
 		}
 
 		[Test]
@@ -120,10 +120,10 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			X509ChainPolicy cp = GetPolicy ();
 			cp.ExtraStore.Add (new X509Certificate2 ());
 			X509Certificate2Collection cc = cp.ExtraStore;
-			AssertEquals ("ExtraStore-1", 1, cc.Count);
+			Assert.AreEqual (1, cc.Count, "ExtraStore-1");
 			cp.Reset ();
-			AssertEquals ("ExtraStore-2", 1, cc.Count);
-			AssertEquals ("ExtraStore-3", 0, cp.ExtraStore.Count);
+			Assert.AreEqual (1, cc.Count, "ExtraStore-2");
+			Assert.AreEqual (0, cp.ExtraStore.Count, "ExtraStore-3");
 		}
 
 		[Test]
@@ -131,11 +131,11 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.RevocationFlag = X509RevocationFlag.EndCertificateOnly;
-			AssertEquals ("EndCertificateOnly", X509RevocationFlag.EndCertificateOnly, cp.RevocationFlag);
+			Assert.AreEqual (X509RevocationFlag.EndCertificateOnly, cp.RevocationFlag, "EndCertificateOnly");
 			cp.RevocationFlag = X509RevocationFlag.EntireChain;
-			AssertEquals ("EntireChain", X509RevocationFlag.EntireChain, cp.RevocationFlag);
+			Assert.AreEqual (X509RevocationFlag.EntireChain, cp.RevocationFlag, "EntireChain");
 			cp.RevocationFlag = X509RevocationFlag.ExcludeRoot;
-			AssertEquals ("ExcludeRoot", X509RevocationFlag.ExcludeRoot, cp.RevocationFlag);
+			Assert.AreEqual (X509RevocationFlag.ExcludeRoot, cp.RevocationFlag, "ExcludeRoot");
 		}
 
 		[Test]
@@ -151,11 +151,11 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.RevocationMode = X509RevocationMode.NoCheck;
-			AssertEquals ("NoCheck", X509RevocationMode.NoCheck, cp.RevocationMode);
+			Assert.AreEqual (X509RevocationMode.NoCheck, cp.RevocationMode, "NoCheck");
 			cp.RevocationMode = X509RevocationMode.Offline;
-			AssertEquals ("Offline", X509RevocationMode.Offline, cp.RevocationMode);
+			Assert.AreEqual (X509RevocationMode.Offline, cp.RevocationMode, "Offline");
 			cp.RevocationMode = X509RevocationMode.Online;
-			AssertEquals ("Online", X509RevocationMode.Online, cp.RevocationMode);
+			Assert.AreEqual (X509RevocationMode.Online, cp.RevocationMode, "Online");
 		}
 
 		[Test]
@@ -171,13 +171,13 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.UrlRetrievalTimeout = new TimeSpan (100);
-			AssertEquals ("TimeSpan=100", 100, cp.UrlRetrievalTimeout.Ticks);
+			Assert.AreEqual (100, cp.UrlRetrievalTimeout.Ticks, "TimeSpan=100");
 			cp.UrlRetrievalTimeout = new TimeSpan (0);
-			AssertEquals ("TimeSpan=0", 0, cp.UrlRetrievalTimeout.Ticks);
+			Assert.AreEqual (0, cp.UrlRetrievalTimeout.Ticks, "TimeSpan=0");
 			cp.UrlRetrievalTimeout = TimeSpan.MinValue;
-			AssertEquals ("TimeSpan=MinValue", TimeSpan.MinValue, cp.UrlRetrievalTimeout);
+			Assert.AreEqual (TimeSpan.MinValue, cp.UrlRetrievalTimeout, "TimeSpan=MinValue");
 			cp.UrlRetrievalTimeout = TimeSpan.MaxValue;
-			AssertEquals ("TimeSpan=MaxValue", TimeSpan.MaxValue, cp.UrlRetrievalTimeout);
+			Assert.AreEqual (TimeSpan.MaxValue, cp.UrlRetrievalTimeout, "TimeSpan=MaxValue");
 		}
 
 		[Test]
@@ -185,33 +185,33 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		{
 			X509ChainPolicy cp = GetPolicy ();
 			cp.VerificationFlags = X509VerificationFlags.AllFlags;
-			AssertEquals ("AllFlags", X509VerificationFlags.AllFlags, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.AllFlags, cp.VerificationFlags, "AllFlags");
 			cp.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
-			AssertEquals ("AllowUnknownCertificateAuthority", X509VerificationFlags.AllowUnknownCertificateAuthority, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.AllowUnknownCertificateAuthority, cp.VerificationFlags, "AllowUnknownCertificateAuthority");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreCertificateAuthorityRevocationUnknown;
-			AssertEquals ("IgnoreCertificateAuthorityRevocationUnknown", X509VerificationFlags.IgnoreCertificateAuthorityRevocationUnknown, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreCertificateAuthorityRevocationUnknown, cp.VerificationFlags, "IgnoreCertificateAuthorityRevocationUnknown");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreCtlNotTimeValid;
-			AssertEquals ("IgnoreCtlNotTimeValid", X509VerificationFlags.IgnoreCtlNotTimeValid, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreCtlNotTimeValid, cp.VerificationFlags, "IgnoreCtlNotTimeValid");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreCtlSignerRevocationUnknown;
-			AssertEquals ("IgnoreCtlSignerRevocationUnknown", X509VerificationFlags.IgnoreCtlSignerRevocationUnknown, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreCtlSignerRevocationUnknown, cp.VerificationFlags, "IgnoreCtlSignerRevocationUnknown");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreEndRevocationUnknown;
-			AssertEquals ("IgnoreEndRevocationUnknown", X509VerificationFlags.IgnoreEndRevocationUnknown, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreEndRevocationUnknown, cp.VerificationFlags, "IgnoreEndRevocationUnknown");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreInvalidBasicConstraints;
-			AssertEquals ("IgnoreInvalidBasicConstraints", X509VerificationFlags.IgnoreInvalidBasicConstraints, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreInvalidBasicConstraints, cp.VerificationFlags, "IgnoreInvalidBasicConstraints");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreInvalidName;
-			AssertEquals ("IgnoreInvalidName", X509VerificationFlags.IgnoreInvalidName, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreInvalidName, cp.VerificationFlags, "IgnoreInvalidName");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreInvalidPolicy;
-			AssertEquals ("IgnoreInvalidPolicy", X509VerificationFlags.IgnoreInvalidPolicy, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreInvalidPolicy, cp.VerificationFlags, "IgnoreInvalidPolicy");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreNotTimeNested;
-			AssertEquals ("IgnoreNotTimeNested", X509VerificationFlags.IgnoreNotTimeNested, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreNotTimeNested, cp.VerificationFlags, "IgnoreNotTimeNested");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreNotTimeValid;
-			AssertEquals ("IgnoreNotTimeValid", X509VerificationFlags.IgnoreNotTimeValid, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreNotTimeValid, cp.VerificationFlags, "IgnoreNotTimeValid");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreRootRevocationUnknown;
-			AssertEquals ("IgnoreRootRevocationUnknown", X509VerificationFlags.IgnoreRootRevocationUnknown, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreRootRevocationUnknown, cp.VerificationFlags, "IgnoreRootRevocationUnknown");
 			cp.VerificationFlags = X509VerificationFlags.IgnoreWrongUsage;
-			AssertEquals ("IgnoreWrongUsage", X509VerificationFlags.IgnoreWrongUsage, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.IgnoreWrongUsage, cp.VerificationFlags, "IgnoreWrongUsage");
 			cp.VerificationFlags = X509VerificationFlags.NoFlag;
-			AssertEquals ("NoFlag", X509VerificationFlags.NoFlag, cp.VerificationFlags);
+			Assert.AreEqual (X509VerificationFlags.NoFlag, cp.VerificationFlags, "NoFlag");
 		}
 
 		[Test]
@@ -226,15 +226,15 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		public void VerificationTime ()
 		{
 			X509ChainPolicy cp = GetPolicy ();
-			AssertEquals ("Kind=Local", DateTimeKind.Local, cp.VerificationTime.Kind);
+			Assert.AreEqual (DateTimeKind.Local, cp.VerificationTime.Kind, "Kind=Local");
 			cp.VerificationTime = DateTime.Today;
-			AssertEquals ("DateTime=Today", DateTime.Today, cp.VerificationTime);
+			Assert.AreEqual (DateTime.Today, cp.VerificationTime, "DateTime=Today");
 			cp.VerificationTime = new DateTime (0);
-			AssertEquals ("DateTime=0", 0, cp.VerificationTime.Ticks);
+			Assert.AreEqual (0, cp.VerificationTime.Ticks, "DateTime=0");
 			cp.VerificationTime = DateTime.MinValue;
-			AssertEquals ("DateTime=MinValue", DateTime.MinValue, cp.VerificationTime);
+			Assert.AreEqual (DateTime.MinValue, cp.VerificationTime, "DateTime=MinValue");
 			cp.VerificationTime = DateTime.MaxValue;
-			AssertEquals ("DateTime=MaxValue", DateTime.MaxValue, cp.VerificationTime);
+			Assert.AreEqual (DateTime.MaxValue, cp.VerificationTime, "DateTime=MaxValue");
 		}
 
 		[Test]
@@ -249,21 +249,21 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 			cp.UrlRetrievalTimeout = new TimeSpan (100);
 			cp.VerificationFlags = X509VerificationFlags.AllFlags;
 			DateTime vt = cp.VerificationTime;
-			Assert ("VerificationTime", ((vt <= DateTime.Now) && (vt > DateTime.Now.AddMinutes (-1))));
+			Assert.IsTrue (((vt <= DateTime.Now) && (vt > DateTime.Now.AddMinutes (-1))), "VerificationTime");
 			// wait a bit before calling Reset, otherwise we could end up with the same time value
 			Thread.Sleep (100);
 			cp.Reset ();
-			Assert ("VerificationTime-Reset", (vt != cp.VerificationTime));
+			Assert.IsTrue ((vt != cp.VerificationTime), "VerificationTime-Reset");
 			// default properties
-			AssertEquals ("ApplicationPolicy", 0, cp.ApplicationPolicy.Count);
-			AssertEquals ("CertificatePolicy", 0, cp.CertificatePolicy.Count);
-			AssertEquals ("ExtraStore", 0, cp.ExtraStore.Count);
-			AssertEquals ("RevocationFlag", X509RevocationFlag.ExcludeRoot, cp.RevocationFlag);
-			AssertEquals ("RevocationMode", X509RevocationMode.Online, cp.RevocationMode);
-			AssertEquals ("UrlRetrievalTimeout", 0, cp.UrlRetrievalTimeout.Ticks);
-			AssertEquals ("VerificationFlags", X509VerificationFlags.NoFlag, cp.VerificationFlags);
+			Assert.AreEqual (0, cp.ApplicationPolicy.Count, "ApplicationPolicy");
+			Assert.AreEqual (0, cp.CertificatePolicy.Count, "CertificatePolicy");
+			Assert.AreEqual (0, cp.ExtraStore.Count, "ExtraStore");
+			Assert.AreEqual (X509RevocationFlag.ExcludeRoot, cp.RevocationFlag, "RevocationFlag");
+			Assert.AreEqual (X509RevocationMode.Online, cp.RevocationMode, "RevocationMode");
+			Assert.AreEqual (0, cp.UrlRetrievalTimeout.Ticks, "UrlRetrievalTimeout");
+			Assert.AreEqual (X509VerificationFlags.NoFlag, cp.VerificationFlags, "VerificationFlags");
 			vt = cp.VerificationTime;
-			Assert ("VerificationTime", ((vt <= DateTime.Now) && (vt > DateTime.Now.AddMinutes (-1))));
+			Assert.IsTrue (((vt <= DateTime.Now) && (vt > DateTime.Now.AddMinutes (-1))), "VerificationTime");
 		}
 	}
 }
diff --git a/mcs/class/System/Test/System.Security.Cryptography/ChangeLog b/mcs/class/System/Test/System.Security.Cryptography/ChangeLog
index 43f143cdc1b..a88ddd2d572 100644
--- a/mcs/class/System/Test/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/System/Test/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-26  Robert Jordan  <robertj@gmx.net>
+
+	* OidCollectionTest.cs, OidEnumeratorTest.cs:
+	Upgrade to new NUnit style.
+
 2007-03-07  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
 	* AsnEncodedDataTest.cs, OidCollectionTest.cs, OidEnumeratorTest.cs,
diff --git a/mcs/class/System/Test/System.Security.Cryptography/OidCollectionTest.cs b/mcs/class/System/Test/System.Security.Cryptography/OidCollectionTest.cs
index e057ff4f09e..282d6999d28 100644
--- a/mcs/class/System/Test/System.Security.Cryptography/OidCollectionTest.cs
+++ b/mcs/class/System/Test/System.Security.Cryptography/OidCollectionTest.cs
@@ -20,7 +20,7 @@ namespace MonoTests.System.Security.Cryptography {
 #if TARGET_JVM
 	[Ignore ("The class System.Security.Cryptography.OidCollection - is not supported")]
 #endif
-	public class OidCollectionTest : Assertion {
+	public class OidCollectionTest {
 #if !TARGET_JVM
 
 		[Test]
@@ -28,10 +28,10 @@ namespace MonoTests.System.Security.Cryptography {
 		{
 			OidCollection oc = new OidCollection ();
 			// default properties
-			AssertEquals ("Count", 0, oc.Count);
-			Assert ("IsSynchronized", !oc.IsSynchronized);
-			AssertNotNull ("SyncRoot", oc.SyncRoot);
-			AssertNotNull ("GetEnumerator", oc.GetEnumerator ());
+			Assert.AreEqual (0, oc.Count, "Count");
+			Assert.IsTrue (!oc.IsSynchronized, "IsSynchronized");
+			Assert.IsNotNull (oc.SyncRoot, "SyncRoot");
+			Assert.IsNotNull (oc.GetEnumerator (), "GetEnumerator");
 		}
 
 		[Test]
@@ -39,9 +39,9 @@ namespace MonoTests.System.Security.Cryptography {
 		{
 			OidCollection oc = new OidCollection ();
 			oc.Add (new Oid ("1.0"));
-			AssertEquals ("Count", 1, oc.Count);
-			AssertEquals ("[0]", "1.0", oc [0].Value);
-			AssertEquals ("['1.0']", "1.0", oc ["1.0"].Value);
+			Assert.AreEqual (1, oc.Count, "Count");
+			Assert.AreEqual ("1.0", oc [0].Value, "[0]");
+			Assert.AreEqual ("1.0", oc ["1.0"].Value, "['1.0']");
 		}
 
 		[Test]
@@ -50,8 +50,8 @@ namespace MonoTests.System.Security.Cryptography {
 		{
 			OidCollection oc = new OidCollection ();
 			oc.Add (null);
-			AssertEquals ("Count", 1, oc.Count);
-			// AssertNull ("[0]", oc); throw NullReferenceException
+			Assert.AreEqual (1, oc.Count, "Count");
+			// Assert.IsNull (oc, "[0]"); throw NullReferenceException
 		}
 
 		[Test]
@@ -61,7 +61,7 @@ namespace MonoTests.System.Security.Cryptography {
 			oc.Add (new Oid ("1.0"));
 			Oid[] array = new Oid [1];
 			oc.CopyTo (array, 0);
-			AssertEquals ("CopyTo(Oid)", "1.0", array [0].Value);
+			Assert.AreEqual ("1.0", array [0].Value, "CopyTo(Oid)");
 		}
 
 		[Test]
diff --git a/mcs/class/System/Test/System.Security.Cryptography/OidEnumeratorTest.cs b/mcs/class/System/Test/System.Security.Cryptography/OidEnumeratorTest.cs
index 2fa58d7b553..84085f13788 100644
--- a/mcs/class/System/Test/System.Security.Cryptography/OidEnumeratorTest.cs
+++ b/mcs/class/System/Test/System.Security.Cryptography/OidEnumeratorTest.cs
@@ -20,7 +20,7 @@ namespace MonoTests.System.Security.Cryptography {
 #if TARGET_JVM
 	[Ignore ("The class System.Security.Cryptography.OidEnumerator - is not supported")]
 #endif
-	public class OidEnumeratorTest : Assertion {
+	public class OidEnumeratorTest {
 #if !TARGET_JVM
 		private OidEnumerator GetEnumerator () 
 		{
@@ -45,7 +45,7 @@ namespace MonoTests.System.Security.Cryptography {
 			OidEnumerator enumerator = GetEnumerator ();
 			enumerator.MoveNext ();
 			Oid oid = enumerator.Current;
-			AssertNotNull ("Current", oid);
+			Assert.IsNotNull (oid, "Current");
 		}
 
 		[Test]
@@ -54,8 +54,8 @@ namespace MonoTests.System.Security.Cryptography {
 			OidEnumerator enumerator = GetEnumerator ();
 			while (enumerator.MoveNext ());
 			Oid oid = enumerator.Current;
-			AssertNotNull ("Current_AfterLastElement", oid);
-			AssertEquals ("Current==last", "1.2", oid.Value);
+			Assert.IsNotNull (oid, "Current_AfterLastElement");
+			Assert.AreEqual ("1.2", oid.Value, "Current==last");
 		}
 
 		[Test]
@@ -66,7 +66,7 @@ namespace MonoTests.System.Security.Cryptography {
 			while (enumerator.MoveNext ()) {
 				n++;
 			}
-			AssertEquals ("MoveNext", 3, n);
+			Assert.AreEqual (3, n, "MoveNext");
 		}
 
 		[Test]
@@ -75,9 +75,9 @@ namespace MonoTests.System.Security.Cryptography {
 		{
 			OidEnumerator enumerator = GetEnumerator ();
 			enumerator.MoveNext ();
-			AssertNotNull ("Current before reset", enumerator.Current);
+			Assert.IsNotNull (enumerator.Current, "Current before reset");
 			enumerator.Reset ();
-			AssertNotNull ("Current after reset", enumerator.Current);
+			Assert.IsNotNull (enumerator.Current, "Current after reset");
 		}
 #endif
 	}