You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/05/03 08:40:35 UTC

svn commit: r399169 - in /incubator/harmony/enhanced/classlib/trunk/modules: auth/src/test/java/common/javax/security/sasl/ crypto/src/test/java/javax/crypto/ security/src/test/java/common/java/security/

Author: mloenko
Date: Tue May  2 23:40:29 2006
New Revision: 399169

URL: http://svn.apache.org/viewcvs?rev=399169&view=rev
Log:
enabling more tests

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest4.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java
      - copied, changed from r399150, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java
      - copied, changed from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest2.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest4.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest2.java

Copied: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl1Test.java Tue May  2 23:40:29 2006
@@ -33,20 +33,20 @@
  * 
  */
 
-public class SaslTest1 extends TestCase {
+public class Sasl1Test extends TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(SaslTest1.class);
+        junit.textui.TestRunner.run(Sasl1Test.class);
     }
 
     private Provider [] provs;
     private boolean initProvs = false;
     /**
-     * Constructor for SaslTest2.
+     * Constructor for Sasl2Test.
      * 
      * @param arg0
      */
-    public SaslTest1(String arg0) {
+    public Sasl1Test(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java Tue May  2 23:40:29 2006
@@ -37,10 +37,10 @@
  * 
  */
 
-public class SaslTest2 extends TestCase {
+public class Sasl2Test extends TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(SaslTest2.class);
+        junit.textui.TestRunner.run(Sasl2Test.class);
     }
 
     Provider[] mProv;
@@ -64,11 +64,11 @@
     }
 
     /**
-     * Constructor for SaslTest2.
+     * Constructor for Sasl2Test.
      * 
      * @param arg0
      */
-    public SaslTest2(String arg0) {
+    public Sasl2Test(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest3.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest3.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest3.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java Tue May  2 23:40:29 2006
@@ -42,7 +42,7 @@
  * 
  */
 
-public class SaslTest3 extends TestCase {
+public class Sasl3Test extends TestCase {
     private static final String CLNTSRV = "SaslClientFactory.";
 
     private static final String fClientClass = "javax.security.sasl.mySaslClientFactory";
@@ -51,15 +51,15 @@
     private boolean initProvs = false;
     
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(SaslTest3.class);
+        junit.textui.TestRunner.run(Sasl3Test.class);
     }
 
     /**
-     * Constructor for SaslTest2.
+     * Constructor for Sasl3Test.
      * 
      * @param arg0
      */
-    public SaslTest3(String arg0) {
+    public Sasl3Test(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest4.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest4.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/SaslTest4.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java Tue May  2 23:40:29 2006
@@ -39,7 +39,7 @@
  * 
  */
 
-public class SaslTest4 extends TestCase {
+public class Sasl4Test extends TestCase {
     private static final String SRVSSRV = "SaslServerFactory.";
 
     private static final String fServerClass = "javax.security.sasl.mySaslServerFactory";
@@ -49,15 +49,15 @@
 
     
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(SaslTest4.class);
+        junit.textui.TestRunner.run(Sasl4Test.class);
     }
 
     /**
-     * Constructor for SaslTest2.
+     * Constructor for Sasl4Test.
      * 
      * @param arg0
      */
-    public SaslTest4(String arg0) {
+    public Sasl4Test(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java Tue May  2 23:40:29 2006
@@ -42,7 +42,7 @@
  * 
  */
 
-public class ExemptionMechanismTest1 extends TestCase {
+public class ExemptionMechanismTest extends TestCase {
     
     public static final String srvExemptionMechanism = "ExemptionMechanism";
     
@@ -85,7 +85,7 @@
      * 
      * @param arg0
      */
-    public ExemptionMechanismTest1(String arg0) {
+    public ExemptionMechanismTest(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java (from r399150, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java&r1=399150&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java Tue May  2 23:40:29 2006
@@ -47,14 +47,14 @@
  * 
  */
 
-public class KeyAgreementTest1 extends TestCase {
+public class KeyAgreement1Test extends TestCase {
 
     /**
-     * Constructor for KeyAgreementTest1.
+     * Constructor for KeyAgreement1Test.
      * 
      * @param arg0
      */
-    public KeyAgreementTest1(String arg0) {
+    public KeyAgreement1Test(String arg0) {
         super(arg0);
     }
 
@@ -582,7 +582,7 @@
     }
 
     public static void main(String args[]) {
-        junit.textui.TestRunner.run(KeyAgreementTest1.class);
+        junit.textui.TestRunner.run(KeyAgreement1Test.class);
     }
 }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement2Test.java Tue May  2 23:40:29 2006
@@ -41,7 +41,7 @@
  * 
  */
 
-public class KeyAgreementTest2 extends TestCase {
+public class KeyAgreement2Test extends TestCase {
     
     private static final String defaultAlg = "MyKeyAgr";
     
@@ -64,7 +64,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyKAProvider", "Testing provider", 
-                KeyAgreementTest1.srvKeyAgreement.concat(".").concat(defaultAlg), 
+                KeyAgreement1Test.srvKeyAgreement.concat(".").concat(defaultAlg), 
                 KeyAgreementProviderClass);
         Security.insertProviderAt(mProv, 1);
     }
@@ -82,7 +82,7 @@
      * 
      * @param arg0
      */
-    public KeyAgreementTest2(String arg0) {
+    public KeyAgreement2Test(String arg0) {
         super(arg0);
     }
     

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java Tue May  2 23:40:29 2006
@@ -38,14 +38,14 @@
  * 
  */
 
-public class KeyGeneratorTest1 extends TestCase {
+public class KeyGenerator1Test extends TestCase {
 
     /**
-     * Constructor for KeyGeneratorTest1.
+     * Constructor for KeyGenerator1Test.
      * 
      * @param arg0
      */
-    public KeyGeneratorTest1(String arg0) {
+    public KeyGenerator1Test(String arg0) {
         super(arg0);
     }
     
@@ -434,7 +434,7 @@
     }
     
     public static void main(String args[]) {
-        junit.textui.TestRunner.run(KeyGeneratorTest1.class);
+        junit.textui.TestRunner.run(KeyGenerator1Test.class);
     }     
 }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator2Test.java Tue May  2 23:40:29 2006
@@ -40,7 +40,7 @@
  * 
  */
 
-public class KeyGeneratorTest2 extends TestCase {
+public class KeyGenerator2Test extends TestCase {
     
     private static final String defaultAlg = "MyKeyGen";
     
@@ -63,7 +63,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyKGProvider", "Testing provider", 
-                KeyGeneratorTest1.srvKeyGenerator.concat(".").concat(defaultAlg), 
+                KeyGenerator1Test.srvKeyGenerator.concat(".").concat(defaultAlg), 
                 KeyGeneratorProviderClass);
         Security.insertProviderAt(mProv, 1);
     }
@@ -81,7 +81,7 @@
      * 
      * @param arg0
      */
-    public KeyGeneratorTest2(String arg0) {
+    public KeyGenerator2Test(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java Tue May  2 23:40:29 2006
@@ -42,7 +42,7 @@
  * 
  */
 
-public class MacTest1 extends TestCase {
+public class Mac1Test extends TestCase {
 
     public static final String srvMac = "Mac";
 
@@ -101,7 +101,7 @@
      * Constructor for MacTest.
      * @param arg0
      */
-    public MacTest1(String arg0) {
+    public Mac1Test(String arg0) {
         super(arg0);
     }
     /**
@@ -786,7 +786,7 @@
     }
     
     public static Test suite() {
-        return new TestSuite(MacTest1.class);
+        return new TestSuite(Mac1Test.class);
     }
 
     public static void main(String args[]) {        

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/MacTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac2Test.java Tue May  2 23:40:29 2006
@@ -41,7 +41,7 @@
  * 
  */
 
-public class MacTest2 extends TestCase {
+public class Mac2Test extends TestCase {
     
     private static final String defaultAlg = "MyMacProv";
     
@@ -65,7 +65,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyMacProvider", "Testing provider", 
-                MacTest1.srvMac.concat(".").concat(defaultAlg), 
+                Mac1Test.srvMac.concat(".").concat(defaultAlg), 
                 MacProviderClass);
         Security.insertProviderAt(mProv, 2);
     }
@@ -83,7 +83,7 @@
      * 
      * @param arg0
      */
-    public MacTest2(String arg0) {
+    public Mac2Test(String arg0) {
         super(arg0);
     }
     

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java Tue May  2 23:40:29 2006
@@ -41,7 +41,7 @@
  * 
  */
 
-public class SecretKeyFactoryTest1 extends TestCase {
+public class SecretKeyFactory1Test extends TestCase {
     
     public static final String srvSecretKeyFactory = "SecretKeyFactory";
         
@@ -111,7 +111,7 @@
      * 
      * @param arg0
      */
-    public SecretKeyFactoryTest1(String arg0) {
+    public SecretKeyFactory1Test(String arg0) {
         super(arg0);
     }
 
@@ -437,14 +437,11 @@
         for (int i = 0; i < skF.length; i++) {
             try { 
                 skF[i].translateKey(null);
-                fail("InvalidKeyException must be thrown");
+                fail("InvalidKeyException must be thrown: " + i);
             } catch (InvalidKeyException e) {
             }
-            try { 
-                skF[i].translateKey(secKeySpec);
-                fail("InvalidKeyException must be thrown");
-            } catch (InvalidKeyException e) {
-            }            
+
+            skF[i].translateKey(secKeySpec);
         }
     }
 }

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory2Test.java Tue May  2 23:40:29 2006
@@ -38,7 +38,7 @@
  * 
  */
 
-public class SecretKeyFactoryTest2 extends TestCase {
+public class SecretKeyFactory2Test extends TestCase {
     
     private static final String defaultAlg = "MySecretKey";
     private static final String SecretKeyFactoryProviderClass = "javax.crypto.MySecretKeyFactorySpi";
@@ -60,7 +60,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MySKFProvider", "Testing provider", 
-                SecretKeyFactoryTest1.srvSecretKeyFactory.concat(".").concat(defaultAlg), 
+                SecretKeyFactory1Test.srvSecretKeyFactory.concat(".").concat(defaultAlg), 
                 SecretKeyFactoryProviderClass);
         Security.insertProviderAt(mProv, 2);
     }
@@ -78,7 +78,7 @@
      * 
      * @param arg0
      */
-    public SecretKeyFactoryTest2(String arg0) {
+    public SecretKeyFactory2Test(String arg0) {
         super(arg0);
     }
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java Tue May  2 23:40:29 2006
@@ -27,7 +27,7 @@
  * Tests for <code>MessageDigest</code> constructor and methods
  * 
  */
-public class MessageDigestTest1 extends TestCase {
+public class MessageDigest1Test extends TestCase {
 
 	public void testReset() {	
 		MyMessageDigest1 md = new MyMessageDigest1("ABC");

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java Tue May  2 23:40:29 2006
@@ -27,7 +27,7 @@
  * Tests for <code>MessageDigest</code> constructor and methods
  * 
  */
-public class MessageDigestTest2 extends TestCase {
+public class MessageDigest2Test extends TestCase {
 
 	/**
 	 * Provider

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom1Test.java Tue May  2 23:40:29 2006
@@ -27,7 +27,7 @@
  * Tests for <code>SecureRandom</code> constructor and methods
  * 
  */
-public class SecureRandomTest1 extends TestCase {
+public class SecureRandom1Test extends TestCase {
 
 	/**
 	 * SRProvider

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandom2Test.java Tue May  2 23:40:29 2006
@@ -32,7 +32,7 @@
  * Tests for internal Secure Random implementation based on Random
  * 
  */
-public class SecureRandomTest2 extends TestCase {
+public class SecureRandom2Test extends TestCase {
 	
 	/**
 	 * Registered providers

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest1.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java Tue May  2 23:40:29 2006
@@ -27,7 +27,7 @@
  * Tests for <code>Signature</code> constructor and methods
  * 
  */
-public class SignatureTest1 extends TestCase {
+public class Signature1Test extends TestCase {
 
 	/*
 	 * Class under test for Object clone()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java (from r397752, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest2.java&r1=397752&r2=399169&rev=399169&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java Tue May  2 23:40:29 2006
@@ -27,7 +27,7 @@
  * Tests for <code>Signature</code> constructor and methods
  * 
  */
-public class SignatureTest2 extends TestCase {
+public class Signature2Test extends TestCase {
 
 	/**
 	 * Provider