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/19 10:45:05 UTC
svn commit: r407748 [2/3] - in
/incubator/harmony/enhanced/classlib/trunk/modules/crypto: make/common/
src/test/api/ src/test/api/java.injected/ src/test/api/java.injected/javax/
src/test/api/java.injected/javax/crypto/ src/test/api/java.injected/javax...
Added: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java?rev=407748&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java Fri May 19 01:44:59 2006
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+* @author Alexander Y. Kleymenov
+* @version $Revision$
+*/
+
+package javax.crypto;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.util.Arrays;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.NullCipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ */
+
+public class SealedObjectTest extends TestCase {
+
+ /**
+ * readObject(ObjectInputStream s) method testing. Tests if the
+ * serialization/deserialization works correctly: object is serialized,
+ * deserialized, the content od deserialized object equals to the
+ * content of initial object.
+ */
+ public void testReadObject() {
+ try {
+ String secret = "secret string";
+ SealedObject so = new SealedObject(secret, new NullCipher());
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+ oos.writeObject(so);
+
+ ObjectInputStream ois =
+ new ObjectInputStream(
+ new ByteArrayInputStream(bos.toByteArray()));
+
+ SealedObject so_des = (SealedObject) ois.readObject();
+ assertEquals("The secret content of deserialized object "
+ + "should be equal to the secret content of initial object",
+ secret, so_des.getObject(new NullCipher()));
+ assertEquals("The value returned by getAlgorithm() method of "
+ + "deserialized object should be equal to the value returned "
+ + "by getAlgorithm() method of initial object",
+ so.getAlgorithm(), so_des.getAlgorithm());
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected BadPaddingException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ }
+ }
+
+ /**
+ * SealedObject(Serializable object, Cipher c) method testing.
+ * Tests if the NullPointerException is thrown in the case of null cipher.
+ */
+ public void testSealedObject1() {
+ String secret = "secret string";
+ try {
+ new SealedObject(secret, null);
+ fail("NullPointerException should be thrown in the case "
+ + "of null cipher.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (NullPointerException e) {
+ }
+ }
+
+ /**
+ * SealedObject(SealedObject so) method testing. Tests if the
+ * NullPointerException is thrown in the case of null SealedObject.
+ */
+ public void testSealedObject2() {
+ try {
+ new SealedObject(null);
+ fail("NullPointerException should be thrown in the case "
+ + "of null SealedObject.");
+ } catch (NullPointerException e) {
+ }
+
+ try {
+ String secret = "secret string";
+ Cipher cipher = new NullCipher();
+ SealedObject so1 = new SealedObject(secret, cipher);
+ SealedObject so2 = new SealedObject(so1);
+
+ assertEquals("The secret content of the object should equals "
+ + "to the secret content of initial object.",
+ secret, so2.getObject(cipher));
+ assertEquals("The algorithm which was used to seal the object "
+ + "should be the same as the algorithm used to seal the "
+ + "initial object", so1.getAlgorithm(), so2.getAlgorithm());
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected BadPaddingException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (NullPointerException e) {
+ e.printStackTrace();
+ fail("Unexpected NullPointerException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ }
+ }
+
+ /**
+ * getAlgorithm() method testing. Tests if the returned value equals
+ * to the corresponding value of Cipher object.
+ */
+ public void testGetAlgorithm() {
+ try {
+ String secret = "secret string";
+ String algorithm = "DES";
+ KeyGenerator kg = KeyGenerator.getInstance(algorithm);
+ Key key = kg.generateKey();
+
+ Cipher cipher = Cipher.getInstance(algorithm);
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+ SealedObject so = new SealedObject(secret, cipher);
+
+ assertEquals("The algorithm name should be the same as used "
+ + "in cipher.", algorithm, so.getAlgorithm());
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchAlgorithmException was thrown.");
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchPaddingException was thrown.");
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidKeyException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (NullPointerException e) {
+ e.printStackTrace();
+ fail("Unexpected NullPointerException was thrown.");
+ }
+ }
+
+ /**
+ * getObject(Key key) method testing. Tests if the object sealed
+ * with encryption algorithm and specified parameters can be
+ * retrieved by specifying the cryptographic key.
+ */
+ public void testGetObject1() {
+ try {
+ KeyGenerator kg = KeyGenerator.getInstance("DES");
+ Key key = kg.generateKey();
+
+ IvParameterSpec ips =
+ new IvParameterSpec(new byte[] {1, 2, 3, 4, 5, 6, 7, 8});
+
+ Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding");
+ cipher.init(Cipher.ENCRYPT_MODE, key, ips);
+
+ String secret = "secret string";
+ SealedObject so = new SealedObject(secret, cipher);
+
+ assertEquals("The returned object does not equals to the "
+ + "original object.",
+ secret, so.getObject(key));
+
+ assertTrue("The encodedParams field of SealedObject object "
+ + "should contain the encoded algorithm parameters.",
+ Arrays.equals(so.encodedParams,
+ cipher.getParameters().getEncoded()));
+
+ } catch (InvalidAlgorithmParameterException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidAlgorithmParameterException was thrown.");
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidKeyException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchPaddingException was thrown.");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchAlgorithmException was thrown.");
+ }
+ }
+
+ /**
+ * getObject(Cipher c) method testing. Tests if the proper exception
+ * is thrown in the case of incorrect input parameters and if the
+ * object sealed with encryption algorithm and specified parameters
+ * can be retrieved by specifying the initialized Cipher object.
+ */
+ public void testGetObject2() {
+ try {
+ new SealedObject("secret string",
+ new NullCipher()).getObject((Cipher) null);
+ fail("NullPointerException should be thrown in the case of "
+ + "null cipher.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected BadPaddingException was thrown.");
+ } catch (NullPointerException e) {
+ }
+
+ try {
+ KeyGenerator kg = KeyGenerator.getInstance("DES");
+ Key key = kg.generateKey();
+
+ IvParameterSpec ips =
+ new IvParameterSpec(new byte[] {1, 2, 3, 4, 5, 6, 7, 8});
+
+ Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding");
+ cipher.init(Cipher.ENCRYPT_MODE, key, ips);
+
+ String secret = "secret string";
+ SealedObject so = new SealedObject(secret, cipher);
+
+ cipher.init(Cipher.DECRYPT_MODE, key, ips);
+ assertEquals("The returned object does not equals to the "
+ + "original object.",
+ secret, so.getObject(cipher));
+
+ } catch (InvalidAlgorithmParameterException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidAlgorithmParameterException was thrown.");
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected BadPaddingException was thrown.");
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidKeyException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchPaddingException was thrown.");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchAlgorithmException was thrown.");
+ }
+ }
+
+ /**
+ * getObject(Key key, String provider) method testing. Tests if the
+ * proper exception is thrown in the case of incorrect input parameters
+ * and if the object sealed with encryption algorithm can be
+ * retrieved by specifying the cryptographic key and provider name.
+ */
+ public void testGetObject3() {
+ try {
+ new SealedObject("secret string",
+ new NullCipher()).getObject(
+ new SecretKeySpec(new byte[] {0, 0, 0}, "algorithm"),
+ null);
+ fail("IllegalArgumentException should be thrown in the case of "
+ + "null provider.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchAlgorithmException was thrown.");
+ } catch (NoSuchProviderException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchProviderException was thrown.");
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidKeyException was thrown.");
+ } catch (IllegalArgumentException e) {
+ }
+
+ try {
+ new SealedObject("secret string",
+ new NullCipher()).getObject(
+ new SecretKeySpec(new byte[] {0, 0, 0}, "algorithm"),
+ "");
+ fail("IllegalArgumentException should be thrown in the case of "
+ + "empty provider.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchAlgorithmException was thrown.");
+ } catch (NoSuchProviderException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchProviderException was thrown.");
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidKeyException was thrown.");
+ } catch (IllegalArgumentException e) {
+ }
+
+ try {
+ KeyGenerator kg = KeyGenerator.getInstance("DES");
+ Key key = kg.generateKey();
+
+ Cipher cipher = Cipher.getInstance("DES");
+ String provider = cipher.getProvider().getName();
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+
+ String secret = "secret string";
+ SealedObject so = new SealedObject(secret, cipher);
+
+ cipher.init(Cipher.DECRYPT_MODE, key);
+ assertEquals("The returned object does not equals to the "
+ + "original object.",
+ secret, so.getObject(key, provider));
+ } catch (NoSuchProviderException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchProviderException was thrown.");
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ fail("Unexpected InvalidKeyException was thrown.");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unexpected ClassNotFoundException was thrown.");
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ fail("Unexpected IllegalBlockSizeException was thrown.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Unexpected IOException was thrown.");
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchPaddingException was thrown.");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ fail("Unexpected NoSuchAlgorithmException was thrown.");
+ }
+ }
+
+ public static Test suite() {
+ return new TestSuite(SealedObjectTest.class);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+}
+
Added: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SecretKeyFactorySpiTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SecretKeyFactorySpiTest.java?rev=407748&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SecretKeyFactorySpiTest.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SecretKeyFactorySpiTest.java Fri May 19 01:44:59 2006
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+* @author Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package javax.crypto;
+
+import java.security.InvalidKeyException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+
+import org.apache.harmony.crypto.tests.support.MySecretKeyFactorySpi;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Tests for <code>SecretKeyFactorySpi</code> class constructors and methods.
+ *
+ */
+
+public class SecretKeyFactorySpiTest extends TestCase {
+
+ /**
+ * Constructor for SecretKeyfactorySpiTests.
+ *
+ * @param arg0
+ */
+ public SecretKeyFactorySpiTest(String arg0) {
+ super(arg0);
+ }
+
+ /**
+ *
+ * Test for <code>SecretKeyFactorySpi</code> constructor Assertion:
+ * constructs SecretKeyFactorySpi
+ */
+ public void testSecretKeyFactorySpi01() throws InvalidKeyException,
+ InvalidKeySpecException {
+ SecretKeyFactorySpi skfSpi = new MySecretKeyFactorySpi();
+ SecretKey sk = null;
+ assertNull("Not null result", skfSpi.engineTranslateKey(sk));
+
+ KeySpec kspec = null;
+ assertNull("Not null result", skfSpi.engineGenerateSecret(kspec));
+
+ assertNull("Not null result", skfSpi.engineGetKeySpec(sk, null));
+ }
+}
Added: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/spec/PSourceTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/spec/PSourceTest.java?rev=407748&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/spec/PSourceTest.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/spec/PSourceTest.java Fri May 19 01:44:59 2006
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+* @author Alexander Y. Kleymenov
+* @version $Revision$
+*/
+
+package javax.crypto.spec;
+
+import java.util.Arrays;
+import javax.crypto.spec.PSource;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ */
+
+public class PSourceTest extends TestCase {
+
+ /**
+ * PSpecified(byte[] p) method testing. Tests that NullPointerException
+ * is thrown in the case of null p array. Also it checks the value of
+ * DEFAULT field, and that input p array is copied to protect against
+ * subsequent modification.
+ */
+ public void testPSpecified() {
+ try {
+ new PSource.PSpecified(null);
+ fail("NullPointerException should be thrown in the case of "
+ + "null p array.");
+ } catch (NullPointerException e) {
+ }
+
+ assertEquals("The PSource.PSpecified DEFAULT value should be byte[0]",
+ 0, PSource.PSpecified.DEFAULT.getValue().length);
+
+ byte[] p = new byte[] {1, 2, 3, 4, 5};
+ PSource.PSpecified ps = new PSource.PSpecified(p);
+ p[0] ++;
+ assertFalse("The change of p specified in the constructor "
+ + "should not cause the change of internal array.",
+ p[0] == ps.getValue()[0]);
+ }
+
+ /**
+ * getValue() method testing. Tests that returned array is equal to the
+ * array specified in the constructor. Checks that modification
+ * of returned array does not affect the internal array.
+ */
+ public void testGetValue() {
+ byte[] p = new byte[] {1, 2, 3, 4, 5};
+
+ PSource.PSpecified ps = new PSource.PSpecified(p);
+ byte[] result = ps.getValue();
+ if (! Arrays.equals(p, result)) {
+ fail("The returned array does not equal to the specified "
+ + "in the constructor.");
+ }
+ result[0] ++;
+ assertFalse("The change of returned by getValue() array "
+ + "should not cause the change of internal array.",
+ result[0] == ps.getValue()[0]);
+ }
+
+ /**
+ * PSource(String pSrcName) method testing. Tests that returned value is
+ * equal to the value specified in the constructor.
+ */
+ public void testPSource() {
+ try {
+ new PSource(null);
+ fail("NullPointerException should be thrown in the case of "
+ + "null pSrcName.");
+ } catch (NullPointerException e) {
+ }
+ }
+
+ /**
+ * getAlgorithm() method testing. Tests that returned value is
+ * equal to the value specified in the constructor.
+ */
+ public void testGetAlgorithm() {
+ String pSrcName = "pSrcName";
+ PSource ps = new PSource(pSrcName);
+ assertTrue("The returned value is not equal to the value specified "
+ + "in constructor", pSrcName.equals(ps.getAlgorithm()));
+ }
+
+ public static Test suite() {
+ return new TestSuite(PSourceTest.class);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+}
+
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/BadPaddingExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/BadPaddingExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/BadPaddingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import javax.crypto.BadPaddingException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java Fri May 19 01:44:59 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/EncryptedPrivateKeyInfoTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/EncryptedPrivateKeyInfoTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/EncryptedPrivateKeyInfoTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -37,6 +37,13 @@
import java.util.Arrays;
import java.util.HashMap;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
@@ -1496,7 +1503,7 @@
*/
public final void testEncryptedPrivateKeyInfobyteArray6() throws Exception {
byte[] encoded = getValidEncryptedPrivateKeyInfoEncoding("DSA");
- byte[] encodedCopy = (byte[]) encoded.clone();
+ byte[] encodedCopy = encoded.clone();
// pass valid array
EncryptedPrivateKeyInfo epki = new EncryptedPrivateKeyInfo(
encodedCopy);
@@ -1611,7 +1618,7 @@
*/
public final void testEncryptedPrivateKeyInfoStringbyteArray5() {
try {
- byte[] encryptedDataCopy = (byte[]) encryptedData.clone();
+ byte[] encryptedDataCopy = encryptedData.clone();
// pass valid array
EncryptedPrivateKeyInfo epki = new EncryptedPrivateKeyInfo("DSA",
encryptedDataCopy);
@@ -1739,7 +1746,7 @@
// use pregenerated AlgorithmParameters encodings
ap.init(getParametersEncoding("DSA"));
- byte[] encryptedDataCopy = (byte[]) encryptedData.clone();
+ byte[] encryptedDataCopy = encryptedData.clone();
// pass valid array
EncryptedPrivateKeyInfo epki = new EncryptedPrivateKeyInfo(ap,
encryptedDataCopy);
@@ -2725,7 +2732,7 @@
? (byte[])validEPKIEncodings.get(algNameUC)
: (byte[])validEPKIEncodingsNP.get(algNameUC);
if (ret != null) {
- return (byte[]) ret.clone();
+ return ret.clone();
}
throw new NoSuchAlgorithmException("No encoding available for "
+ algName);
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import javax.crypto.ExemptionMechanismException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -31,8 +31,13 @@
import java.security.Security;
import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.ExemptionMechanism;
+import javax.crypto.ExemptionMechanismException;
+import javax.crypto.ExemptionMechanismSpi;
+import javax.crypto.ShortBufferException;
import javax.crypto.spec.SecretKeySpec;
+import org.apache.harmony.crypto.tests.support.MyExemptionMechanismSpi;
import org.apache.harmony.security.SpiEngUtils;
import junit.framework.TestCase;
@@ -48,7 +53,7 @@
private static final String defaultAlg = "EMech";
- private static final String ExemptionMechanismProviderClass = "javax.crypto.MyExemptionMechanismSpi";
+ private static final String ExemptionMechanismProviderClass = "org.apache.harmony.crypto.tests.support.MyExemptionMechanismSpi";
private static final String[] invalidValues = SpiEngUtils.invalidValues;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/IllegalBlockSizeExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/IllegalBlockSizeExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/IllegalBlockSizeExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import javax.crypto.IllegalBlockSizeException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement1Test.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyAgreement1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement1Test.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -33,9 +33,12 @@
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.DSAParameterSpec;
+import javax.crypto.KeyAgreement;
+import javax.crypto.KeyAgreementSpi;
import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.spec.DHParameterSpec;
+import org.apache.harmony.crypto.tests.support.MyKeyAgreementSpi;
import org.apache.harmony.security.SpiEngUtils;
import org.apache.harmony.security.support.TestKeyPair;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator1Test.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/KeyGenerator1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator1Test.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidParameterException;
@@ -29,6 +29,11 @@
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.KeyGenerator;
+import javax.crypto.KeyGeneratorSpi;
+import javax.crypto.SecretKey;
+
+import org.apache.harmony.crypto.tests.support.MyKeyGeneratorSpi;
import org.apache.harmony.security.SpiEngUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/Mac1Test.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/Mac1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/Mac1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/Mac1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/Mac1Test.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.nio.ByteBuffer;
import java.security.InvalidAlgorithmParameterException;
@@ -27,10 +27,15 @@
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Provider;
+
+import javax.crypto.Mac;
+import javax.crypto.MacSpi;
+import javax.crypto.ShortBufferException;
import javax.crypto.spec.DHGenParameterSpec;
import javax.crypto.spec.SecretKeySpec;
+import org.apache.harmony.crypto.tests.support.MyMacSpi;
import org.apache.harmony.security.SpiEngUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/NoSuchPaddingExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/NoSuchPaddingExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/NoSuchPaddingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import javax.crypto.NoSuchPaddingException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/NullCipherTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/NullCipherTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/NullCipherTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java Fri May 19 01:44:59 2006
@@ -19,8 +19,13 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NullCipher;
+import javax.crypto.ShortBufferException;
import javax.crypto.spec.SecretKeySpec;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory1Test.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactory1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory1Test.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
@@ -28,10 +28,14 @@
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.SecretKeyFactorySpi;
import javax.crypto.spec.DESKeySpec;
import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.SecretKeySpec;
+import org.apache.harmony.crypto.tests.support.MySecretKeyFactorySpi;
import org.apache.harmony.security.SpiEngUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import javax.crypto.SecretKey;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ShortBufferExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ShortBufferExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/ShortBufferExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import javax.crypto.ShortBufferException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/DHPrivateKeyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/DHPrivateKeyTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/DHPrivateKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.interfaces;
+package org.apache.harmony.crypto.tests.javax.crypto.interfaces;
import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.spec.DHParameterSpec;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/DHPublicKeyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/DHPublicKeyTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/DHPublicKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.interfaces;
+package org.apache.harmony.crypto.tests.javax.crypto.interfaces;
import java.math.BigInteger;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/PBEKeyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/PBEKeyTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/interfaces/PBEKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.interfaces;
+package org.apache.harmony.crypto.tests.javax.crypto.interfaces;
import java.math.BigInteger;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/BadPaddingExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/BadPaddingExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/BadPaddingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.serialization;
+package org.apache.harmony.crypto.tests.javax.crypto.serialization;
import javax.crypto.BadPaddingException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/ExemptionMechanismExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/ExemptionMechanismExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/ExemptionMechanismExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.serialization;
+package org.apache.harmony.crypto.tests.javax.crypto.serialization;
import javax.crypto.ExemptionMechanismException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.serialization;
+package org.apache.harmony.crypto.tests.javax.crypto.serialization;
import javax.crypto.IllegalBlockSizeException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/NoSuchPaddingExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/NoSuchPaddingExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/NoSuchPaddingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.serialization;
+package org.apache.harmony.crypto.tests.javax.crypto.serialization;
import javax.crypto.NoSuchPaddingException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/ShortBufferExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/ShortBufferExceptionTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/serialization/ShortBufferExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java Fri May 19 01:44:59 2006
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-package javax.crypto.serialization;
+package org.apache.harmony.crypto.tests.javax.crypto.serialization;
import javax.crypto.ShortBufferException;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DESedeKeySpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DESedeKeySpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DESedeKeySpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java Fri May 19 01:44:59 2006
@@ -19,11 +19,13 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.lang.NullPointerException;
import java.security.InvalidKeyException;
import java.util.Arrays;
+
+import javax.crypto.spec.DESedeKeySpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHGenParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHGenParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHGenParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.lang.Integer;
+
+import javax.crypto.spec.DHGenParameterSpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,10 +19,12 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.lang.Integer;
import java.math.BigInteger;
+
+import javax.crypto.spec.DHParameterSpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHPrivateKeySpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHPrivateKeySpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHPrivateKeySpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.math.BigInteger;
+
+import javax.crypto.spec.DHPrivateKeySpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHPublicKeySpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHPublicKeySpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/DHPublicKeySpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.math.BigInteger;
+
+import javax.crypto.spec.DHPublicKeySpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/IvParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/IvParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/IvParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,11 +19,13 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.lang.NullPointerException;
import java.lang.IllegalArgumentException;
import java.lang.ArrayIndexOutOfBoundsException;
+
+import javax.crypto.spec.IvParameterSpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/OAEPParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/OAEPParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/OAEPParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,10 +19,12 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.security.spec.MGF1ParameterSpec;
import java.security.spec.AlgorithmParameterSpec;
+
+import javax.crypto.spec.OAEPParameterSpec;
import javax.crypto.spec.PSource;
import junit.framework.Test;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.util.Arrays;
+
+import javax.crypto.spec.PBEKeySpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.util.Arrays;
+
+import javax.crypto.spec.PBEParameterSpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,10 +19,12 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.lang.IllegalArgumentException;
import java.util.Arrays;
+
+import javax.crypto.spec.RC2ParameterSpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.util.Arrays;
+
+import javax.crypto.spec.RC5ParameterSpec;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java (from r407735, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/SecretKeySpecTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/SecretKeySpecTest.java&r1=407735&r2=407748&rev=407748&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/SecretKeySpecTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java Fri May 19 01:44:59 2006
@@ -19,9 +19,11 @@
* @version $Revision$
*/
-package javax.crypto.spec;
+package org.apache.harmony.crypto.tests.javax.crypto.spec;
import java.util.Arrays;
+
+import javax.crypto.spec.SecretKeySpec;
import junit.framework.Test;
import junit.framework.TestCase;