harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r376278 - /incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/
Date Thu, 09 Feb 2006 12:45:59 GMT
Author: geirm
Date: Thu Feb  9 04:45:57 2006
New Revision: 376278

URL: http://svn.apache.org/viewcvs?rev=376278&view=rev
Log:
more refactoring of test class names

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore1Test.java
      - copied, changed from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore2Test.java
      - copied, changed from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore3Test.java
      - copied, changed from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTest.java
      - copied, changed from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTests.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MyKeyStore.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java?rev=376278&r1=376277&r2=376278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
Thu Feb  9 04:45:57 2006
@@ -57,9 +57,9 @@
     private tmpCallbackHandler tmpCall = new tmpCallbackHandler();
     private KeyStore.CallbackHandlerProtection callbackHand = new KeyStore.CallbackHandlerProtection(tmpCall);
     private myProtectionParameter myProtParam = new myProtectionParameter(new byte[5]); 

-    public static String[] validValues = KeyStoreTest1.validValues;
+    public static String[] validValues = KeyStore1Test.validValues;
 
-    private static String defaultType = KeyStoreTest1.defaultType;
+    private static String defaultType = KeyStore1Test.defaultType;
 
     private static boolean JKSSupported = false;
 
@@ -71,7 +71,7 @@
     
     static {
         defaultProvider = SpiEngUtils.isSupport(
-                KeyStoreTest1.defaultType, KeyStoreTest1.srvKeyStore);
+                KeyStore1Test.defaultType, KeyStore1Test.srvKeyStore);
         JKSSupported = (defaultProvider != null);
         fileEmpty = SpiEngUtils.getFileName(TestUtils.TEST_ROOT,
                 fileEmpty);

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore1Test.java
(from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java&r1=376142&r2=376278&rev=376278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore1Test.java
Thu Feb  9 04:45:57 2006
@@ -40,7 +40,7 @@
  * 
  */
 
-public class KeyStoreTest1 extends TestCase {
+public class KeyStore1Test extends TestCase {
     
     public static final String srvKeyStore = "KeyStore";
     public static String[] validValues =  {
@@ -74,7 +74,7 @@
      * 
      * @param arg0
      */
-    public KeyStoreTest1(String arg0) {
+    public KeyStore1Test(String arg0) {
         super(arg0);
     }
     
@@ -1130,7 +1130,7 @@
         }
     }
     public static void main(String args[]) {
-        junit.textui.TestRunner.run(KeyStoreTest1.class);    
+        junit.textui.TestRunner.run(KeyStore1Test.class);
     }
     
     /**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore2Test.java
(from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java&r1=376142&r2=376278&rev=376278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore2Test.java
Thu Feb  9 04:45:57 2006
@@ -43,7 +43,7 @@
  * 
  */
 
-public class KeyStoreTest2 extends TestCase {
+public class KeyStore2Test extends TestCase {
 
     private static final String KeyStoreProviderClass = "java.security.MyKeyStoreSpi";
 
@@ -66,7 +66,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyKSProvider",
-                "Testing provider", KeyStoreTest1.srvKeyStore.concat(".").concat(
+                "Testing provider", KeyStore1Test.srvKeyStore.concat(".").concat(
                         defaultAlg), KeyStoreProviderClass);
         Security.insertProviderAt(mProv, 2);
     }
@@ -84,7 +84,7 @@
      * 
      * @param arg0
      */
-    public KeyStoreTest2(String arg0) {
+    public KeyStore2Test(String arg0) {
         super(arg0);
     }
 
@@ -428,7 +428,7 @@
         }
     }
     public static void main(String args[]) {
-        junit.textui.TestRunner.run(KeyStoreTest2.class);    
+        junit.textui.TestRunner.run(KeyStore2Test.class);
     }
 
 }

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore3Test.java
(from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore3Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore3Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java&r1=376142&r2=376278&rev=376278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStore3Test.java
Thu Feb  9 04:45:57 2006
@@ -39,7 +39,7 @@
  * 
  */
 
-public class KeyStoreTest3 extends TestCase {
+public class KeyStore3Test extends TestCase {
 
     private static final String KeyStoreProviderClass = "java.security.MyKeyStore";
 
@@ -75,11 +75,11 @@
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyKSProvider",
-                "Testing provider", KeyStoreTest1.srvKeyStore.concat(".")
+                "Testing provider", KeyStore1Test.srvKeyStore.concat(".")
                         .concat(defaultType), KeyStoreProviderClass);
         Security.insertProviderAt(mProv, 2);
         defaultProvider = SpiEngUtils.isSupport(defaultType,
-                KeyStoreTest1.srvKeyStore);
+                KeyStore1Test.srvKeyStore);
         KSSupported = (defaultProvider != null);
         defaultProviderName = (KSSupported ? defaultProvider.getName() : null);
     }
@@ -97,7 +97,7 @@
      * 
      * @param arg0
      */
-    public KeyStoreTest3(String arg0) {
+    public KeyStore3Test(String arg0) {
         super(arg0);
     }
 
@@ -121,14 +121,14 @@
             return;
         }
         String tType = "TestType";
-        KeyStoreTest1 KeyStoreT1 = new KeyStoreTest1("proba");
+        KeyStore1Test keyStoreT1 = new KeyStore1Test("proba");
         KeyStore.TrustedCertificateEntry tCert = new KeyStore.TrustedCertificateEntry(
-                KeyStoreT1.new MCertificate("type", new byte[0]));
+                keyStoreT1.new MCertificate("type", new byte[0]));
 
         Certificate certs[] = {
-                (Certificate) KeyStoreT1.new MCertificate(tType, new byte[10]),
-                (Certificate) KeyStoreT1.new MCertificate(tType, new byte[20]) };
-        PrivateKey pk = KeyStoreT1.new MyPrivateKey(tType, "", new byte[10]);
+                (Certificate) keyStoreT1.new MCertificate(tType, new byte[10]),
+                (Certificate) keyStoreT1.new MCertificate(tType, new byte[20]) };
+        PrivateKey pk = keyStoreT1.new MyPrivateKey(tType, "", new byte[10]);
         KeyStore.PrivateKeyEntry pKey = new KeyStore.PrivateKeyEntry(pk, certs);
         char[] pwd = { 'p', 'a', 's', 's', 'w', 'd' };
         KeyStore.PasswordProtection pPath = new KeyStore.PasswordProtection(pwd);
