Adding some TARGET_JVM tags.

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

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/ChangeLog b/mcs/class/corlib/Test/System.Security.Cryptography/ChangeLog
index b68d503034e0df30ebf428381caee2be94a2c42f..a3a4e3982bbaef64fdf45d3eefce2556208a07e8 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-15 Roei Erez <roeie@mainsoft.com>
+
+       * Adding some TARGET_JVM tags.
+       
 2007-03-05  Sebastien Pouliot  <sebastien@ximian.com>
 
        * SymmetricAlgorithmTransformTest.cs: Add test cases for #81008 by

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/CryptoConfigTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/CryptoConfigTest.cs
index a5bcc7d376f1c1ec8051dedfd28e6ed910343393..de22e1cf4494953afa4fecc349d1aa64bc3348e2 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/CryptoConfigTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/CryptoConfigTest.cs
@@ -122,7 +122,9 @@ public class CryptoConfigTest {
                CreateFromName ("RIPEMD-160", "System.Security.Cryptography.RIPEMD160Managed");
                CreateFromName ("System.Security.Cryptography.RIPEMD160", "System.Security.Cryptography.RIPEMD160Managed");
                // x.509 stuff
+#if !TARGET_JVM //TargetJvmNotWorking - this algorithm should be added to System
                CreateFromName ("X509Chain", "System.Security.Cryptography.X509Certificates.X509Chain");
+#endif
 #endif
                // note: CryptoConfig can create any object !
                CreateFromName ("System.Security.Cryptography.CryptoConfig", "System.Security.Cryptography.CryptoConfig");
@@ -142,6 +144,7 @@ public class CryptoConfigTest {
                CreateFromName ("http://www.w3.org/2000/09/xmldsig#hmac-sha1", null);
                // URL used in DigestMethod element 
                CreateFromName ("http://www.w3.org/2000/09/xmldsig#sha1", "System.Security.Cryptography.SHA1CryptoServiceProvider");
+#if !TARGET_JVM //TargetJvmNotWorking - algorithms from System.Security assembly
                // URL used in Canonicalization or Transform elements 
                CreateFromName ("http://www.w3.org/TR/2001/REC-xml-c14n-20010315", "System.Security.Cryptography.Xml.XmlDsigC14NTransform");
                CreateFromName ("http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments", "System.Security.Cryptography.Xml.XmlDsigC14NWithCommentsTransform");
@@ -162,6 +165,7 @@ public class CryptoConfigTest {
                CreateFromName ("http://www.w3.org/2000/09/xmldsig# KeyValue/DSAKeyValue", "System.Security.Cryptography.Xml.DSAKeyValue");
                CreateFromName ("http://www.w3.org/2000/09/xmldsig# KeyValue/RSAKeyValue", "System.Security.Cryptography.Xml.RSAKeyValue");
                CreateFromName ("http://www.w3.org/2000/09/xmldsig# RetrievalMethod", "System.Security.Cryptography.Xml.KeyInfoRetrievalMethod");
+#endif
        }
 
        [Test]

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
index 6b852a5601655d4653466b2b22285c7f23e68c40..6334df94c4e80f89a76c3a1b5785b24f5ead79f3 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
@@ -116,7 +116,8 @@ public class DSACryptoServiceProviderTest : Assertion {
 #endif
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void ConstructorCspParameters () 
        {
                CspParameters csp = new CspParameters (13, null, "Mono1024");
@@ -130,7 +131,8 @@ public class DSACryptoServiceProviderTest : Assertion {
 #endif
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void ConstructorKeySizeCspParameters () 
        {
                CspParameters csp = new CspParameters (13, null, "Mono512");
@@ -758,7 +760,8 @@ public class DSACryptoServiceProviderTest : Assertion {
        // b.   Generating Keys for Encryption and Decryption
        //      http://msdn.microsoft.com/library/en-us/cpguide/html/cpcongeneratingkeysforencryptiondecryption.asp
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_False () 
        {
                CspParameters csp = new CspParameters (3, null, "Persistence_PersistKeyInCsp_False");
@@ -782,7 +785,8 @@ public class DSACryptoServiceProviderTest : Assertion {
                AssertEquals ("Key Pair Same Container", first, second);
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_True () 
        {
                CspParameters csp = new CspParameters (3, null, "Persistence_PersistKeyInCsp_True");
@@ -802,7 +806,8 @@ public class DSACryptoServiceProviderTest : Assertion {
                AssertEquals ("Key Pair Same Container", first, second);
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void Persistence_Delete () 
        {
                CspParameters csp = new CspParameters (3, null, "Persistence_Delete");
@@ -859,7 +864,8 @@ public class DSACryptoServiceProviderTest : Assertion {
                Assert ("UseMachineKeyStore(Default)", !DSACryptoServiceProvider.UseMachineKeyStore);
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void UseMachineKeyStore () 
        {
                // note only applicable when CspParameters isn't used - which don't

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
index 8767c8156c3980ffff04c57111e864fb1a7e9fb4..a2f57e60a1c00431259ee051905d61792e9a1881 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
@@ -114,7 +114,8 @@ public class RSACryptoServiceProviderTest : Assertion {
 #endif
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void ConstructorCspParameters ()
        {
                CspParameters csp = new CspParameters (1, null, "Mono1024");
@@ -128,7 +129,8 @@ public class RSACryptoServiceProviderTest : Assertion {
 #endif
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void ConstructorKeySizeCspParameters ()
        {
                int keySize = 512;
@@ -963,7 +965,8 @@ public class RSACryptoServiceProviderTest : Assertion {
        // b.   Generating Keys for Encryption and Decryption
        //      http://msdn.microsoft.com/library/en-us/cpguide/html/cpcongeneratingkeysforencryptiondecryption.asp
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_False () 
        {
                CspParameters csp = new CspParameters (1, null, "Persistence_PersistKeyInCsp_False");
@@ -987,7 +990,8 @@ public class RSACryptoServiceProviderTest : Assertion {
                AssertEquals ("Key Pair Same Container", first, second);
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_True () 
        {
                CspParameters csp = new CspParameters (1, null, "Persistence_PersistKeyInCsp_True");
@@ -1007,7 +1011,8 @@ public class RSACryptoServiceProviderTest : Assertion {
                AssertEquals ("Key Pair Same Container", first, second);
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void Persistence_Delete () 
        {
                CspParameters csp = new CspParameters (1, null, "Persistence_Delete");
@@ -1036,7 +1041,8 @@ public class RSACryptoServiceProviderTest : Assertion {
                Assert ("UseMachineKeyStore(Default)", !RSACryptoServiceProvider.UseMachineKeyStore);
        }
 
-       [Test]
+       [Test]\r
+       [Category ("TargetJvmNotSupported")]
        public void UseMachineKeyStore () 
        {
                // note only applicable when CspParameters isn't used - which don't