harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r487792 - in /harmony/enhanced/classlib/trunk/modules/crypto/src: main/java/javax/crypto/ test/api/java.injected/javax/crypto/ test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ test/api/java/org/apache/harmony/crypto/tests/javax/c...
Date Sat, 16 Dec 2006 12:06:15 GMT
Author: smishura
Date: Sat Dec 16 04:06:13 2006
New Revision: 487792

URL: http://svn.apache.org/viewvc?view=rev&rev=487792
Log:
Apply patch for HARMONY-2750 ([Classlib][crypto] Wrong words in crypto module)

Modified:
    harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
Sat Dec 16 04:06:13 2006
@@ -361,7 +361,7 @@
      */
     public final void init(int opmode, Key key) throws InvalidKeyException {
         if (sec_rand == null) {
-            // In theory it might be therad-unsafe but in the given case it's OK
+            // In theory it might be thread-unsafe but in the given case it's OK
             // since it does not matter which SecureRandom instance is passed
             // to the init()
             sec_rand = new SecureRandom();

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
Sat Dec 16 04:06:13 2006
@@ -36,7 +36,7 @@
     private final Cipher cipher;
     private final int I_BUFFER_SIZE = 20;
     private final byte[] i_buffer = new byte[I_BUFFER_SIZE];
-    private int index; // index of the butes to return from o_buffer
+    private int index; // index of the bytes to return from o_buffer
     private byte[] o_buffer;
     private boolean finished;
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
Sat Dec 16 04:06:13 2006
@@ -342,9 +342,9 @@
             // OID provided to the ctor
             // get rid of possible leading "OID."
             this.oid = AlgNameMapper.normalize(this.algName);
-            // try to find mappping OID->algName
+            // try to find mapping OID->algName
             this.algName = AlgNameMapper.map2AlgName(this.oid);
-            // if there is no mappping OID->algName
+            // if there is no mapping OID->algName
             // set OID as algName
             if (this.algName == null) {
                 this.algName = this.oid;
@@ -352,7 +352,7 @@
         } else {
             String stdName = AlgNameMapper.getStandardName(this.algName);
             // Alg name provided to the ctor
-            // try to find mappping algName->OID or
+            // try to find mapping algName->OID or
             // (algName->stdAlgName)->OID
             this.oid = AlgNameMapper.map2OID(this.algName);
             if (this.oid == null) {

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java
Sat Dec 16 04:06:13 2006
@@ -128,7 +128,7 @@
 
     /**
      * read(byte[] b, int off, int len) method testing. Tests that method
-     * returns the correct value (related to the InputStream), that it dicards
+     * returns the correct value (related to the InputStream), that it discards
      * bytes in the case of null buffer, and that it returns -1 at the end of
      * stream.
      */

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java
Sat Dec 16 04:06:13 2006
@@ -69,19 +69,19 @@
         assertEquals("Incorrect result of engineUpdate(byte, int, int)",
                 bb.length, 2);
         bb = cSpi.engineDoFinal(bb1, 1, 2);
-        assertEquals("Incorrect result of enfineDoFinal(byte, int, int)", 2,
+        assertEquals("Incorrect result of engineDoFinal(byte, int, int)", 2,
                 bb.length);
         assertEquals(
-                "Incorrect result of enfineUpdate(byte, int, int, byte, int)",
+                "Incorrect result of engineUpdate(byte, int, int, byte, int)",
                 cSpi.engineUpdate(bb1, 1, 2, bb2, 7), 2);
         assertEquals(
-                "Incorrect result of enfineDoFinal(byte, int, int, byte, int)",
+                "Incorrect result of engineDoFinal(byte, int, int, byte, int)",
                 2, cSpi.engineDoFinal(bb1, 1, 2, bb2, 0));
     }
     
     /**
      * Test for <code>engineGetKeySize(Key)</code> method 
-     * Assertion: It throws UnsupportedOperationException if it is not overriden
+     * Assertion: It throws UnsupportedOperationException if it is not overridden
      */
     public void testCipherSpi02() throws Exception {
         CipherSpi cSpi = new myCipherSpi();
@@ -94,7 +94,7 @@
 
     /**
      * Test for <code>engineWrap(Key)</code> method 
-     * Assertion: It throws UnsupportedOperationException if it is not overriden
+     * Assertion: It throws UnsupportedOperationException if it is not overridden
      */
     public void testCipherSpi03() throws Exception {
         CipherSpi cSpi = new myCipherSpi();
@@ -107,7 +107,7 @@
 
     /**
      * Test for <code>engineUnwrap(byte[], String, int)</code> method
-     * Assertion: It throws UnsupportedOperationException if it is not overriden
+     * Assertion: It throws UnsupportedOperationException if it is not overridden
      */
     public void testCipherSpi04() throws Exception {
         CipherSpi cSpi = new myCipherSpi();

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java
Sat Dec 16 04:06:13 2006
@@ -71,19 +71,19 @@
         assertNull("Not null result", kaSpi.engineGenerateSecret("aaa"));
         try {
             kaSpi.engineGenerateSecret("");
-            fail("NoSuchAlgorithmException must be throwm");
+            fail("NoSuchAlgorithmException must be thrown");
         } catch (NoSuchAlgorithmException e) {
         }
         Key key = null;
         try {
             kaSpi.engineInit(key, new SecureRandom());
-            fail("IllegalArgumentException must be throwm");
+            fail("IllegalArgumentException must be thrown");
         } catch (IllegalArgumentException e) {
         }
         AlgorithmParameterSpec params = null;
         try {
             kaSpi.engineInit(key, params, new SecureRandom());
-            fail("IllegalArgumentException must be throwm");
+            fail("IllegalArgumentException must be thrown");
         } catch (IllegalArgumentException e) {
         }        
     }

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
Sat Dec 16 04:06:13 2006
@@ -383,7 +383,7 @@
             }
         }
 
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -524,7 +524,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -655,7 +655,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     public final void testGetAlgParameters01_01() throws Exception {
@@ -696,7 +696,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -728,7 +728,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -736,7 +736,7 @@
      * Assertion: returns the algorithm parameters <br>
      * Test preconditions: test object created using ctor which takes
      * AlgorithmParameters and encrypted data as a parameters; <br>
-     * Expected: the same algorithm parameters as ones passed to the ctormust be
+     * Expected: the same algorithm parameters as ones passed to the ctor must be
      * returned
      * 
      * @throws IOException
@@ -764,7 +764,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -796,7 +796,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -824,7 +824,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -859,7 +859,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -890,7 +890,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -919,7 +919,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -954,7 +954,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -991,7 +991,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1025,7 +1025,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     public final void testGetKeySpecCipher01() {
@@ -1051,7 +1051,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1091,7 +1091,7 @@
             } catch (NoSuchAlgorithmException allowed) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1128,7 +1128,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     public final void testGetKeySpecKey01() {
@@ -1154,7 +1154,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1192,7 +1192,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1225,7 +1225,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     public final void testGetKeySpecKeyString01() throws Exception {
@@ -1271,7 +1271,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1320,7 +1320,7 @@
                 }
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1367,7 +1367,7 @@
                 }
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     public final void testGetKeySpecKeyProvider01() throws Exception {
@@ -1412,7 +1412,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -1507,7 +1507,7 @@
                 }
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     public static class TestDataGenerator {

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
Sat Dec 16 04:06:13 2006
@@ -46,7 +46,7 @@
 
     /**
      * Test for <code>ExemptionMechanism</code> constructor 
-     * Assertion: cretes new object using provider and mechanism name
+     * Assertion: creates new object using provider and mechanism name
      */
     public void testExemptionMechanism() throws Exception {
         Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider",

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
Sat Dec 16 04:06:13 2006
@@ -366,7 +366,7 @@
      * <code>init(Key key, SecureRandom random)</code>
      * <code>init(Key key, AlgorithmParameterSpec params)</code>
      * <code>init(Key key, AlgorithmParameterSpec params, SecureRandom random)</code>
-     * Assertion: throws InvalidKeyException when key is inapporopriate
+     * Assertion: throws InvalidKeyException when key is inappropriate
      */
     public void testInit01() throws Exception {
         if (!DEFSupported) {
@@ -419,7 +419,7 @@
      * <code>init(Key key, AlgorithmParameterSpec params)</code>
      * <code>init(Key key, AlgorithmParameterSpec params, SecureRandom random)</code>
      * Assertion: throws AlgorithmParameterException when params are
-     * inapporopriate
+     * inappropriate
      */
     public void testInit02() throws Exception {
         if (!DEFSupported) {

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
Sat Dec 16 04:06:13 2006
@@ -414,19 +414,19 @@
 
         for (int i = 0; i < kgs.length; i++) {
             sKey = kgs[i].generateKey();
-            assertEquals("Incorect algorithm", sKey.getAlgorithm()
+            assertEquals("Incorrect algorithm", sKey.getAlgorithm()
                     .toUpperCase(), dAl);
             kgs[i].init(new SecureRandom());
             sKey = kgs[i].generateKey();
-            assertEquals("Incorect algorithm", sKey.getAlgorithm()
+            assertEquals("Incorrect algorithm", sKey.getAlgorithm()
                     .toUpperCase(), dAl);
             kgs[i].init(defaultKeySize);
             sKey = kgs[i].generateKey();
-            assertEquals("Incorect algorithm", sKey.getAlgorithm()
+            assertEquals("Incorrect algorithm", sKey.getAlgorithm()
                     .toUpperCase(), dAl);
             kgs[i].init(defaultKeySize, new SecureRandom());
             sKey = kgs[i].generateKey();
-            assertEquals("Incorect algorithm", sKey.getAlgorithm()
+            assertEquals("Incorrect algorithm", sKey.getAlgorithm()
                     .toUpperCase(), dAl);
         }
     }

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
Sat Dec 16 04:06:13 2006
@@ -168,7 +168,7 @@
                 try {
                     Mac.getInstance(validValues[i], invalidValues[j]);
                     fail("NoSuchProviderException must be thrown (algorithm: "
-                            .concat(validValues[i]).concat(" provoder: ")
+                            .concat(validValues[i]).concat(" provider: ")
                             .concat(invalidValues[j]).concat(")"));
                 } catch (NoSuchProviderException e) {
                 }

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
Sat Dec 16 04:06:13 2006
@@ -28,7 +28,7 @@
 
 
 /**
- * Test for BadPaddingException seialization
+ * Test for BadPaddingException serialization
  * 
  */
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
Sat Dec 16 04:06:13 2006
@@ -28,7 +28,7 @@
 
 
 /**
- * Test for ExemptionMechanismException seialization
+ * Test for ExemptionMechanismException serialization
  * 
  */
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
Sat Dec 16 04:06:13 2006
@@ -28,7 +28,7 @@
 
 
 /**
- * Test for IllegalBlockSizeException seialization
+ * Test for IllegalBlockSizeException serialization
  * 
  */
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
Sat Dec 16 04:06:13 2006
@@ -28,7 +28,7 @@
 
 
 /**
- * Test for NuSuchPaddingException seialization
+ * Test for NuSuchPaddingException serialization
  * 
  */
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
Sat Dec 16 04:06:13 2006
@@ -28,7 +28,7 @@
 
 
 /**
- * Test for ShortBufferException seialization
+ * Test for ShortBufferException serialization
  * 
  */
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
Sat Dec 16 04:06:13 2006
@@ -39,7 +39,7 @@
     /**
      * DHParameterSpec class testing. Tests the equivalence of parameters
      * specified in the constructor with the values returned by getters.
-     * The tested object is creaded by different constructors.
+     * The tested object is created by different constructors.
      */
     public void testDHParameterSpec() {
         BigInteger[] ps = {new BigInteger("-1000000000000"), BigInteger.ZERO,

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
Sat Dec 16 04:06:13 2006
@@ -40,7 +40,7 @@
     /**
      * OAEPParameterSpec(String mdName, String mgfName, AlgorithmParameterSpec
      * mgfSpec, PSource pSrc) method testing. Tests that NullPointerException
-     * is thrown in the case of inapropriate constructor parameters and checks
+     * is thrown in the case of inappropriate constructor parameters and checks
      * the value of DEFAULT field.
      */
     public void testOAEPParameterSpec() {

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
Sat Dec 16 04:06:13 2006
@@ -39,7 +39,7 @@
     /**
      * RC2ParameterSpec(int effectiveKeyBits, byte[] iv) method testing.
      * Tests that IllegalArgumentException is thrown in the case of
-     * inapropriate constructor parameters and that input iv array is
+     * inappropriate constructor parameters and that input iv array is
      * copied to protect against subsequent modification.
      */
     public void testRC2ParameterSpec1() {
@@ -70,7 +70,7 @@
     /**
      * RC2ParameterSpec(int effectiveKeyBits, byte[] iv, int offset) method
      * testing. Tests that IllegalArgumentException is thrown in the case of
-     * inapropriate constructor parameters and that input iv array is
+     * inappropriate constructor parameters and that input iv array is
      * copied to protect against subsequent modification.
      */
     public void testRC2ParameterSpec2() {
@@ -139,7 +139,7 @@
     }
 
     /**
-     * equals(Object obj) method testing. Tests the correctnel of equal
+     * equals(Object obj) method testing. Tests the correctness of equal
      * operation: it should be reflexive, symmetric, transitive, consistent
      * and should be false on null object.
      */

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
Sat Dec 16 04:06:13 2006
@@ -38,7 +38,7 @@
     /**
      * RC5ParameterSpec(int version, int rounds, int wordSize, byte[] iv) method
      * testing. Tests that IllegalArgumentException is thrown in the case of
-     * inapropriate constructor parameters and that input iv array is
+     * inappropriate constructor parameters and that input iv array is
      * copied to protect against subsequent modification.
      */
     public void testRC5ParameterSpec1() {
@@ -79,7 +79,7 @@
     /**
      * RC5ParameterSpec(int version, int rounds, int wordSize, byte[] iv, int
      * offset) method testing. Tests that IllegalArgumentException is thrown in
-     * the case of inapropriate constructor parameters and that input iv array
+     * the case of inappropriate constructor parameters and that input iv array
      * is copied to protect against subsequent modification.
      */
     public void testRC5ParameterSpec2() {
@@ -208,7 +208,7 @@
     }
 
     /**
-     * equals(Object obj) method testing. Tests the correctnel of equal
+     * equals(Object obj) method testing. Tests the correctness of equal
      * operation: it should be reflexive, symmetric, transitive, consistent
      * and should be false on null object.
      */

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
Sat Dec 16 04:06:13 2006
@@ -37,7 +37,7 @@
 
     /**
      * SecretKeySpec(byte[] key, String algorithm) method testing. Tests that
-     * IllegalArgumentException is thrown in the case of inapropriate
+     * IllegalArgumentException is thrown in the case of inappropriate
      * constructor parameters and that input iv array is
      * copied to protect against subsequent modification.
      */
@@ -76,7 +76,7 @@
     /**
      * SecretKeySpec(byte[] key, int offset, int len, String algorithm) method
      * testing. Tests that IllegalArgumentException is thrown in
-     * the case of inapropriate constructor parameters and that input iv array
+     * the case of inappropriate constructor parameters and that input iv array
      * is copied to protect against subsequent modification.
      */
     public void testSecretKeySpec2() {
@@ -212,7 +212,7 @@
     }
 
     /**
-     * equals(Object obj) method testing. Tests the correctnel of equal
+     * equals(Object obj) method testing. Tests the correctness of equal
      * operation: it should be reflexive, symmetric, transitive, consistent
      * and should be false on null object.
      */

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java
Sat Dec 16 04:06:13 2006
@@ -65,7 +65,7 @@
             } catch (NoSuchAlgorithmException allowed) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -90,7 +90,7 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 
     /**
@@ -119,6 +119,6 @@
             } catch (NoSuchAlgorithmException allowedFailure) {
             }
         }
-        assertTrue("Test not perfrormed", performed);
+        assertTrue("Test not performed", performed);
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java
Sat Dec 16 04:06:13 2006
@@ -123,19 +123,19 @@
         key = new SecretKeySpec(new byte[10], "DSA");
         try {
             exMech.init(key);
-            fail("ExemptionMechanismException must be throwm");
+            fail("ExemptionMechanismException must be thrown");
         } catch (ExemptionMechanismException e) {
             assertTrue("Empty message", (e.getMessage().length() > 0));
         }
         try {
             exMech.init(key, params);
-            fail("ExemptionMechanismException must be throwm");
+            fail("ExemptionMechanismException must be thrown");
         } catch (ExemptionMechanismException e) {
             assertTrue("Empty message", (e.getMessage().length() > 0));
         }
         try {
             exMech.init(key, parSpec);
-            fail("ExemptionMechanismException must be throwm");
+            fail("ExemptionMechanismException must be thrown");
         } catch (ExemptionMechanismException e) {
             assertTrue("Empty message", (e.getMessage().length() > 0));
         }

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java
Sat Dec 16 04:06:13 2006
@@ -83,7 +83,7 @@
         assertNull("Provider must be null", keyA.getProvider());
         try {
             keyA.doPhase(null, true);
-            fail("NullPointerEXception must be thrown");
+            fail("NullPointerException must be thrown");
         } catch (NullPointerException e) {
         }
     }

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java?view=diff&rev=487792&r1=487791&r2=487792
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java
Sat Dec 16 04:06:13 2006
@@ -101,19 +101,19 @@
         assertNull("Not null result", keyAgr.generateSecret("aaa"));
         try {
             keyAgr.generateSecret("");
-            fail("NoSuchAlgorithmException must be throwm");
+            fail("NoSuchAlgorithmException must be thrown");
         } catch (NoSuchAlgorithmException e) {
         }
         Key key = null;
         try {
             keyAgr.init(key, new SecureRandom());
-            fail("IllegalArgumentException must be throwm");
+            fail("IllegalArgumentException must be thrown");
         } catch (IllegalArgumentException e) {
         }
         AlgorithmParameterSpec params = null;
         try {
             keyAgr.init(key, params, new SecureRandom());
-            fail("IllegalArgumentException must be throwm");
+            fail("IllegalArgumentException must be thrown");
         } catch (IllegalArgumentException e) {
         }
     }



Mime
View raw message