2003-04-23 Sebastien Pouliot <spouliot@videotron.ca>
authorSebastien Pouliot <sebastien@ximian.com>
Thu, 24 Apr 2003 03:28:43 +0000 (03:28 -0000)
committerSebastien Pouliot <sebastien@ximian.com>
Thu, 24 Apr 2003 03:28:43 +0000 (03:28 -0000)
* PublisherTest.cs: Updated to NUnit2 style.
* PublisherMembershipConditionTest.cs: Updated to NUnit2 style.
* StrongNameTest.cs: Updated to NUnit2 style.

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

mcs/class/corlib/Test/System.Security.Policy/ChangeLog
mcs/class/corlib/Test/System.Security.Policy/PublisherMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/PublisherTest.cs
mcs/class/corlib/Test/System.Security.Policy/StrongNameTest.cs

index 8d2af6b02f51c54f11a4183e7e1d5a4953cc72b0..483d8afcf1a7bb2480992a660a82482aa3bb413a 100644 (file)
@@ -1,3 +1,9 @@
+2003-04-23  Sebastien Pouliot  <spouliot@videotron.ca>
+
+       * PublisherTest.cs: Updated to NUnit2 style.
+       * PublisherMembershipConditionTest.cs: Updated to NUnit2 style.
+       * StrongNameTest.cs: Updated to NUnit2 style.
+
 2002-12-21  Nick Drochak <ndrochak@gol.com>
 
        * all: make tests build and run under nunit2
index 74363d8c3afc974b074b8903240e199bfaa4b868..a721c30e5e5b82210c98ade3529132752289344f 100644 (file)
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot (spouliot@motus.com)
 //
-// (C) 2002 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
 //
 
 using NUnit.Framework;
