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/06/01 10:15:44 UTC
svn commit: r410788 [3/13] - in
/incubator/harmony/enhanced/classlib/trunk/modules: auth/make/common/
auth/src/test/java/common/javax/security/auth/
auth/src/test/java/common/javax/security/auth/callback/serialization/
auth/src/test/java/common/javax/s...
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSignerTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSignerTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSignerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSignerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSignerTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSignerTest.java Thu Jun 1 01:15:17 2006
@@ -24,7 +24,7 @@
import java.security.cert.CertPath;
import java.util.Date;
-import org.apache.harmony.security.support.TestCertUtils;
+import org.apache.harmony.security.tests.support.TestCertUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSourceTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSourceTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSourceTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSourceTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSourceTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSourceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/CodeSourceTest.java Thu Jun 1 01:15:17 2006
@@ -35,7 +35,7 @@
import javax.security.auth.x500.X500Principal;
-import org.apache.harmony.security.support.TestCertUtils;
+import org.apache.harmony.security.tests.support.TestCertUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestInputStreamTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestInputStreamTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestInputStreamTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestInputStreamTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestInputStreamTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestInputStreamTest.java Thu Jun 1 01:15:17 2006
@@ -31,7 +31,8 @@
import java.util.Arrays;
-import org.apache.harmony.security.MDGoldenData;
+import org.apache.harmony.security.tests.support.MDGoldenData;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestOutputStreamTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestOutputStreamTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestOutputStreamTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestOutputStreamTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/DigestOutputStreamTest.java Thu Jun 1 01:15:17 2006
@@ -26,7 +26,8 @@
import java.io.OutputStream;
import java.util.Arrays;
-import org.apache.harmony.security.MDGoldenData;
+import org.apache.harmony.security.tests.support.MDGoldenData;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityScopeTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityScopeTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityScopeTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityScopeTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityScopeTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityScopeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityScopeTest.java Thu Jun 1 01:15:17 2006
@@ -21,7 +21,8 @@
package java.security;
-import org.apache.harmony.security.IdentityScopeStub;
+import org.apache.harmony.security.tests.support.IdentityScopeStub;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/IdentityTest.java Thu Jun 1 01:15:17 2006
@@ -23,9 +23,10 @@
-import org.apache.harmony.security.CertificateStub;
-import org.apache.harmony.security.IdentityStub;
-import org.apache.harmony.security.PublicKeyStub;
+import org.apache.harmony.security.tests.support.CertificateStub;
+import org.apache.harmony.security.tests.support.IdentityStub;
+import org.apache.harmony.security.tests.support.PublicKeyStub;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSBuilderTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSBuilderTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSBuilderTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSBuilderTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSBuilderTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSBuilderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSBuilderTest.java Thu Jun 1 01:15:17 2006
@@ -32,11 +32,11 @@
import java.util.Enumeration;
-import org.apache.harmony.security.SpiEngUtils;
import junit.framework.TestCase;
-import org.apache.harmony.security.support.TestKeyPair;
-import org.apache.harmony.security.support.TestUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.TestKeyPair;
+import org.apache.harmony.security.tests.support.TestUtils;
/**
* Tests for <code>KeyStore.Builder</code> class
@@ -553,7 +553,7 @@
}
public byte[] getEncoded() throws CertificateEncodingException {
- return (byte[]) encoding.clone();
+ return encoding.clone();
}
public void verify(PublicKey key) throws CertificateException,
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSPrivateKeyEntryTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSPrivateKeyEntryTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSPrivateKeyEntryTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSPrivateKeyEntryTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSPrivateKeyEntryTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSPrivateKeyEntryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSPrivateKeyEntryTest.java Thu Jun 1 01:15:17 2006
@@ -24,7 +24,8 @@
import java.security.cert.Certificate;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
import junit.framework.Test;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSTrustedCertificateEntryTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSTrustedCertificateEntryTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSTrustedCertificateEntryTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSTrustedCertificateEntryTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSTrustedCertificateEntryTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSTrustedCertificateEntryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KSTrustedCertificateEntryTest.java Thu Jun 1 01:15:17 2006
@@ -23,7 +23,8 @@
import java.security.cert.Certificate;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator1Test.java Thu Jun 1 01:15:17 2006
@@ -25,7 +25,10 @@
import java.math.BigInteger;
import java.security.spec.AlgorithmParameterSpec;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.MyKeyPairGenerator1;
+import org.apache.harmony.security.tests.support.MyKeyPairGenerator2;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator2Test.java Thu Jun 1 01:15:17 2006
@@ -23,7 +23,10 @@
import java.security.spec.AlgorithmParameterSpec;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.MyKeyPairGenerator1;
+import org.apache.harmony.security.tests.support.MyKeyPairGenerator2;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
@@ -35,10 +38,10 @@
public class KeyPairGenerator2Test extends TestCase {
private String KeyPairGeneratorProviderClass = "";
- private static final String KeyPairGeneratorProviderClass1 = "java.security.MyKeyPairGenerator1";
- private static final String KeyPairGeneratorProviderClass2 = "java.security.MyKeyPairGenerator2";
- private static final String KeyPairGeneratorProviderClass3 = "java.security.MyKeyPairGenerator3";
- private static final String KeyPairGeneratorProviderClass4 = "java.security.MyKeyPairGeneratorSpi";
+ private static final String KeyPairGeneratorProviderClass1 = "org.apache.harmony.security.tests.support.MyKeyPairGenerator1";
+ private static final String KeyPairGeneratorProviderClass2 = "org.apache.harmony.security.tests.support.MyKeyPairGenerator2";
+ private static final String KeyPairGeneratorProviderClass3 = "org.apache.harmony.security.tests.support.MyKeyPairGenerator3";
+ private static final String KeyPairGeneratorProviderClass4 = "org.apache.harmony.security.tests.support.MyKeyPairGeneratorSpi";
private static final String defaultAlg = "KPGen";
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator3Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator3Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator3Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator3Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator3Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGenerator3Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGenerator3Test.java Thu Jun 1 01:15:17 2006
@@ -21,7 +21,8 @@
package java.security;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGeneratorSpiTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGeneratorSpiTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGeneratorSpiTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyPairGeneratorSpiTest.java Thu Jun 1 01:15:17 2006
@@ -24,6 +24,8 @@
import java.security.spec.AlgorithmParameterSpec;
+import org.apache.harmony.security.tests.support.MyKeyPairGeneratorSpi;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore1Test.java Thu Jun 1 01:15:17 2006
@@ -31,8 +31,10 @@
import javax.crypto.SecretKey;
import javax.security.auth.DestroyFailedException;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.support.TestKeyPair;
+import org.apache.harmony.security.tests.support.MyKeyStoreSpi;
+import org.apache.harmony.security.tests.support.MyLoadStoreParams;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.TestKeyPair;
import junit.framework.TestCase;
@@ -1090,13 +1092,13 @@
//make it compilable on 1.5
Class c = privKey.getClass();
assertFalse("Incorrect class entry 3",
- kss[i].entryInstanceOf(aliases[j], (Class<KeyStore.Entry>)c ));
+ kss[i].entryInstanceOf(aliases[j], c ));
}
//make it compilable on 1.5
Class c = privKey.getClass();
assertFalse("Incorrect class entry 4",
- kss[i].entryInstanceOf(aliasKE, (Class<KeyStore.Entry>)c ));
+ kss[i].entryInstanceOf(aliasKE, c ));
assertTrue("Incorrect class entry 5",
kss[i].entryInstanceOf(aliasKE, pKey.getClass()));
}
@@ -1204,7 +1206,7 @@
}
public byte[] getEncoded() throws CertificateEncodingException {
- return (byte[]) encoding.clone();
+ return encoding.clone();
}
public void verify(PublicKey key) throws CertificateException,
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore2Test.java Thu Jun 1 01:15:17 2006
@@ -31,8 +31,10 @@
import javax.crypto.spec.SecretKeySpec;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.MyLoadStoreParams;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
import java.util.Date;
@@ -45,7 +47,7 @@
public class KeyStore2Test extends TestCase {
- private static final String KeyStoreProviderClass = "java.security.MyKeyStoreSpi";
+ private static final String KeyStoreProviderClass = "org.apache.harmony.security.tests.support.MyKeyStoreSpi";
private static final String defaultAlg = "KeyStore";
@@ -179,7 +181,7 @@
//make it compilable on 1.5
Class c = alias.getClass();
assertFalse("Incorrect result of entryInstanceOf", keyS
- .entryInstanceOf(alias, (Class<KeyStore.Entry>)c));
+ .entryInstanceOf(alias, c));
}
private void checkKeyStoreException(KeyStore keyS)
@@ -206,7 +208,7 @@
try {
//make it compilable on 1.5
Class c = alias.getClass();
- keyS.entryInstanceOf(alias, (Class<KeyStore.Entry>)c);
+ keyS.entryInstanceOf(alias, c);
fail(eMsg);
} catch (KeyStoreException e) {
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore3Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore3Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore3Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore3Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore3Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStore3Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStore3Test.java Thu Jun 1 01:15:17 2006
@@ -27,10 +27,10 @@
import java.security.Provider;
import java.security.Security;
import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.spec.InvalidKeySpecException;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.MyLoadStoreParams;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
@@ -55,21 +55,16 @@
Provider mProv;
- public KeyStore[] createKS() {
+ public KeyStore[] createKS() throws Exception {
if (!KSSupported) {
fail(NotSupportMsg);
- return null;
}
KeyStore[] kpg = new KeyStore[3];
- try {
- kpg[0] = KeyStore.getInstance(defaultType);
- kpg[1] = KeyStore.getInstance(defaultType, defaultProvider);
- kpg[2] = KeyStore.getInstance(defaultType, defaultProviderName);
- return kpg;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
+
+ kpg[0] = KeyStore.getInstance(defaultType);
+ kpg[1] = KeyStore.getInstance(defaultType, defaultProvider);
+ kpg[2] = KeyStore.getInstance(defaultType, defaultProviderName);
+ return kpg;
}
protected void setUp() throws Exception {
@@ -111,23 +106,22 @@
* password is null;
* getCreationDate(...) throws NullPointerException when alias is null;
* stores KeyStore and then loads it;
+ * @throws Exception
*/
- public void testLoadStore01() throws NoSuchAlgorithmException, IOException,
- CertificateException, KeyStoreException, InvalidKeySpecException,
- UnrecoverableEntryException, UnrecoverableKeyException {
+ public void testLoadStore01() throws Exception {
if (!KSSupported) {
fail(NotSupportMsg);
- return;
}
+
String tType = "TestType";
KeyStore1Test keyStoreT1 = new KeyStore1Test("proba");
KeyStore.TrustedCertificateEntry tCert = new KeyStore.TrustedCertificateEntry(
keyStoreT1.new MCertificate("type", new byte[0]));
Certificate certs[] = {
- (Certificate) keyStoreT1.new MCertificate(tType, new byte[10]),
- (Certificate) keyStoreT1.new MCertificate(tType, new byte[20]) };
+ keyStoreT1.new MCertificate(tType, new byte[10]),
+ keyStoreT1.new MCertificate(tType, new byte[20]) };
PrivateKey pk = keyStoreT1.new MyPrivateKey(tType, "", new byte[10]);
KeyStore.PrivateKeyEntry pKey = new KeyStore.PrivateKeyEntry(pk, certs);
char[] pwd = { 'p', 'a', 's', 's', 'w', 'd' };
@@ -226,12 +220,11 @@
* methods
* Assertions: throw IllegalArgumentException if param is null;
*/
- public void testLoadStore02() throws NoSuchAlgorithmException, IOException,
- CertificateException, KeyStoreException {
+ public void testLoadStore02() throws Exception {
if (!KSSupported) {
fail(NotSupportMsg);
- return;
}
+
KeyStore[] kss = createKS();
assertNotNull("KeyStore objects were not created", kss);
@@ -265,12 +258,11 @@
* method
* Assertion: stores KeyEntry.
*/
- public void testSetKeyEntry() throws NoSuchAlgorithmException, IOException,
- CertificateException, KeyStoreException, UnrecoverableKeyException {
+ public void testSetKeyEntry() throws Exception {
if (!KSSupported) {
fail(NotSupportMsg);
- return;
}
+
KeyStore[] kss = createKS();
assertNotNull("KeyStore objects were not created", kss);
byte[] kk = { (byte) 1, (byte) 2, (byte) 127, (byte) 77 };
@@ -279,8 +271,8 @@
byte[] res;
KeyStore1Test keyStoreT1 = new KeyStore1Test("proba");
Certificate certs[] = {
- (Certificate) keyStoreT1.new MCertificate(alias, kk),
- (Certificate) keyStoreT1.new MCertificate(alias, kk) };
+ keyStoreT1.new MCertificate(alias, kk),
+ keyStoreT1.new MCertificate(alias, kk) };
for (int i = 0; i < kss.length; i++) {
kss[i].load(null, null);
try {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStoreSpiTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStoreSpiTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStoreSpiTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStoreSpiTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStoreSpiTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStoreSpiTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/KeyStoreSpiTest.java Thu Jun 1 01:15:17 2006
@@ -26,7 +26,9 @@
import java.security.cert.CertificateException;
import java.util.Date;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.MyKeyStoreSpi;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest1Test.java Thu Jun 1 01:15:17 2006
@@ -21,6 +21,8 @@
package java.security;
+import org.apache.harmony.security.tests.support.MyMessageDigest1;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigest2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MessageDigest2Test.java Thu Jun 1 01:15:17 2006
@@ -21,6 +21,9 @@
package java.security;
+import org.apache.harmony.security.tests.support.MyMessageDigest1;
+import org.apache.harmony.security.tests.support.MyMessageDigest2;
+
import junit.framework.TestCase;
/**
@@ -229,8 +232,8 @@
private class MyProvider extends Provider {
MyProvider() {
super("MyProvider", 1.0, "Provider for testing");
- put("MessageDigest.ABC", "java.security.MyMessageDigest1");
- put("MessageDigest.CBA", "java.security.MyMessageDigest2");
+ put("MessageDigest.ABC", "org.apache.harmony.security.tests.support.MyMessageDigest1");
+ put("MessageDigest.CBA", "org.apache.harmony.security.tests.support.MyMessageDigest2");
}
MyProvider(String name, double version, String info) {
Added: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MyKeyStore.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MyKeyStore.java?rev=410788&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MyKeyStore.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/MyKeyStore.java Thu Jun 1 01:15:17 2006
@@ -0,0 +1,239 @@
+/*
+ * 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 java.security;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.KeyStoreSpi;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.apache.harmony.security.tests.support.MyLoadStoreParams;
+
+/**
+ * Additional class for KeyStoreSpi and KeyStore verification
+ *
+ */
+
+public class MyKeyStore extends KeyStoreSpi {
+ private Hashtable Keys = new Hashtable();
+
+ private Hashtable Cert = new Hashtable();
+
+ private Hashtable Chain = new Hashtable();
+
+ private Hashtable Dates = new Hashtable();
+
+ private Hashtable KeysSL = new Hashtable();
+
+ private Hashtable CertSL = new Hashtable();
+
+ private Hashtable ChainSL = new Hashtable();
+
+ private Hashtable DatesSL = new Hashtable();
+
+ public Key engineGetKey(String alias, char[] password)
+ throws NoSuchAlgorithmException, UnrecoverableKeyException {
+ if (Keys.containsKey(alias)) {
+ return (Key) Keys.get(alias);
+ }
+ return null;
+ }
+
+ public Certificate[] engineGetCertificateChain(String alias) {
+ if (Chain.containsKey(alias)) {
+ return (Certificate[]) Chain.get(alias);
+ }
+ return null;
+ }
+
+ public Certificate engineGetCertificate(String alias) {
+ if (Cert.containsKey(alias)) {
+ return (Certificate) Cert.get(alias);
+ }
+ return null;
+ }
+
+ public Date engineGetCreationDate(String alias) {
+ if (Dates.containsKey(alias)) {
+ return (Date) Dates.get(alias);
+ }
+ return null;
+ }
+
+ public void engineSetKeyEntry(String alias, Key key, char[] password,
+ Certificate[] chain) throws KeyStoreException {
+ if (Cert.containsKey(alias)) {
+ Cert.remove(alias);
+ }
+ Keys.put(alias, key);
+ if (chain != null) {
+ Chain.put(alias, chain);
+ }
+ Dates.put(alias, new Date());
+ }
+
+ public void engineSetKeyEntry(String alias, byte[] key, Certificate[] chain)
+ throws KeyStoreException {
+ if (key == null) {
+ throw new KeyStoreException("Not Supported for null key");
+ }
+ if (Cert.containsKey(alias)) {
+ Cert.remove(alias);
+ }
+ if (Chain.containsKey(alias)) {
+ Chain.remove(alias);
+ }
+ KeyStore1Test.MyPrivateKey keyK = new KeyStore1Test("proba").new MyPrivateKey(
+ alias, alias, key);
+ Keys.put(alias, keyK);
+ if (chain != null) {
+ Chain.put(alias, chain);
+ }
+ Dates.put(alias, new Date());
+
+ }
+
+ public void engineSetCertificateEntry(String alias, Certificate cert)
+ throws KeyStoreException {
+ Cert.put(alias, cert);
+ Dates.put(alias, new Date());
+ }
+
+ public void engineDeleteEntry(String alias) throws KeyStoreException {
+ if (Keys.containsKey(alias)) {
+ Keys.remove(alias);
+ Chain.remove(alias);
+ return;
+ }
+ if (Cert.containsKey(alias)) {
+ Cert.remove(alias);
+ }
+ }
+
+ public Enumeration engineAliases() {
+ return null;
+ }
+
+ public boolean engineContainsAlias(String alias) {
+ if (Keys.containsKey(alias)) {
+ return true;
+ }
+ if (Cert.containsKey(alias)) {
+ return true;
+ }
+ return false;
+ }
+
+ public int engineSize() {
+ return (Keys.size() + Cert.size());
+ }
+
+ public boolean engineIsKeyEntry(String alias) {
+ if (Keys.containsKey(alias)) {
+ return true;
+ }
+ return false;
+ }
+
+ public boolean engineIsCertificateEntry(String alias) {
+ if (Cert.containsKey(alias)) {
+ return true;
+ }
+ return false;
+ }
+
+ public String engineGetCertificateAlias(Certificate cert) {
+ return "";
+ }
+
+ public void engineStore(OutputStream stream, char[] password)
+ throws IOException, NoSuchAlgorithmException, CertificateException {
+ if (!(stream instanceof ByteArrayOutputStream)) {
+ throw new IOException("Incorrect stream");
+ }
+ String alias;
+ Enumeration e = Keys.keys();
+ while (e.hasMoreElements()) {
+ alias = (String) e.nextElement();
+ KeysSL.put(alias, Keys.get(alias));
+ DatesSL.put(alias, Dates.get(alias));
+ if (Chain.containsKey(alias)) {
+ ChainSL.put(alias, Chain.get(alias));
+ }
+ }
+ e = Cert.keys();
+ while (e.hasMoreElements()) {
+ alias = (String) e.nextElement();
+ CertSL.put(alias, Cert.get(alias));
+ DatesSL.put(alias, Dates.get(alias));
+ }
+ }
+
+ public void engineLoad(InputStream stream, char[] password)
+ throws IOException, NoSuchAlgorithmException, CertificateException {
+ Keys.clear();
+ Cert.clear();
+ Chain.clear();
+ Dates.clear();
+ String alias;
+ Enumeration e = KeysSL.keys();
+ while (e.hasMoreElements()) {
+ alias = (String) e.nextElement();
+ Keys.put(alias, KeysSL.get(alias));
+ Dates.put(alias, DatesSL.get(alias));
+ if (ChainSL.containsKey(alias)) {
+ Chain.put(alias, ChainSL.get(alias));
+ }
+ }
+ e = CertSL.keys();
+ while (e.hasMoreElements()) {
+ alias = (String) e.nextElement();
+ Cert.put(alias, CertSL.get(alias));
+ Dates.put(alias, DatesSL.get(alias));
+ }
+ }
+
+ public void engineStore(KeyStore.LoadStoreParameter param)
+ throws IOException, NoSuchAlgorithmException, CertificateException {
+ if (param == null) {
+ throw new IOException("param is null");
+ }
+ }
+
+ public void engineLoad(KeyStore.LoadStoreParameter param)
+ throws IOException, NoSuchAlgorithmException, CertificateException {
+ if (!(param instanceof MyLoadStoreParams)) {
+ throw new IllegalArgumentException("param is not MyLoadStoreParams: " + param);
+ }
+ }
+}
\ No newline at end of file
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/PolicyTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/PolicyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/PolicyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/PolicyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/PolicyTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/PolicyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/PolicyTest.java Thu Jun 1 01:15:17 2006
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
-import org.apache.harmony.security.support.SecurityChecker;
+import org.apache.harmony.security.tests.support.SecurityChecker;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature1Test.java Thu Jun 1 01:15:17 2006
@@ -21,6 +21,8 @@
package java.security;
+import org.apache.harmony.security.tests.support.MySignature1;
+
import junit.framework.TestCase;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/Signature2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/Signature2Test.java Thu Jun 1 01:15:17 2006
@@ -21,6 +21,9 @@
package java.security;
+import org.apache.harmony.security.tests.support.MySignature1;
+import org.apache.harmony.security.tests.support.MySignature2;
+
import junit.framework.TestCase;
/**
@@ -346,8 +349,8 @@
private class MyProvider extends Provider {
MyProvider() {
super("MyProvider", 1.0, "Provider for testing");
- put("Signature.ABC", "java.security.MySignature1");
- put("Signature.CBA", "java.security.MySignature2");
+ put("Signature.ABC", "org.apache.harmony.security.tests.support.MySignature1");
+ put("Signature.CBA", "org.apache.harmony.security.tests.support.MySignature2");
}
MyProvider(String name, double version, String info) {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignedObjectTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignedObjectTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignedObjectTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignedObjectTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignedObjectTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignedObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignedObjectTest.java Thu Jun 1 01:15:17 2006
@@ -25,7 +25,7 @@
import java.security.spec.InvalidKeySpecException;
import java.util.Properties;
-import org.apache.harmony.security.support.TestKeyPair;
+import org.apache.harmony.security.tests.support.TestKeyPair;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignerTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignerTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignerTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/SignerTest.java Thu Jun 1 01:15:17 2006
@@ -21,7 +21,10 @@
package java.security;
-import org.apache.harmony.security.*;
+import org.apache.harmony.security.tests.support.PrivateKeyStub;
+import org.apache.harmony.security.tests.support.PublicKeyStub;
+import org.apache.harmony.security.tests.support.SignerStub;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/TimestampTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/TimestampTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/TimestampTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/TimestampTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/TimestampTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/TimestampTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/TimestampTest.java Thu Jun 1 01:15:17 2006
@@ -24,7 +24,8 @@
import java.security.cert.CertPath;
import java.util.Date;
-import org.apache.harmony.security.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CRLTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CRLTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CRLTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CRLTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CRLTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CRLTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CRLTest.java Thu Jun 1 01:15:17 2006
@@ -21,7 +21,8 @@
package java.security.cert;
-import org.apache.harmony.security.cert.MyCRL;
+import org.apache.harmony.security.tests.support.cert.MyCRL;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder1Test.java Thu Jun 1 01:15:17 2006
@@ -27,7 +27,8 @@
import java.security.Provider;
import java.security.Security;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathBuilder2Test.java Thu Jun 1 01:15:17 2006
@@ -27,7 +27,8 @@
import java.security.Provider;
import java.security.Security;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathTest.java Thu Jun 1 01:15:17 2006
@@ -21,7 +21,8 @@
package java.security.cert;
-import org.apache.harmony.security.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator1Test.java Thu Jun 1 01:15:17 2006
@@ -27,8 +27,9 @@
import java.security.Provider;
import java.security.Security;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator2Test.java Thu Jun 1 01:15:17 2006
@@ -27,7 +27,8 @@
import java.security.Provider;
import java.security.Security;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator3Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator3Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator3Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator3Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator3Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator3Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertPathValidator3Test.java Thu Jun 1 01:15:17 2006
@@ -27,9 +27,9 @@
import java.security.NoSuchProviderException;
import java.security.Provider;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.cert.MyCertPath;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore1Test.java Thu Jun 1 01:15:17 2006
@@ -28,7 +28,8 @@
import java.security.Security;
import java.util.Collection;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertStore2Test.java Thu Jun 1 01:15:17 2006
@@ -28,7 +28,8 @@
import java.security.Security;
import java.util.Collection;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory1Test.java Thu Jun 1 01:15:17 2006
@@ -33,9 +33,10 @@
import java.util.List;
import java.util.Vector;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.cert.MyCertPath;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory2Test.java Thu Jun 1 01:15:17 2006
@@ -30,7 +30,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory3Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory3Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory3Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory3Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory3Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory3Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateFactory3Test.java Thu Jun 1 01:15:17 2006
@@ -32,10 +32,10 @@
import java.util.List;
import java.util.Vector;
-import org.apache.harmony.security.SpiEngUtils;
import junit.framework.TestCase;
-import org.apache.harmony.security.support.TestUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.TestUtils;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CertificateTest.java Thu Jun 1 01:15:17 2006
@@ -26,7 +26,8 @@
import java.security.NoSuchProviderException;
import java.security.SignatureException;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CollectionCertStoreParametersTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CollectionCertStoreParametersTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CollectionCertStoreParametersTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CollectionCertStoreParametersTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CollectionCertStoreParametersTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CollectionCertStoreParametersTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/CollectionCertStoreParametersTest.java Thu Jun 1 01:15:17 2006
@@ -24,7 +24,8 @@
import java.util.Collection;
import java.util.Vector;
-import org.apache.harmony.security.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXBuilderParametersTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXBuilderParametersTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXBuilderParametersTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXBuilderParametersTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXBuilderParametersTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXBuilderParametersTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXBuilderParametersTest.java Thu Jun 1 01:15:17 2006
@@ -28,7 +28,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathBuilderResultTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathBuilderResultTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathBuilderResultTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathBuilderResultTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathBuilderResultTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathBuilderResultTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathBuilderResultTest.java Thu Jun 1 01:15:17 2006
@@ -25,8 +25,8 @@
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
-import org.apache.harmony.security.cert.MyCertPath;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathCheckerTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathCheckerTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathCheckerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathCheckerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathCheckerTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathCheckerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathCheckerTest.java Thu Jun 1 01:15:17 2006
@@ -23,8 +23,8 @@
import java.util.HashSet;
-import org.apache.harmony.security.cert.MyCertificate;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.cert.MyCertificate;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathValidatorResultTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathValidatorResultTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathValidatorResultTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathValidatorResultTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathValidatorResultTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXCertPathValidatorResultTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXCertPathValidatorResultTest.java Thu Jun 1 01:15:17 2006
@@ -25,7 +25,7 @@
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXParametersTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXParametersTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXParametersTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXParametersTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXParametersTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PKIXParametersTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PKIXParametersTest.java Thu Jun 1 01:15:17 2006
@@ -32,7 +32,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
@@ -778,15 +778,13 @@
assertTrue("addedOk", l.add(cpc));
p.setCertPathCheckers(l);
// retrieve checker and modify it
- PKIXCertPathChecker cpc1 =
- (PKIXCertPathChecker)p.getCertPathCheckers().get(0);
+ PKIXCertPathChecker cpc1 = p.getCertPathCheckers().get(0);
cpc1.init(true);
assertTrue("modifiedOk", cpc1.isForwardCheckingSupported());
// retrieve checker again and check
// that its state has not been changed
// by the above modification
- PKIXCertPathChecker cpc2 =
- (PKIXCertPathChecker)p.getCertPathCheckers().get(0);
+ PKIXCertPathChecker cpc2 = p.getCertPathCheckers().get(0);
assertFalse("isCloned", cpc2.isForwardCheckingSupported());
}
@@ -887,8 +885,7 @@
// retrieve list and check that CertPathChecker's
// state it contains has not been changed by the
// above modification
- PKIXCertPathChecker cpc1 =
- (PKIXCertPathChecker)p.getCertPathCheckers().get(0);
+ PKIXCertPathChecker cpc1 = p.getCertPathCheckers().get(0);
assertFalse("isCopied", cpc1.isForwardCheckingSupported());
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PolicyQualifierInfoTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PolicyQualifierInfoTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PolicyQualifierInfoTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PolicyQualifierInfoTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PolicyQualifierInfoTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/PolicyQualifierInfoTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/PolicyQualifierInfoTest.java Thu Jun 1 01:15:17 2006
@@ -129,7 +129,7 @@
public final void testPolicyQualifierInfo04() throws IOException {
// get valid encoding
byte[] encoding = getDerEncoding();
- byte[] encodingCopy = (byte[])encoding.clone();
+ byte[] encodingCopy = encoding.clone();
// pass valid array
PolicyQualifierInfo i = new PolicyQualifierInfo(encodingCopy);
// get encoding
@@ -172,7 +172,7 @@
public final void testGetEncoded02() throws IOException {
// get valid encoding
byte[] encoding = getDerEncoding();
- byte[] encodingCopy = (byte[])encoding.clone();
+ byte[] encodingCopy = encoding.clone();
// pass valid array
PolicyQualifierInfo i = new PolicyQualifierInfo(encodingCopy);
// get encoding
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/TrustAnchorTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/TrustAnchorTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/TrustAnchorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.java Thu Jun 1 01:15:17 2006
@@ -29,8 +29,8 @@
import javax.security.auth.x500.X500Principal;
-import org.apache.harmony.security.support.TestKeyPair;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.TestKeyPair;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.TestCase;
@@ -123,7 +123,7 @@
String certAlias = "testca1";
byte[] nc = getEncodingPSOnly();
- byte[] ncCopy = (byte[])nc.clone();
+ byte[] ncCopy = nc.clone();
// sub testcase 5 - nameConstraints can be null
TrustAnchor ta = new TrustAnchor(
(X509Certificate)ks.getCertificate(certAlias),
@@ -446,7 +446,7 @@
PublicKey pk = new TestKeyPair(keyAlg).getPublic();
byte[] nc = getEncodingPSOnly();
- byte[] ncCopy = (byte[])nc.clone();
+ byte[] ncCopy = nc.clone();
// sub testcase 5 - nameConstraints can be null
TrustAnchor ta = new TrustAnchor(validCaNameRfc2253, pk, ncCopy);
// modify
@@ -557,7 +557,7 @@
PublicKey pk = new TestKeyPair(keyAlg).getPublic();
byte[] nc = getEncodingPSOnly();
- byte[] ncCopy = (byte[])nc.clone();
+ byte[] ncCopy = nc.clone();
// sub testcase 5 - nameConstraints can be null
TrustAnchor ta = new TrustAnchor(new X500Principal(validCaNameRfc2253),
pk, ncCopy);
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/X509CRLTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/X509CRLTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/X509CRLTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.java Thu Jun 1 01:15:17 2006
@@ -35,7 +35,7 @@
import javax.security.auth.x500.X500Principal;
-import org.apache.harmony.security.support.cert.TestUtils;
+import org.apache.harmony.security.tests.support.cert.TestUtils;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CRLExceptionTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CRLExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CRLExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CRLExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CRLExceptionTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CRLExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CRLExceptionTest.java Thu Jun 1 01:15:17 2006
@@ -23,7 +23,7 @@
import java.security.cert.CRLException;
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathBuilderExceptionTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathBuilderExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathBuilderExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathBuilderExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathBuilderExceptionTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathBuilderExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathBuilderExceptionTest.java Thu Jun 1 01:15:17 2006
@@ -23,7 +23,7 @@
import java.security.cert.CertPathBuilderException;
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathTest.java Thu Jun 1 01:15:17 2006
@@ -35,7 +35,7 @@
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
-import org.apache.harmony.security.cert.MyCertPath;
+import org.apache.harmony.security.tests.support.cert.MyCertPath;
import junit.framework.TestCase;
@@ -58,7 +58,7 @@
* Input file name used for <code>CertPath</code> instance generation
*/
private static final String certPathFileName =
- org.apache.harmony.security.support.TestUtils.TEST_ROOT +
+ org.apache.harmony.security.tests.support.TestUtils.TEST_ROOT +
"java/security/cert/serialization/CertPath." +
certPathEncoding;
/**