2005-09-27 Sebastien Pouliot <sebastien@ximian.com>

	* Pkcs9AttributeTest.cs: Added new tests case for new overriden
	CopyFrom (added in 2.0 RC).
	* Pkcs9ContentTypeTest.cs: Fixed tests case for 2.0 RC.
	* Pkcs9MessageDigestTest.cs: Fixed tests case for 2.0 RC.

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

diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ChangeLog b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ChangeLog
index 7adfbe8adf34f22e54c595cc00426e5e8c5254ba..de84ce653d46c8dd30a3ea7e8950cef31881345d 100644 (file)
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ChangeLog
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-27  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * Pkcs9AttributeTest.cs: Added new tests case for new overriden 
+       CopyFrom (added in 2.0 RC).
+       * Pkcs9ContentTypeTest.cs: Fixed tests case for 2.0 RC.
+       * Pkcs9MessageDigestTest.cs: Fixed tests case for 2.0 RC.
+
 2005-05-03  Sebastien Pouliot  <sebastien@ximian.com>
 
        * ContentInfoTest.cs: Addd test cases for data, envelopedData and 

diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs
index 2a11d0de0fad8df455f5ee736405b2655a8a76cc..319668c08cf882329498166d43b94568e6453595 100644 (file)
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs
@@ -5,7 +5,7 @@
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 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
@@ -108,6 +108,39 @@ namespace MonoTests.System.Security.Cryptography.Pkcs {
                {
                        Pkcs9AttributeObject a = new Pkcs9AttributeObject (defaultOid, null);
                }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void CopyFrom_Null ()
+               {
+                       new Pkcs9AttributeObject ().CopyFrom (null);
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentException))]
+               public void CopyFrom_SigningTime_Raw ()
+               {
+                       Pkcs9SigningTime st = new Pkcs9SigningTime (DateTime.UtcNow);
+                       Pkcs9AttributeObject a = new Pkcs9AttributeObject ();
+                       a.CopyFrom (new AsnEncodedData (st.RawData));
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentException))]
+               public void CopyFrom_SigningTime_OidRaw ()
+               {
+                       Pkcs9SigningTime st = new Pkcs9SigningTime (DateTime.UtcNow);
+                       Pkcs9AttributeObject a = new Pkcs9AttributeObject ();
+                       a.CopyFrom (new AsnEncodedData (st.Oid, st.RawData));
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentException))]
+               public void CopyFrom_Self ()
+               {
+                       Pkcs9AttributeObject a = new Pkcs9AttributeObject ("1.2.3.4", new byte[2] { 0x05, 0x00 } );
+                       a.CopyFrom (new AsnEncodedData (a.Oid, a.RawData));
+               }
        }
 }
 

diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs
index 39fc55bda1ea138351c3eac7a8eddec8234aa969..57c7e97d58d433a17028ae5e3a425fad2e287b47 100644 (file)
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs
@@ -62,6 +62,7 @@ namespace MonoTests.System.Security.Cryptography.Pkcs {
                }
 
                [Test]
+               [ExpectedException (typeof (ArgumentException))]
                public void CopyFrom ()
                {
                        /* byte[] data = ASN1Convert.FromOid ("1.2.840.113549.1.7.1").GetBytes (); */
@@ -69,13 +70,10 @@ namespace MonoTests.System.Security.Cryptography.Pkcs {
                        AsnEncodedData aed = new AsnEncodedData (data);
                        Pkcs9ContentType ct = new Pkcs9ContentType ();
                        ct.CopyFrom (aed);
-                       Assert.AreEqual ("1.2.840.113549.1.7.1", ct.ContentType.Value, "ContentType");
-                       Assert.IsNull (ct.Oid, "Oid");
-                       Assert.AreEqual (data, ct.RawData, "RawData");
                }
 
                [Test]
-               [ExpectedException (typeof (CryptographicException))]
+               [ExpectedException (typeof (ArgumentException))]
                public void CopyFrom_BadData ()
                {
                        /* Note: this is the full structure (but only the OID part is required)
@@ -89,8 +87,6 @@ namespace MonoTests.System.Security.Cryptography.Pkcs {
                        AsnEncodedData aed = new AsnEncodedData (data);
                        Pkcs9ContentType ct = new Pkcs9ContentType ();
                        ct.CopyFrom (aed);
-                       // CopyFrom works, but the exception comes when accessing the ContentType property
-                       Assert.IsNull (ct.ContentType);
                }
        }
 }

diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs
index 960fc6a13864247b1839a3ac6a05cc0ed7156869..f9d5fb26e502a63448ef50b7413c6ae663028fb0 100644 (file)
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs
@@ -60,44 +60,23 @@ namespace MonoTests.System.Security.Cryptography.Pkcs {
                }
 
                [Test]
+               [ExpectedException (typeof (ArgumentException))]
                public void CopyFrom ()
                {
                        byte[] data = { 0x04, 0x10, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
                        AsnEncodedData aed = new AsnEncodedData (data);
                        Pkcs9MessageDigest md = new Pkcs9MessageDigest ();
                        md.CopyFrom (aed);
-                       Assert.AreEqual ("00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F", BitConverter.ToString (md.MessageDigest), "MessageDigest");
-                       Assert.IsNull (md.Oid, "Oid");
-                       // null ??? reported as FDBK25795
-                       // http://lab.msdn.microsoft.com/ProductFeedback/viewfeedback.aspx?feedbackid=15bb72f0-22dd-4911-846e-143d6038c7cf
-                       Assert.AreEqual (data, md.RawData, "RawData");
                }
 
                [Test]
-               [ExpectedException (typeof (CryptographicException))]
+               [ExpectedException (typeof (ArgumentException))]
                public void CopyFrom_BadData ()
                {
                        byte[] data = { 0x30, 0x18, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x03, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x01 };
                        AsnEncodedData aed = new AsnEncodedData (data);
                        Pkcs9MessageDigest md = new Pkcs9MessageDigest ();
                        md.CopyFrom (aed);
-                       // CopyFrom works, but the exception comes when accessing the ContentType property
-                       Assert.IsNull (md.MessageDigest);
-               }
-
-               [Test]
-               public void MessageDigest_ModifyContent ()
-               {
-                       byte[] data = { 0x04, 0x10, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
-                       AsnEncodedData aed = new AsnEncodedData (data);
-                       Pkcs9MessageDigest md = new Pkcs9MessageDigest ();
-                       md.CopyFrom (aed);
-                       Assert.AreEqual ("00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F", BitConverter.ToString (md.MessageDigest), "MessageDigest-Before");
-                       md.MessageDigest[0] = 0xFF;
-                       Assert.AreEqual ("FF-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F", BitConverter.ToString (md.MessageDigest), "MessageDigest-After");
-                       // this is a reference - not a copy ?!?!
-                       // reported as FDBK25793
-                       // http://lab.msdn.microsoft.com/ProductFeedback/viewfeedback.aspx?feedbackid=8d95cf6d-24f4-4920-b95d-19fa04994578
                }
        }
 }