@@ -277,10 +277,10 @@
         String alias = "keyEntry";
         char[] pwd = new char[0];
         byte[] res;
-        KeyStoreTest1 KeyStoreT1 = new KeyStoreTest1("proba");
+        KeyStore1Test keyStoreT1 = new KeyStore1Test("proba");
         Certificate certs[] = {
-                (Certificate) KeyStoreT1.new MCertificate(alias, kk),
-                (Certificate) KeyStoreT1.new MCertificate(alias, kk) };
+                (Certificate) keyStoreT1.new MCertificate(alias, kk),
+                (Certificate) keyStoreT1.new MCertificate(alias, kk) };
         for (int i = 0; i < kss.length; i++) {
             kss[i].load(null, null);
             try {
@@ -306,6 +306,6 @@
     }
     
     public static void main(String args[]) {
-        junit.textui.TestRunner.run(KeyStoreTest3.class);    
+        junit.textui.TestRunner.run(KeyStore3Test.class);
     }
 }

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTest.java
(from r376142, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTests.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTests.java&r1=376142&r2=376278&rev=376278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTests.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTest.java
Thu Feb  9 04:45:57 2006
@@ -35,14 +35,14 @@
  * 
  */
 
-public class KeyStoreSpiTests extends TestCase {
+public class KeyStoreSpiTest extends TestCase {
 
     /**
      * Constructor for KeyStoreSpi.
      * 
      * @param arg0
      */
-    public KeyStoreSpiTests(String arg0) {
+    public KeyStoreSpiTest(String arg0) {
         super(arg0);
     }
 
@@ -149,7 +149,7 @@
     }
     
     public static void main(String args[]) {
-        junit.textui.TestRunner.run(KeyStoreSpiTests.class);
+        junit.textui.TestRunner.run(KeyStoreSpiTest.class);
     }
 }
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MyKeyStore.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MyKeyStore.java?rev=376278&r1=376277&r2=376278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MyKeyStore.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MyKeyStore.java
Thu Feb  9 04:45:57 2006
@@ -105,7 +105,7 @@
         if (Chain.containsKey(alias)) {
             Chain.remove(alias);
         }
-        KeyStoreTest1.MyPrivateKey keyK = new KeyStoreTest1("proba").new MyPrivateKey(
+        KeyStore1Test.MyPrivateKey keyK = new KeyStore1Test("proba").new MyPrivateKey(
                 alias, alias, key);
         Keys.put(alias, keyK);
         if (chain != null) {



Mime
View raw message