@@ -16,11 +16,8 @@ using System.Security.Policy;
 
 namespace MonoTests.System.Security.Policy {
 
-public class PublisherMembershipConditionTest : TestCase {
-
-       protected override void SetUp () {}
-
-       protected override void TearDown () {}
+[TestFixture]
+public class PublisherMembershipConditionTest {
 
        static byte[] msSpCert = { 0x30, 0x82, 0x05, 0x0F, 0x30, 0x82, 0x03, 0xF7, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x0A, 0x61, 0x07, 0x11, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x81, 0xA6, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E, 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x2B, 0x30, 0x29, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x22, 0x43, 0x6F, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x30, 0x20, 0x4D, 0x69, 0x63, 0x72,
                0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x2E, 0x31, 0x23, 0x30, 0x21, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x1A, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x53, 0x69, 0x67, 0x6E, 0x69, 0x6E, 0x67, 0x20, 0x50, 0x43, 0x41, 0x30, 0x1E, 0x17, 0x0D, 0x30, 0x32, 0x30, 0x35, 0x32, 0x35, 0x30, 0x30, 0x35, 0x35, 0x34, 0x38, 0x5A, 0x17, 0x0D, 0x30, 0x33, 0x31, 0x31, 0x32, 0x35, 0x30, 0x31, 0x30, 0x35, 0x34, 0x38, 0x5A, 0x30, 0x81, 0xA1, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E, 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61,
@@ -31,84 +28,66 @@ public class PublisherMembershipConditionTest : TestCase {
                0x2E, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x70, 0x6B, 0x69, 0x2F, 0x63, 0x72, 0x6C, 0x2F, 0x70, 0x72, 0x6F, 0x64, 0x75, 0x63, 0x74, 0x73, 0x2F, 0x43, 0x6F, 0x64, 0x65, 0x53, 0x69, 0x67, 0x6E, 0x50, 0x43, 0x41, 0x2E, 0x63, 0x72, 0x6C, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x35, 0x23, 0xFD, 0x13, 0x54, 0xFC, 0xE9, 0xDC, 0xF0, 0xDD, 0x0C, 0x14, 0x7A, 0xFA, 0xA7, 0xB3, 0xCE, 0xFD, 0xA7, 0x3A, 0xC8, 0xBA, 0xE5, 0xE7, 0xF6, 0x03, 0xFB, 0x53, 0xDB, 0xA7, 0x99, 0xA9, 0xA0, 0x9B, 0x36, 0x9C, 0x03, 0xEB, 0x82, 0x47, 0x1C, 0x21, 0xBD, 0x14, 0xCB, 0xE7, 0x67, 0x40, 0x09, 0xC7, 0x16, 0x91, 0x02, 0x55, 0xCE, 0x43, 0x42, 0xB4, 0xCD, 0x1B, 0x5D, 0xB0, 0xF3, 0x32, 0x04, 0x3D, 0x12, 0xE5, 0x1D, 0xA7, 0x07, 0xA7, 0x8F, 0xA3, 0x7E, 0x45, 0x55, 0x76, 0x1B, 0x96, 0x95, 0x91, 0x69, 0xF0, 0xDD, 0x38, 0xF3, 0x48, 0x89, 0xEF, 0x70, 0x40, 0xB7, 0xDB, 0xB5, 0x55,
                0x80, 0xC0, 0x03, 0xC4, 0x2E, 0xB6, 0x28, 0xDC, 0x0A, 0x82, 0x0E, 0xC7, 0x43, 0xE3, 0x7A, 0x48, 0x5D, 0xB8, 0x06, 0x89, 0x92, 0x40, 0x6C, 0x6E, 0xC5, 0xDC, 0xF8, 0x9A, 0xEF, 0x0B, 0xBE, 0x21, 0x0A, 0x8C, 0x2F, 0x3A, 0xB5, 0xED, 0xA7, 0xCE, 0x71, 0x87, 0x68, 0x23, 0xE1, 0xB3, 0xE4, 0x18, 0x7D, 0xB8, 0x47, 0x01, 0xA5, 0x2B, 0xC4, 0x58, 0xCB, 0xB2, 0x89, 0x6C, 0x5F, 0xFD, 0xD3, 0x2C, 0xC4, 0x6F, 0xB8, 0x23, 0xB2, 0x0D, 0xFF, 0x3C, 0xF2, 0x11, 0x45, 0x74, 0xF2, 0x09, 0x06, 0x99, 0x18, 0xDD, 0x6F, 0xC0, 0x86, 0x01, 0x18, 0x12, 0x1D, 0x2B, 0x16, 0xAF, 0x56, 0xEF, 0x65, 0x33, 0xA1, 0xEA, 0x67, 0x4E, 0xF4, 0x4B, 0x82, 0xAB, 0xE9, 0x0F, 0xDC, 0x01, 0xFA, 0xDF, 0x60, 0x7F, 0x66, 0x47, 0x5D, 0xCB, 0x2C, 0x70, 0xCC, 0x7B, 0x4E, 0xD9, 0x06, 0xB8, 0x6E, 0x8C, 0x0C, 0xFE, 0x62, 0x1E, 0x42, 0xF9, 0x93, 0x7C, 0xA2, 0xAB, 0x0A, 0x9E, 0xD0, 0x23, 0x10, 0xAE, 0x4D, 0x7B, 0x27, 0x91, 0x6F, 0x26, 0xBE, 0x68, 0xFA, 0xA6, 0x3F, 0x9F, 0x23, 0xEB, 0xC8, 0x9D, 0xBB, 0x87 };
 
-       public void TestNull () 
+       [Test]
+       [ExpectedException (typeof (ArgumentNullException))]
+       public void NullConstructor () 
        {
-               PublisherMembershipCondition pmc = null;
-
-               try {
-                       pmc = new PublisherMembershipCondition (null);
-                       Fail ("Expected ArgumentNullException but got none");
-               }
-               catch (ArgumentNullException) {
-                       // this is expected
-               }
-               catch (Exception e) {
-                       Fail ("Expected ArgumentNullException but got " + e.ToString ());
-               }
+               PublisherMembershipCondition pmc = new PublisherMembershipCondition (null);
+       }
 
+       [Test]
+       [ExpectedException (typeof (ArgumentNullException))]
+       public void NullCertificate () 
+       {
                X509Certificate x509 = new X509Certificate (msSpCert);
-               pmc = new PublisherMembershipCondition (x509);
-               try {
-                       pmc.Certificate = null;
-                       Fail ("Expected ArgumentNullException but got none");
-               }
-               catch (ArgumentNullException) {
-                       // this is expected
-               }
-               catch (Exception e) {
-                       Fail ("Expected ArgumentNullException but got " + e.ToString ());
-               }
+               PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
+               pmc.Certificate = null;
        }
 
-       public void TestInvalidConstructor () 
+       [Test]
+       [ExpectedException (typeof (NullReferenceException))]
+       public void InvalidConstructor () 
        {
                byte[] n = null;
+               // having an empty certificate always break down things
                X509Certificate x509 = new X509Certificate (n);
-               PublisherMembershipCondition pmc = null;
-
-               try {
-                       pmc = new PublisherMembershipCondition (x509);
-                       Fail ("Expected NullReferenceException but got none");
-               }
-               catch (NullReferenceException) {
-                       // having an empty certificate always break down things
-               }
-               catch (Exception e) {
-                       Fail ("Expected NullReferenceException but got " + e.ToString ());
-               }
+               PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
        }
 
-       public void TestConstructor () 
+       [Test]
+       public void Constructor () 
        {
                X509Certificate x509 = new X509Certificate (msSpCert);
                PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
 
-               Assert("Certificate", pmc.Certificate.Equals (x509));
-               AssertEquals ("GetHashCode", x509.GetHashCode (), pmc.GetHashCode ());
+               Assertion.Assert("Certificate", pmc.Certificate.Equals (x509));
+               Assertion.AssertEquals ("GetHashCode", x509.GetHashCode (), pmc.GetHashCode ());
 
                string s = "Publisher - 3082010A0282010100AA99BD39A81827F42B3D0B4C3F7C772EA7CBB5D18C0DC23A74D793B5E0A04B3F595ECE454F9A7929F149CC1A47EE55C2083E1220F855F2EE5FD3E0CA96BC30DEFE58C82732D08554E8F09110BBF32BBE19E5039B0B861DF3B0398CB8FD0B1D3C7326AC572BCA29A215908215E277A34052038B9DC270BA1FE934F6F335924E5583F8DA30B620DE5706B55A4206DE59CBF2DFA6BD154771192523D2CB6F9B1979DF6A5BF176057929FCC356CA8F440885558ACBC80F464B55CB8C96774A87E8A94106C7FF0DE968576372C36957B443CF323A30DC1BE9D543262A79FE95DB226724C92FD034E3E6FB514986B83CD0255FD6EC9E036187A96840C7F8E203E6CF050203010001";
-               AssertEquals ("ToString", s, pmc.ToString ());
+               Assertion.AssertEquals ("ToString", s, pmc.ToString ());
        }
 
-       public void TestCopy () 
+       [Test]
+       public void Copy () 
        {
                X509Certificate x509 = new X509Certificate (msSpCert);
                PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
                PublisherMembershipCondition pmcCopy = (PublisherMembershipCondition) pmc.Copy ();
 
-               AssertNotNull ("Copy-Cert", pmcCopy.Certificate);
-               Assert("Copy-Equals", pmc.Equals (pmcCopy));
-               AssertEquals ("Copy-GetHashCode", pmc.GetHashCode (), pmcCopy.GetHashCode ());
-               AssertEquals ("Copy-ToString", pmc.ToString (), pmcCopy.ToString ());
+               Assertion.AssertNotNull ("Copy-Cert", pmcCopy.Certificate);
+               Assertion.Assert("Copy-Equals", pmc.Equals (pmcCopy));
+               Assertion.AssertEquals ("Copy-GetHashCode", pmc.GetHashCode (), pmcCopy.GetHashCode ());
+               Assertion.AssertEquals ("Copy-ToString", pmc.ToString (), pmcCopy.ToString ());
        }
 
-       public void TestXml () 
+       [Test]
+       public void Xml () 
        {
                X509Certificate x509 = new X509Certificate (msSpCert);
                PublisherMembershipCondition pmc = new PublisherMembershipCondition (x509);
                SecurityElement se = pmc.ToXml ();
                pmc.FromXml (se);
-               // TODO
+               Assertion.AssertEquals ("XmlCertificate", x509.GetHashCode (), pmc.Certificate.GetHashCode ());
        }
 }
 
index dcb2940e019da34a32ee3d20e5871a3f7bbcdb8f..65c838441f1f53e8a57be241a2e13b6140c1c52d 100644 (file)
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot (spouliot@motus.com)
 //
-// (C) 2002 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
 //
 
 using NUnit.Framework;
@@ -16,11 +16,8 @@ using System.Security.Policy;
 
 namespace MonoTests.System.Security.Policy {
 
-public class PublisherTest : TestCase {
-
-       protected override void SetUp () {}
-
-       protected override void TearDown () {}
+[TestFixture]
+public class PublisherTest {
 
        static byte[] msSpCert = { 0x30, 0x82, 0x05, 0x0F, 0x30, 0x82, 0x03, 0xF7, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x0A, 0x61, 0x07, 0x11, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x81, 0xA6, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E, 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x2B, 0x30, 0x29, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x22, 0x43, 0x6F, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x30, 0x20, 0x4D, 0x69, 0x63, 0x72,
                0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x2E, 0x31, 0x23, 0x30, 0x21, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x1A, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x53, 0x69, 0x67, 0x6E, 0x69, 0x6E, 0x67, 0x20, 0x50, 0x43, 0x41, 0x30, 0x1E, 0x17, 0x0D, 0x30, 0x32, 0x30, 0x35, 0x32, 0x35, 0x30, 0x30, 0x35, 0x35, 0x34, 0x38, 0x5A, 0x17, 0x0D, 0x30, 0x33, 0x31, 0x31, 0x32, 0x35, 0x30, 0x31, 0x30, 0x35, 0x34, 0x38, 0x5A, 0x30, 0x81, 0xA1, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E, 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61,
@@ -31,67 +28,62 @@ public class PublisherTest : TestCase {
                0x2E, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x70, 0x6B, 0x69, 0x2F, 0x63, 0x72, 0x6C, 0x2F, 0x70, 0x72, 0x6F, 0x64, 0x75, 0x63, 0x74, 0x73, 0x2F, 0x43, 0x6F, 0x64, 0x65, 0x53, 0x69, 0x67, 0x6E, 0x50, 0x43, 0x41, 0x2E, 0x63, 0x72, 0x6C, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x35, 0x23, 0xFD, 0x13, 0x54, 0xFC, 0xE9, 0xDC, 0xF0, 0xDD, 0x0C, 0x14, 0x7A, 0xFA, 0xA7, 0xB3, 0xCE, 0xFD, 0xA7, 0x3A, 0xC8, 0xBA, 0xE5, 0xE7, 0xF6, 0x03, 0xFB, 0x53, 0xDB, 0xA7, 0x99, 0xA9, 0xA0, 0x9B, 0x36, 0x9C, 0x03, 0xEB, 0x82, 0x47, 0x1C, 0x21, 0xBD, 0x14, 0xCB, 0xE7, 0x67, 0x40, 0x09, 0xC7, 0x16, 0x91, 0x02, 0x55, 0xCE, 0x43, 0x42, 0xB4, 0xCD, 0x1B, 0x5D, 0xB0, 0xF3, 0x32, 0x04, 0x3D, 0x12, 0xE5, 0x1D, 0xA7, 0x07, 0xA7, 0x8F, 0xA3, 0x7E, 0x45, 0x55, 0x76, 0x1B, 0x96, 0x95, 0x91, 0x69, 0xF0, 0xDD, 0x38, 0xF3, 0x48, 0x89, 0xEF, 0x70, 0x40, 0xB7, 0xDB, 0xB5, 0x55,
                0x80, 0xC0, 0x03, 0xC4, 0x2E, 0xB6, 0x28, 0xDC, 0x0A, 0x82, 0x0E, 0xC7, 0x43, 0xE3, 0x7A, 0x48, 0x5D, 0xB8, 0x06, 0x89, 0x92, 0x40, 0x6C, 0x6E, 0xC5, 0xDC, 0xF8, 0x9A, 0xEF, 0x0B, 0xBE, 0x21, 0x0A, 0x8C, 0x2F, 0x3A, 0xB5, 0xED, 0xA7, 0xCE, 0x71, 0x87, 0x68, 0x23, 0xE1, 0xB3, 0xE4, 0x18, 0x7D, 0xB8, 0x47, 0x01, 0xA5, 0x2B, 0xC4, 0x58, 0xCB, 0xB2, 0x89, 0x6C, 0x5F, 0xFD, 0xD3, 0x2C, 0xC4, 0x6F, 0xB8, 0x23, 0xB2, 0x0D, 0xFF, 0x3C, 0xF2, 0x11, 0x45, 0x74, 0xF2, 0x09, 0x06, 0x99, 0x18, 0xDD, 0x6F, 0xC0, 0x86, 0x01, 0x18, 0x12, 0x1D, 0x2B, 0x16, 0xAF, 0x56, 0xEF, 0x65, 0x33, 0xA1, 0xEA, 0x67, 0x4E, 0xF4, 0x4B, 0x82, 0xAB, 0xE9, 0x0F, 0xDC, 0x01, 0xFA, 0xDF, 0x60, 0x7F, 0x66, 0x47, 0x5D, 0xCB, 0x2C, 0x70, 0xCC, 0x7B, 0x4E, 0xD9, 0x06, 0xB8, 0x6E, 0x8C, 0x0C, 0xFE, 0x62, 0x1E, 0x42, 0xF9, 0x93, 0x7C, 0xA2, 0xAB, 0x0A, 0x9E, 0xD0, 0x23, 0x10, 0xAE, 0x4D, 0x7B, 0x27, 0x91, 0x6F, 0x26, 0xBE, 0x68, 0xFA, 0xA6, 0x3F, 0x9F, 0x23, 0xEB, 0xC8, 0x9D, 0xBB, 0x87 };
 
-       public void TestNullConstructor () 
+       [Test]
+       [ExpectedException (typeof (ArgumentNullException))]
+       public void NullConstructor () 
        {
-               try {
-                       Publisher p = new Publisher (null);
-                       Fail ("Expected ArgumentNullException but got none");
-               }
-               catch (ArgumentNullException) {
-                       // this is expected
-               }
-               catch (Exception e) {
-                       Fail ("Expected ArgumentNullException but got " + e.ToString ());
-               }
+               Publisher p = new Publisher (null);
        }
 
-       public void TestInvalidConstructor () 
+       [Test]
+       public void EmptyCertificateConstructor () 
        {
                byte[] n = null;
                X509Certificate x509 = new X509Certificate (n);
                Publisher p = new Publisher (x509);
 
-               try {
-                       x509 = p.Certificate;
-                       Fail ("Expected NullReferenceException but got none");
-               }
-               catch (NullReferenceException) {
-                       // having an empty certificate always break down things
-               }
-               catch (Exception e) {
-                       Fail ("Expected NullReferenceException but got " + e.ToString ());
-               }
+               Assertion.AssertEquals ("GetHashCode", x509.GetHashCode (), p.GetHashCode ());
+               Assertion.AssertEquals ("ToString", "<System.Security.Policy.Publisher version=\"1\">\r\n   <X509v3Certificate/>\r\n</System.Security.Policy.Publisher>\r\n", p.ToString ());
+       }
 
-               AssertEquals ("GetHashCode", x509.GetHashCode (), p.GetHashCode ());
-               AssertEquals ("ToString", "<System.Security.Policy.Publisher version=\"1\">\r\n   <X509v3Certificate/>\r\n</System.Security.Policy.Publisher>\r\n", p.ToString ());
+       [Test]
+       [ExpectedException (typeof (NullReferenceException))]
+       public void EmptyCertificateConstructor2 () 
+       {
+               byte[] n = null;
+               X509Certificate x509 = new X509Certificate (n);
+               Publisher p = new Publisher (x509);
+               x509 = p.Certificate;
        }
 
-       public void TestConstructor () 
+       [Test]
+       public void Constructor () 
        {
                X509Certificate x509 = new X509Certificate (msSpCert);
                Publisher p = new Publisher (x509);
 
-               AssertEquals ("GetHashCode", x509.GetHashCode (), p.GetHashCode ());
+               Assertion.AssertEquals ("GetHashCode", x509.GetHashCode (), p.GetHashCode ());
 
                IPermission ip = p.CreateIdentityPermission (null);
-               Assert ("CreateIdentityPermission", (ip is PublisherIdentityPermission));
+               Assertion.Assert ("CreateIdentityPermission", (ip is PublisherIdentityPermission));
 
                string s = "<System.Security.Policy.Publisher version=\"1\">\r\n   <X509v3Certificate>3082050F308203F7A003020102020A61071143000000000034300D06092A864886F70D01010505003081A6310B3009060355040613025553311330110603550408130A57617368696E67746F6E3110300E060355040713075265646D6F6E64311E301C060355040A13154D6963726F736F667420436F72706F726174696F6E312B3029060355040B1322436F70797269676874202863292032303030204D6963726F736F667420436F72702E312330210603550403131A4D6963726F736F667420436F6465205369676E696E6720504341301E170D3032303532353030353534385A170D3033313132353031303534385A3081A1310B3009060355040613025553311330110603550408130A57617368696E67746F6E3110300E060355040713075265646D6F6E64311E301C060355040A13154D6963726F736F667420436F72706F726174696F6E312B3029060355040B1322436F70797269676874202863292032303032204D6963726F736F667420436F72702E311E301C060355040313154D6963726F736F667420436F72706F726174696F6E30820122300D06092A864886F70D01010105000382010F003082010A0282010100AA99BD39A81827F42B3D0B4C3F";
                s += "7C772EA7CBB5D18C0DC23A74D793B5E0A04B3F595ECE454F9A7929F149CC1A47EE55C2083E1220F855F2EE5FD3E0CA96BC30DEFE58C82732D08554E8F09110BBF32BBE19E5039B0B861DF3B0398CB8FD0B1D3C7326AC572BCA29A215908215E277A34052038B9DC270BA1FE934F6F335924E5583F8DA30B620DE5706B55A4206DE59CBF2DFA6BD154771192523D2CB6F9B1979DF6A5BF176057929FCC356CA8F440885558ACBC80F464B55CB8C96774A87E8A94106C7FF0DE968576372C36957B443CF323A30DC1BE9D543262A79FE95DB226724C92FD034E3E6FB514986B83CD0255FD6EC9E036187A96840C7F8E203E6CF050203010001A38201403082013C300E0603551D0F0101FF0404030206C030130603551D25040C300A06082B06010505070303301D0603551D0E041604146BC8C65120F0B42FD3A0B6AE7F5E26B2B88752293081A90603551D230481A130819E8014295CB91BB6CD33EEBB9E597DF7E5CA2EC40D3428A174A4723070312B3029060355040B1322436F70797269676874202863292031393937204D6963726F736F667420436F72702E311E301C060355040B13154D6963726F736F667420436F72706F726174696F6E3121301F060355040313184D6963726F736F667420526F6F7420417574686F7269747982106A0B994FC000DEAA11D4D8";
                s += "409AA8BEE6304A0603551D1F04433041303FA03DA03B8639687474703A2F2F63726C2E6D6963726F736F66742E636F6D2F706B692F63726C2F70726F64756374732F436F64655369676E5043412E63726C300D06092A864886F70D010105050003820101003523FD1354FCE9DCF0DD0C147AFAA7B3CEFDA73AC8BAE5E7F603FB53DBA799A9A09B369C03EB82471C21BD14CBE7674009C716910255CE4342B4CD1B5DB0F332043D12E51DA707A78FA37E4555761B96959169F0DD38F34889EF7040B7DBB55580C003C42EB628DC0A820EC743E37A485DB8068992406C6EC5DCF89AEF0BBE210A8C2F3AB5EDA7CE71876823E1B3E4187DB84701A52BC458CBB2896C5FFDD32CC46FB823B20DFF3CF2114574F209069918DD6FC0860118121D2B16AF56EF6533A1EA674EF44B82ABE90FDC01FADF607F66475DCB2C70CC7B4ED906B86E8C0CFE621E42F9937CA2AB0A9ED02310AE4D7B27916F26BE68FAA63F9F23EBC89DBB87</X509v3Certificate>\r\n</System.Security.Policy.Publisher>\r\n";
-               AssertEquals ("ToString", s, p.ToString ());
+               Assertion.AssertEquals ("ToString", s, p.ToString ());
        }
 
-       public void TestCopy () 
+       [Test]
+       public void Copy () 
        {
                X509Certificate x509 = new X509Certificate (msSpCert);
                Publisher p = new Publisher (x509);
                Publisher pCopy = (Publisher) p.Copy ();
 
-               AssertNotNull ("Copy-Cert", pCopy.Certificate);
-               Assert("Copy-Equals", p.Equals (pCopy));
-               AssertEquals ("Copy-GetHashCode", p.GetHashCode (), pCopy.GetHashCode ());
-               AssertEquals ("Copy-ToString", p.ToString (), pCopy.ToString ());
+               Assertion.AssertNotNull ("Copy-Cert", pCopy.Certificate);
+               Assertion.Assert("Copy-Equals", p.Equals (pCopy));
+               Assertion.AssertEquals ("Copy-GetHashCode", p.GetHashCode (), pCopy.GetHashCode ());
+               Assertion.AssertEquals ("Copy-ToString", p.ToString (), pCopy.ToString ());
        }
 }
 
index 2e9510fc3c97ebdfa1584069d79d780bf14caf4e..289e66da28c48c2387ba951c0bf299ba615758c4 100644 (file)
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot (spouliot@motus.com)
 //
-// (C) 2002 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
 //
 
 using NUnit.Framework;
@@ -16,7 +16,8 @@ using System.Security.Policy;
 
 namespace MonoTests.System.Security.Policy {
 
-public class StrongNameTest : TestCase {
+[TestFixture]
+public class StrongNameTest {
 
        static byte[] pk = { 0x00, 0x24, 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53, 0x41, 0x31, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x3D, 0xBD, 0x72, 0x08, 0xC6, 0x2B, 0x0E, 0xA8, 0xC1, 0xC0, 0x58, 0x07, 0x2B, 0x63, 0x5F, 0x7C, 0x9A, 0xBD, 0xCB, 0x22, 0xDB, 0x20, 0xB2, 0xA9, 0xDA, 0xDA, 0xEF, 0xE8, 0x00, 0x64, 0x2F, 0x5D, 0x8D, 0xEB, 0x78, 0x02, 0xF7, 0xA5, 0x36, 0x77, 0x28, 0xD7, 0x55, 0x8D, 0x14, 0x68, 0xDB, 0xEB, 0x24, 0x09, 0xD0, 0x2B, 0x13, 0x1B, 0x92, 0x6E, 0x2E, 0x59, 0x54, 0x4A, 0xAC, 0x18, 0xCF, 0xC9, 0x09, 0x02, 0x3F, 0x4F, 0xA8, 0x3E, 0x94, 0x00, 0x1F, 0xC2, 0xF1, 0x1A, 0x27, 0x47, 0x7D, 0x10, 0x84, 0xF5, 0x14, 0xB8, 0x61, 0x62, 0x1A, 0x0C, 0x66, 0xAB, 0xD2, 0x4C, 0x4B, 0x9F, 0xC9, 0x0F, 0x3C, 0xD8, 0x92, 0x0F, 0xF5, 0xFF, 0xCE, 0xD7, 0x6E, 0x5C, 0x6F, 0xB1, 0xF5, 0x7D, 0xD3, 0x56, 0xF9, 0x67, 0x27, 0xA4, 0xA5, 0x48, 0x5B, 0x07, 0x93, 0x44, 0x00, 0x4A, 0xF8, 0xFF, 0xA4, 0xCB };
 
@@ -24,81 +25,64 @@ public class StrongNameTest : TestCase {
        private string name;
        private Version version;
 
-       protected override void SetUp () 
+       [SetUp]
+       void SetUp () 
        {
                snpkb = new StrongNamePublicKeyBlob (pk);
                name = "StrongNameName";
                version = new Version (1, 2, 3, 4);
        }
 
-       protected override void TearDown () {}
+       [Test]
+       [ExpectedException (typeof (ArgumentNullException))]
+       public void NullPublicKeyConstructor () 
+       {
+               StrongName sn = new StrongName (null, name, version);
+       }
+
+       [Test]
+       [ExpectedException (typeof (ArgumentNullException))]
+       public void NullNameConstructor () 
+       {
+               StrongName sn = new StrongName (snpkb, null, version);
+       }
 
-       public void TestNullConstructor () 
+       [Test]
+       [ExpectedException (typeof (ArgumentNullException))]
+       public void NullVersionConstructor () 
        {
-               // without StrongNamePublicKeyBlob
-               try {
-                       StrongName sn = new StrongName (null, name, version);
-                       Fail ("Expected ArgumentNullException but got none");
-               }
-               catch (ArgumentNullException) {
-                       // this is expected
-               }
-               catch (Exception e) {
-                       Fail ("Expected ArgumentNullException but got " + e.ToString ());
-               }
-
-               // without name
-               try {
-                       StrongName sn = new StrongName (snpkb, null, version);
-                       Fail ("Expected ArgumentNullException but got none");
-               }
-               catch (ArgumentNullException) {
-                       // this is expected
-               }
-               catch (Exception e) {
-                       Fail ("Expected ArgumentNullException but got " + e.ToString ());
-               }
-
-               // without version
-               try {
-                       StrongName sn = new StrongName (snpkb, name, null);
-                       Fail ("Expected ArgumentNullException but got none");
-               }
-               catch (ArgumentNullException) {
-                       // this is expected
-               }
-               catch (Exception e) {
-                       Fail ("Expected ArgumentNullException but got " + e.ToString ());
-               }
+               StrongName sn = new StrongName (snpkb, name, null);
        }
 
-       public void TestConstructor () 
+       [Test]
+       public void CompleteConstructor () 
        {
                StrongName sn = new StrongName (snpkb, name, version);
 
-               AssertEquals ("Name", name, sn.Name);
-               AssertEquals ("PublicKey", snpkb.ToString (), sn.PublicKey.ToString ());
-               AssertEquals ("Version", version.ToString (), sn.Version.ToString ());
+               Assertion.AssertEquals ("Name", name, sn.Name);
+               Assertion.AssertEquals ("PublicKey", snpkb.ToString (), sn.PublicKey.ToString ());
+               Assertion.AssertEquals ("Version", version.ToString (), sn.Version.ToString ());
 
                // same as StrongNamePublicKeyBlob
-               AssertEquals ("GetHashCode", 2359296, sn.GetHashCode ());
+               Assertion.AssertEquals ("GetHashCode", 2359296, sn.GetHashCode ());
 
                IPermission ip = sn.CreateIdentityPermission (null);
-               Assert ("CreateIdentityPermission", (ip is StrongNameIdentityPermission));
+               Assertion.Assert ("CreateIdentityPermission", (ip is StrongNameIdentityPermission));
 
                string s = "<StrongName version=\"1\"\r\n            Key=\"00240000048000009400000006020000002400005253413100040000010001003DBD7208C62B0EA8C1C058072B635F7C9ABDCB22DB20B2A9DADAEFE800642F5D8DEB7802F7A5367728D7558D1468DBEB2409D02B131B926E2E59544AAC18CFC909023F4FA83E94001FC2F11A27477D1084F514B861621A0C66ABD24C4B9FC90F3CD8920FF5FFCED76E5C6FB1F57DD356F96727A4A5485B079344004AF8FFA4CB\"\r\n            Name=\"StrongNameName\"\r\n            Version=\"1.2.3.4\"/>\r\n";
-               AssertEquals ("ToString", s, sn.ToString ());
+               Assertion.AssertEquals ("ToString", s, sn.ToString ());
        }
 
-       public void TestCopy () 
+       [Test]
+       public void Copy () 
        {
                StrongName sn = new StrongName (snpkb, name, version);
                StrongName snCopy = (StrongName) sn.Copy ();
 
-               AssertNotNull ("Copy", snCopy);
-               Assert("Copy-Equals", sn.Equals (snCopy));
-               AssertEquals ("Copy-GetHashCode", sn.GetHashCode (), snCopy.GetHashCode ());
-               AssertEquals ("Copy-ToString", sn.ToString (), snCopy.ToString ());
+               Assertion.AssertNotNull ("Copy", snCopy);
+               Assertion.Assert("Copy-Equals", sn.Equals (snCopy));
+               Assertion.AssertEquals ("Copy-GetHashCode", sn.GetHashCode (), snCopy.GetHashCode ());
+               Assertion.AssertEquals ("Copy-ToString", sn.ToString (), snCopy.ToString ());
        }
 }