2003-05-20 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / corlib / Test / System.Security.Policy / StrongNameTest.cs

diff --git a/mcs/class/corlib/Test/System.Security.Policy/StrongNameTest.cs b/mcs/class/corlib/Test/System.Security.Policy/StrongNameTest.cs
index 289e66da28c48c2387ba951c0bf299ba615758c4..625912cdccbf93700394dccca6d69650378f1025 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Policy/StrongNameTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Policy/StrongNameTest.cs
@@ -17,7 +17,7 @@ using System.Security.Policy;
 namespace MonoTests.System.Security.Policy {
 
 [TestFixture]
-public class StrongNameTest {
+public class StrongNameTest : Assertion {
 
        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 };
 
@@ -26,7 +26,7 @@ public class StrongNameTest {
        private Version version;
 
        [SetUp]
-       void SetUp () 
+       public void SetUp () 
        {
                snpkb = new StrongNamePublicKeyBlob (pk);
                name = "StrongNameName";
@@ -59,18 +59,19 @@ public class StrongNameTest {
        {
                StrongName sn = new StrongName (snpkb, name, version);
 
-               Assertion.AssertEquals ("Name", name, sn.Name);
-               Assertion.AssertEquals ("PublicKey", snpkb.ToString (), sn.PublicKey.ToString ());
-               Assertion.AssertEquals ("Version", version.ToString (), sn.Version.ToString ());
+               AssertEquals ("Name", name, sn.Name);
+               AssertEquals ("PublicKey", snpkb.ToString (), sn.PublicKey.ToString ());
+               AssertEquals ("Version", version.ToString (), sn.Version.ToString ());
 
                // same as StrongNamePublicKeyBlob
-               Assertion.AssertEquals ("GetHashCode", 2359296, sn.GetHashCode ());
+               AssertEquals ("GetHashCode", 2359296, sn.GetHashCode ());
 
                IPermission ip = sn.CreateIdentityPermission (null);
-               Assertion.Assert ("CreateIdentityPermission", (ip is StrongNameIdentityPermission));
+               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";
-               Assertion.AssertEquals ("ToString", s, sn.ToString ());
+               string s = String.Format ("<StrongName version=\"1\"{0}            Key=\"00240000048000009400000006020000002400005253413100040000010001003DBD7208C62B0EA8C1C058072B635F7C9ABDCB22DB20B2A9DADAEFE800642F5D8DEB7802F7A5367728D7558D1468DBEB2409D02B131B926E2E59544AAC18CFC909023F4FA83E94001FC2F11A27477D1084F514B861621A0C66ABD24C4B9FC90F3CD8920FF5FFCED76E5C6FB1F57DD356F96727A4A5485B079344004AF8FFA4CB\"{0}            Name=\"StrongNameName\"{0}            Version=\"1.2.3.4\"/>{0}",
+                       Environment.NewLine);
+               AssertEquals ("ToString", s, sn.ToString ());
        }
 
        [Test]
@@ -79,11 +80,11 @@ public class StrongNameTest {
                StrongName sn = new StrongName (snpkb, name, version);
                StrongName snCopy = (StrongName) sn.Copy ();
 
-               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 ());
+               AssertNotNull ("Copy", snCopy);
+               Assert("Copy-Equals", sn.Equals (snCopy));
+               AssertEquals ("Copy-GetHashCode", sn.GetHashCode (), snCopy.GetHashCode ());
+               AssertEquals ("Copy-ToString", sn.ToString (), snCopy.ToString ());
        }
 }
 
-}
\ No newline at end of file
+}