Index: modules/crypto/src/main/java/javax/crypto/CipherInputStream.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/CipherInputStream.java.orig 2006-03-30 13:10:07.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/CipherInputStream.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,7 +24,6 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import javax.crypto.NullCipher; /** * @com.intel.drl.spec_ref Index: modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java.orig 2006-03-30 13:10:07.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,7 +24,6 @@ import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; -import javax.crypto.NullCipher; /** * @com.intel.drl.spec_ref Index: modules/crypto/src/main/java/javax/crypto/CipherSpi.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/CipherSpi.java.orig 2006-03-30 13:10:07.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/CipherSpi.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,6 +21,7 @@ package javax.crypto; +import java.nio.ByteBuffer; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -28,7 +29,6 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.spec.AlgorithmParameterSpec; -import java.nio.ByteBuffer; /** * @com.intel.drl.spec_ref Index: modules/crypto/src/main/java/javax/crypto/MacSpi.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/MacSpi.java.orig 2006-03-30 13:10:07.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/MacSpi.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,11 +21,11 @@ package javax.crypto; -import java.security.Key; -import java.security.InvalidKeyException; +import java.nio.ByteBuffer; import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.Key; import java.security.spec.AlgorithmParameterSpec; -import java.nio.ByteBuffer; /** * @com.intel.drl.spec_ref Index: modules/crypto/src/main/java/javax/crypto/SealedObject.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/SealedObject.java.orig 2006-03-30 13:10:07.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/SealedObject.java 2006-03-30 19:19:33.000000000 +0100 @@ -33,8 +33,6 @@ import java.security.Key; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; /** * @com.intel.drl.spec_ref Index: modules/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java.orig 2006-03-30 13:10:06.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,9 +21,8 @@ package javax.crypto.spec; -import java.security.spec.MGF1ParameterSpec; import java.security.spec.AlgorithmParameterSpec; -import javax.crypto.spec.PSource; +import java.security.spec.MGF1ParameterSpec; /** * @com.intel.drl.spec_ref Index: modules/crypto/src/main/java/javax/crypto/spec/PSource.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/spec/PSource.java.orig 2006-03-30 13:10:06.000000000 +0100 +++ modules/crypto/src/main/java/javax/crypto/spec/PSource.java 2006-03-30 19:19:33.000000000 +0100 @@ -28,7 +28,7 @@ private String pSrcName; - private PSource() {}; + private PSource() {} /** * @com.intel.drl.spec_ref Index: modules/crypto/src/test/java/javax/crypto/BadPaddingExceptionTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/BadPaddingExceptionTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/BadPaddingExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not BadPaddingException"; - static String createErr(Exception tE, Exception eE) { return "BadPaddingException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/crypto/src/test/java/javax/crypto/CipherInputStreamTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/CipherInputStreamTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/CipherInputStreamTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -48,7 +48,7 @@ public boolean wasClosed() { return closed; } - }; + } /** * CipherInputStream(InputStream is) method testing. Tests that Index: modules/crypto/src/test/java/javax/crypto/CipherOutputStreamTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/CipherOutputStreamTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/CipherOutputStreamTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -45,7 +45,7 @@ public boolean wasClosed() { return closed; } - }; + } /** * CipherOutputStream(OutputStream os) method testing. Tests that Index: modules/crypto/src/test/java/javax/crypto/CipherSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/CipherSpiTests.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/CipherSpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -56,8 +56,7 @@ public void testCipherSpiTests01() throws IllegalBlockSizeException, BadPaddingException, ShortBufferException { - CipherSpi cSpi = (CipherSpi) new myCipherSpi(); - assertTrue("Not cipherSpi object", cSpi instanceof CipherSpi); + CipherSpi cSpi = new myCipherSpi(); assertEquals("BlockSize is not 0", cSpi.engineGetBlockSize(), 0); assertEquals("OutputSize is not 0", cSpi.engineGetOutputSize(1), 0); byte[] bb = cSpi.engineGetIV(); @@ -84,8 +83,7 @@ * Assertion: It throws UnsupportedOperationException if it is not overriden */ public void testCipherSpi02() { - CipherSpi cSpi = (CipherSpi) new myCipherSpi(); - assertTrue(cSpi instanceof CipherSpi); + CipherSpi cSpi = new myCipherSpi(); try { cSpi.engineGetKeySize(null); assertTrue("UnsupportedOperationException must be thrown", false); @@ -102,8 +100,7 @@ * Assertion: It throws UnsupportedOperationException if it is not overriden */ public void testCipherSpi03() { - CipherSpi cSpi = (CipherSpi) new myCipherSpi(); - assertTrue(cSpi instanceof CipherSpi); + CipherSpi cSpi = new myCipherSpi(); try { cSpi.engineWrap(null); assertTrue("UnsupportedOperationException must be thrown", false); @@ -120,8 +117,7 @@ * Assertion: It throws UnsupportedOperationException if it is not overriden */ public void testCipherSpi04() { - CipherSpi cSpi = (CipherSpi) new myCipherSpi(); - assertTrue(cSpi instanceof CipherSpi); + CipherSpi cSpi = new myCipherSpi(); try { cSpi.engineUnwrap(new byte[0], "", 0); assertTrue("UnsupportedOperationException must be thrown", false); @@ -140,8 +136,7 @@ * throws ShortBufferException is there is no space in output to hold result */ public void testCipherSpi05() throws ShortBufferException { - CipherSpi cSpi = (CipherSpi) new myCipherSpi(); - assertTrue(cSpi instanceof CipherSpi); + CipherSpi cSpi = new myCipherSpi(); byte[] bb = { (byte) 0, (byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, (byte) 6, (byte) 7, (byte) 8, (byte) 9, (byte) 10 }; int pos = 5; @@ -194,8 +189,7 @@ */ public void testCipherSpi06() throws BadPaddingException, ShortBufferException, IllegalBlockSizeException { - CipherSpi cSpi = (CipherSpi) new myCipherSpi(); - assertTrue(cSpi instanceof CipherSpi); + CipherSpi cSpi = new myCipherSpi(); int len = 10; byte[] bbuf = new byte[len]; for (int i = 0; i < bbuf.length; i++) { @@ -241,8 +235,6 @@ */ class myCipherSpi extends CipherSpi { - private String cipherMode; - private byte[] initV; private static byte[] resV = { (byte) 7, (byte) 6, (byte) 5, (byte) 4, @@ -253,7 +245,6 @@ } protected void engineSetMode(String mode) throws NoSuchAlgorithmException { - this.cipherMode = mode; } protected void engineSetPadding(String padding) Index: modules/crypto/src/test/java/javax/crypto/CipherTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/CipherTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/CipherTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,17 +24,13 @@ import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.Provider; -import java.security.SecureRandom; import java.security.Security; import java.security.spec.InvalidKeySpecException; -import java.util.Date; -import java.util.Enumeration; - -import org.apache.harmony.security.TestKeyPair; - import junit.framework.TestCase; +import org.apache.harmony.security.TestKeyPair; + /** * Tests for Cipher class constructors and methods. * Index: modules/crypto/src/test/java/javax/crypto/ExemptionMechanismExceptionTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/ExemptionMechanismExceptionTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/ExemptionMechanismExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not ExemptionMechanismException"; - static String createErr(Exception tE, Exception eE) { return "ExemptionMechanismException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/crypto/src/test/java/javax/crypto/ExemptionMechanismSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/ExemptionMechanismSpiTests.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/ExemptionMechanismSpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -54,9 +54,8 @@ throws ExemptionMechanismException, ShortBufferException, InvalidKeyException, InvalidAlgorithmParameterException { - ExemptionMechanismSpi emSpi = (ExemptionMechanismSpi) new MyExemptionMechanismSpi(); + ExemptionMechanismSpi emSpi = new MyExemptionMechanismSpi(); int len = MyExemptionMechanismSpi.getLength(); - assertTrue("Not ExemptionMechanismSpi object", emSpi instanceof ExemptionMechanismSpi); byte [] bbRes = emSpi.engineGenExemptionBlob(); assertEquals("Incorrect length", bbRes.length, len); assertEquals("Incorrect result", Index: modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java 2006-03-30 19:19:33.000000000 +0100 @@ -30,7 +30,6 @@ import java.security.Provider; import java.security.Security; import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.KeySpec; import javax.crypto.spec.SecretKeySpec; @@ -191,8 +190,6 @@ ExemptionMechanism exMech; for (int i = 0; i < validValues.length; i++) { exMech = ExemptionMechanism.getInstance(validValues[i]); - assertTrue("Not instanceof ExemptionMechanism object", - exMech instanceof ExemptionMechanism); assertEquals("Incorrect algorithm", exMech.getName(), validValues[i]); assertEquals("Incorrect provider", exMech.getProvider(), mProv); @@ -254,8 +251,6 @@ for (int i = 0; i < validValues.length; i++) { exMech = ExemptionMechanism.getInstance(validValues[i], mProv .getName()); - assertTrue("Not instanceof ExemptionMechanism object", - exMech instanceof ExemptionMechanism); assertEquals("Incorrect algorithm", exMech.getName(), validValues[i]); assertEquals("Incorrect provider", exMech.getProvider().getName(), @@ -301,12 +296,8 @@ } } ExemptionMechanism exMech; - SecretKey sk; - KeySpec keySpec; for (int i = 0; i < validValues.length; i++) { exMech = ExemptionMechanism.getInstance(validValues[i], mProv); - assertTrue("Not instanceof ExemptionMechanism object", - exMech instanceof ExemptionMechanism); assertEquals("Incorrect algorithm", exMech.getName(), validValues[i]); assertEquals("Incorrect provider", exMech.getProvider(), mProv); @@ -323,7 +314,6 @@ ExemptionMechanismSpi spi = new MyExemptionMechanismSpi(); ExemptionMechanism em = new myEM(spi, mProv, defaultAlg); - assertTrue("Not ExemptionMechanism object", em instanceof ExemptionMechanism); assertEquals("Incorrect provider", em.getProvider(), mProv); assertEquals("Incorrect algorithm", em.getName(), defaultAlg); try { @@ -337,7 +327,6 @@ } catch (IllegalStateException e) { } em = new myEM(null, null, null); - assertTrue("Not ExemptionMechanism object", em instanceof ExemptionMechanism); assertNull("Incorrect mechanism", em.getName()); assertNull("Incorrect provider", em.getProvider()); try { Index: modules/crypto/src/test/java/javax/crypto/IllegalBlockSizeExceptionTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/IllegalBlockSizeExceptionTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/IllegalBlockSizeExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not IllegalBlockSizeException"; - static String createErr(Exception tE, Exception eE) { return "IllegalBlockSizeException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/crypto/src/test/java/javax/crypto/KeyAgreementSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyAgreementSpiTests.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/KeyAgreementSpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -52,9 +52,7 @@ public void testKeyAgreementSpi01() throws InvalidKeyException, ShortBufferException, NoSuchAlgorithmException, InvalidAlgorithmParameterException { - KeyAgreementSpi kaSpi = (KeyAgreementSpi) new MyKeyAgreementSpi(); - assertTrue("Not KeyAgreementSpi object", - kaSpi instanceof KeyAgreementSpi); + KeyAgreementSpi kaSpi = new MyKeyAgreementSpi(); assertNull("Not null result", kaSpi.engineDoPhase(null, true)); try { Index: modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java 2006-03-30 19:19:33.000000000 +0100 @@ -31,7 +31,6 @@ import java.security.Security; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.InvalidKeySpecException; -import java.security.spec.KeySpec; import org.apache.harmony.security.SpiEngUtils; import junit.framework.TestCase; @@ -259,8 +258,6 @@ } } KeyAgreement keyAgr; - SecretKey sk; - KeySpec keySpec; for (int i = 0; i < validValues.length; i++) { keyAgr = KeyAgreement.getInstance(validValues[i], mProv); assertEquals("Incorrect algorithm", keyAgr.getAlgorithm(), Index: modules/crypto/src/test/java/javax/crypto/KeyGeneratorSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyGeneratorSpiTests.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/KeyGeneratorSpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -51,9 +51,7 @@ * KeyGeneratorSpi */ public void testKeyGeneratorSpi01() throws InvalidAlgorithmParameterException { - KeyGeneratorSpi kgSpi = (KeyGeneratorSpi) new MyKeyGeneratorSpi(); - assertTrue("Not KeyGeneratorSpi object", - kgSpi instanceof KeyGeneratorSpi); + KeyGeneratorSpi kgSpi = new MyKeyGeneratorSpi(); assertNull("Not null result", kgSpi.engineGenerateKey()); try { kgSpi.engineInit(77, new SecureRandom()); Index: modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/KeyGeneratorTest2.java 2006-03-30 19:19:33.000000000 +0100 @@ -30,7 +30,6 @@ import java.security.Security; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.InvalidKeySpecException; -import java.security.spec.KeySpec; import org.apache.harmony.security.SpiEngUtils; import junit.framework.TestCase; @@ -262,8 +261,6 @@ } } KeyGenerator keyGen; - SecretKey sk; - KeySpec keySpec; for (int i = 0; i < validValues.length; i++) { keyGen = KeyGenerator.getInstance(validValues[i], mProv); assertEquals("Incorrect algorithm", keyGen.getAlgorithm(), Index: modules/crypto/src/test/java/javax/crypto/MacTest2.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/MacTest2.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/MacTest2.java 2006-03-30 19:19:33.000000000 +0100 @@ -29,7 +29,6 @@ import java.security.Provider; import java.security.Security; import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.KeySpec; import javax.crypto.spec.SecretKeySpec; @@ -154,8 +153,6 @@ Mac keyAgr; for (int i = 0; i < validValues.length; i++) { keyAgr = Mac.getInstance(validValues[i]); - assertTrue("Not instanceof Mac object", - keyAgr instanceof Mac); assertEquals("Incorrect algorithm", keyAgr.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", keyAgr.getProvider(), mProv); @@ -216,8 +213,6 @@ for (int i = 0; i < validValues.length; i++) { keyAgr = Mac.getInstance(validValues[i], mProv .getName()); - assertTrue("Not instanceof Mac object", - keyAgr instanceof Mac); assertEquals("Incorrect algorithm", keyAgr.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", keyAgr.getProvider().getName(), @@ -263,12 +258,8 @@ } } Mac keyAgr; - SecretKey sk; - KeySpec keySpec; for (int i = 0; i < validValues.length; i++) { keyAgr = Mac.getInstance(validValues[i], mProv); - assertTrue("Not instanceof Mac object", - keyAgr instanceof Mac); assertEquals("Incorrect algorithm", keyAgr.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", keyAgr.getProvider(), mProv); Index: modules/crypto/src/test/java/javax/crypto/MyExemptionMechanismSpi.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/MyExemptionMechanismSpi.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/MyExemptionMechanismSpi.java 2006-03-30 19:19:33.000000000 +0100 @@ -104,10 +104,8 @@ } } public class tmp1Key implements Key { - private String alg; private byte[] enc; public tmp1Key(String alg, byte[] enc) { - this.alg = alg; this.enc = enc; } public String getAlgorithm() { Index: modules/crypto/src/test/java/javax/crypto/NoSuchPaddingExceptionTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/NoSuchPaddingExceptionTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/NoSuchPaddingExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not NoSuchPaddingException"; - static String createErr(Exception tE, Exception eE) { return "NoSuchPaddingException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/crypto/src/test/java/javax/crypto/NullCipherTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/NullCipherTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/NullCipherTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -100,7 +100,7 @@ * Class under test for void init(int, Key, AlgorithmParameterSpec) */ public void testInitintKeyAlgorithmParameterSpec() { - class myAlgorithmParameterSpec implements java.security.spec.AlgorithmParameterSpec {}; + class myAlgorithmParameterSpec implements java.security.spec.AlgorithmParameterSpec {} try { c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[1], "algorithm"), new myAlgorithmParameterSpec()); } catch (InvalidKeyException e) { Index: modules/crypto/src/test/java/javax/crypto/SecretKeyFactorySpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/SecretKeyFactorySpiTests.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/SecretKeyFactorySpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -51,8 +51,7 @@ */ public void testSecretKeyFactorySpi01() throws InvalidKeyException, InvalidKeySpecException { - SecretKeyFactorySpi skfSpi = (SecretKeyFactorySpi) new MySecretKeyFactorySpi(); - assertTrue(skfSpi instanceof SecretKeyFactorySpi); + SecretKeyFactorySpi skfSpi = new MySecretKeyFactorySpi(); SecretKey sk = null; assertNull("Not null result", skfSpi.engineTranslateKey(sk)); Index: modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java 2006-03-30 19:19:33.000000000 +0100 @@ -128,7 +128,6 @@ SecretKeyFactorySpi spi = new MySecretKeyFactorySpi(); SecretKeyFactory secKF = new mySecretKeyFactory(spi, defaultProvider, defaultAlgorithm); - assertTrue("Not SecretKeyFactory object", secKF instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", secKF.getAlgorithm(), defaultAlgorithm); assertEquals("Incorrect provider", secKF.getProvider(), defaultProvider); @@ -136,7 +135,6 @@ assertNull("Incorrect result", secKF.getKeySpec(null, null)); assertNull("Incorrect result", secKF.translateKey(null)); secKF = new mySecretKeyFactory(null, null, null); - assertTrue("Not SecretKeyFactory object", secKF instanceof SecretKeyFactory); assertNull("Algorithm must be null", secKF.getAlgorithm()); assertNull("Provider must be null", secKF.getProvider()); try { @@ -180,8 +178,6 @@ for (int i = 0; i < validValues.length; i++) { SecretKeyFactory secKF = SecretKeyFactory .getInstance(validValues[i]); - assertTrue("Not SecretKeyFactory object", - secKF instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", secKF.getAlgorithm(), validValues[i]); } @@ -271,8 +267,6 @@ for (int i = 0; i < validValues.length; i++) { SecretKeyFactory secKF = SecretKeyFactory.getInstance( validValues[i], defaultProviderName); - assertTrue("Not SecretKeyFactory object", - secKF instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", secKF.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", secKF.getProvider().getName(), @@ -341,8 +335,6 @@ for (int i = 0; i < validValues.length; i++) { SecretKeyFactory secKF = SecretKeyFactory.getInstance( validValues[i], defaultProvider); - assertTrue("Not SecretKeyFactory object", - secKF instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", secKF.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", secKF.getProvider(), @@ -445,8 +437,7 @@ } catch (InvalidKeyException e) { } try { - SecretKey sk = skF[i].translateKey(secKeySpec); - assertTrue(sk instanceof SecretKey); + skF[i].translateKey(secKeySpec); } catch (InvalidKeyException e) { } } Index: modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest2.java 2006-03-30 19:19:33.000000000 +0100 @@ -119,8 +119,6 @@ SecretKeyFactory skf; for (int i = 0; i < validValues.length; i++) { skf = SecretKeyFactory.getInstance(validValues[i]); - assertTrue("Not instanceof SecretKeyFactory object", - skf instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", skf.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", skf.getProvider(), mProv); @@ -185,8 +183,6 @@ for (int i = 0; i < validValues.length; i++) { skf = SecretKeyFactory.getInstance(validValues[i], mProv .getName()); - assertTrue("Not instanceof SecretKeyFactory object", - skf instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", skf.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", skf.getProvider().getName(), @@ -233,8 +229,6 @@ SecretKeyFactory skf; for (int i = 0; i < validValues.length; i++) { skf = SecretKeyFactory.getInstance(validValues[i], mProv); - assertTrue("Not instanceof SecretKeyFactory object", - skf instanceof SecretKeyFactory); assertEquals("Incorrect algorithm", skf.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", skf.getProvider(), mProv); Index: modules/crypto/src/test/java/javax/crypto/ShortBufferExceptionTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/ShortBufferExceptionTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/ShortBufferExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not ShortBufferException"; - static String createErr(Exception tE, Exception eE) { return "ShortBufferException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/crypto/src/test/java/javax/crypto/spec/OAEPParameterSpecTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/spec/OAEPParameterSpecTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/spec/OAEPParameterSpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -48,24 +48,21 @@ PSource pSrc = PSource.PSpecified.DEFAULT; try { - OAEPParameterSpec ps = new OAEPParameterSpec(null, mgfName, - mgfSpec, pSrc); + new OAEPParameterSpec(null, mgfName, mgfSpec, pSrc); fail("NullPointerException should be thrown in the case of " + "null mdName."); } catch (NullPointerException e) { } try { - OAEPParameterSpec ps = new OAEPParameterSpec(mdName, null, - mgfSpec, pSrc); + new OAEPParameterSpec(mdName, null, mgfSpec, pSrc); fail("NullPointerException should be thrown in the case of " + "null mgfName."); } catch (NullPointerException e) { } try { - OAEPParameterSpec ps = new OAEPParameterSpec(mdName, mgfName, - mgfSpec, null); + new OAEPParameterSpec(mdName, mgfName, mgfSpec, null); fail("NullPointerException should be thrown in the case of " + "null pSrc."); } catch (NullPointerException e) { Index: modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -78,8 +78,7 @@ } try { - PBEKeySpec pbeks = new PBEKeySpec(password, null, - iterationCount, keyLength); + new PBEKeySpec(password, null, iterationCount, keyLength); fail("A NullPointerException should be was thrown " + "in the case of null salt."); } catch (IllegalArgumentException e) { @@ -88,24 +87,21 @@ } try { - PBEKeySpec pbeks = new PBEKeySpec(password, new byte [0], - iterationCount, keyLength); + new PBEKeySpec(password, new byte [0], iterationCount, keyLength); fail("An IllegalArgumentException should be thrown " + "in the case of empty salt."); } catch (IllegalArgumentException e) { } try { - PBEKeySpec pbeks = new PBEKeySpec(password, salt, - -1, keyLength); + new PBEKeySpec(password, salt, -1, keyLength); fail("An IllegalArgumentException should be thrown " + "in the case of negative iterationCount."); } catch (IllegalArgumentException e) { } try { - PBEKeySpec pbeks = new PBEKeySpec(password, salt, - iterationCount, -1); + new PBEKeySpec(password, salt, iterationCount, -1); fail("An IllegalArgumentException should be thrown " + "in the case of negative keyLength."); } catch (IllegalArgumentException e) { @@ -145,7 +141,7 @@ } try { - PBEKeySpec pbeks = new PBEKeySpec(password, null, iterationCount); + new PBEKeySpec(password, null, iterationCount); fail("A NullPointerException should be was thrown " + "in the case of null salt."); } catch (IllegalArgumentException e) { @@ -154,15 +150,14 @@ } try { - PBEKeySpec pbeks = new PBEKeySpec(password, new byte [0], - iterationCount); + new PBEKeySpec(password, new byte [0], iterationCount); fail("An IllegalArgumentException should be thrown " + "in the case of empty salt."); } catch (IllegalArgumentException e) { } try { - PBEKeySpec pbeks = new PBEKeySpec(password, salt, -1); + new PBEKeySpec(password, salt, -1); fail("An IllegalArgumentException should be thrown " + "in the case of negative iterationCount."); } catch (IllegalArgumentException e) { Index: modules/crypto/src/test/java/javax/crypto/spec/PBEParameterSpecTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/spec/PBEParameterSpecTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/spec/PBEParameterSpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -42,7 +42,7 @@ int iterationCount = 10; try { - PBEParameterSpec pbeps = new PBEParameterSpec(null, iterationCount); + new PBEParameterSpec(null, iterationCount); fail("A NullPointerException should be was thrown " + "in the case of null salt."); } catch (NullPointerException e) { Index: modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -44,15 +44,14 @@ byte[] iv = {1, 2, 3, 4, 5, 6, 7, 8}; try { - RC2ParameterSpec ps = new RC2ParameterSpec(effectiveKeyBits, null); + new RC2ParameterSpec(effectiveKeyBits, null); fail("An IllegalArgumentException should be thrown " + "in the case of null iv."); } catch (IllegalArgumentException e) { } try { - RC2ParameterSpec ps = new RC2ParameterSpec(effectiveKeyBits, - new byte[] {1, 2, 3, 4, 5}); + new RC2ParameterSpec(effectiveKeyBits, new byte[] {1, 2, 3, 4, 5}); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { @@ -77,16 +76,14 @@ int offset = 2; try { - RC2ParameterSpec ps = new RC2ParameterSpec(effectiveKeyBits, - null, offset); + new RC2ParameterSpec(effectiveKeyBits, null, offset); fail("An IllegalArgumentException should be thrown " + "in the case of null iv."); } catch (IllegalArgumentException e) { } try { - RC2ParameterSpec ps = new RC2ParameterSpec(effectiveKeyBits, - iv, 4); + new RC2ParameterSpec(effectiveKeyBits, iv, 4); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { Index: modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java.orig 2006-03-30 13:10:05.000000000 +0100 +++ modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -45,24 +45,21 @@ byte[] iv = {1, 2, 3, 4}; try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize, null); + new RC5ParameterSpec(version, rounds, wordSize, null); fail("An IllegalArgumentException should be thrown " + "in the case of null iv."); } catch (IllegalArgumentException e) { } try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize+8, iv); + new RC5ParameterSpec(version, rounds, wordSize+8, iv); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { } try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize, new byte[] {1, 2, 3}); + new RC5ParameterSpec(version, rounds, wordSize, new byte[] {1, 2, 3}); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { @@ -90,32 +87,28 @@ int offset = 2; try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize, null, offset); + new RC5ParameterSpec(version, rounds, wordSize, null, offset); fail("An IllegalArgumentException should be thrown " + "in the case of null iv."); } catch (IllegalArgumentException e) { } try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize+8, iv, offset); + new RC5ParameterSpec(version, rounds, wordSize+8, iv, offset); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { } try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize, iv, offset+1); + new RC5ParameterSpec(version, rounds, wordSize, iv, offset+1); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { } try { - RC5ParameterSpec ps = new RC5ParameterSpec(version, rounds, - wordSize, new byte[] {1, 2, 3, 4}, offset); + new RC5ParameterSpec(version, rounds, wordSize, new byte[] {1, 2, 3, 4}, offset); fail("An IllegalArgumentException should be thrown " + "in the case of short iv."); } catch (IllegalArgumentException e) { Index: modules/security/src/common/javasrc/java/security/CodeSource.java =================================================================== --- modules/security/src/common/javasrc/java/security/CodeSource.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/CodeSource.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,9 +23,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.OptionalDataException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.OptionalDataException; import java.io.Serializable; import java.net.SocketPermission; import java.net.URL; Index: modules/security/src/common/javasrc/java/security/Identity.java =================================================================== --- modules/security/src/common/javasrc/java/security/Identity.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/Identity.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,8 +22,8 @@ package java.security; import java.io.Serializable; -import java.util.Vector; import java.util.Arrays; +import java.util.Vector; /** * @com.intel.drl.spec_ref Index: modules/security/src/common/javasrc/java/security/KeyStore.java =================================================================== --- modules/security/src/common/javasrc/java/security/KeyStore.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/KeyStore.java 2006-03-30 19:22:14.000000000 +0100 @@ -540,7 +540,7 @@ if (!keyStore.isInit) { throw new IllegalArgumentException(NOTINITKEYSTORE); } - return (Builder) new BuilderImpl(keyStore, protectionParameter, + return new BuilderImpl(keyStore, protectionParameter, null, null, null, null); } @@ -577,7 +577,7 @@ + " does not refer to a normal file"); } // create new instance - return (Builder) new BuilderImpl(null, protectionParameter, file, + return new BuilderImpl(null, protectionParameter, file, type, provider, AccessController.getContext()); } @@ -593,7 +593,7 @@ if (protectionParameter == null) { throw new NullPointerException("protectionParameter is null"); } - return (Builder) new BuilderImpl(null, protectionParameter, null, + return new BuilderImpl(null, protectionParameter, null, type, provider, AccessController.getContext()); } @@ -685,7 +685,6 @@ // protection parameter should be PasswordProtection // or CallbackHandlerProtection if (protParameter instanceof PasswordProtection) { - PasswordProtection pwp = (PasswordProtection) protParameter; passwd = ((PasswordProtection) protParameter) .getPassword(); } else if (protParameter instanceof CallbackHandlerProtection) { @@ -1047,4 +1046,4 @@ .toString()); } } -} \ No newline at end of file +} Index: modules/security/src/common/javasrc/java/security/KeyStoreSpi.java =================================================================== --- modules/security/src/common/javasrc/java/security/KeyStoreSpi.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/KeyStoreSpi.java 2006-03-30 19:19:33.000000000 +0100 @@ -28,6 +28,7 @@ import java.security.cert.CertificateException; import java.util.Date; import java.util.Enumeration; + import javax.crypto.SecretKey; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.PasswordCallback; Index: modules/security/src/common/javasrc/java/security/SecureRandom.java =================================================================== --- modules/security/src/common/javasrc/java/security/SecureRandom.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/SecureRandom.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.Random; -import java.util.Set; import org.apache.harmony.security.fortress.Engine; import org.apache.harmony.security.fortress.Services; @@ -119,7 +118,6 @@ //Find SecureRandom service. private Provider.Service findService() { - Set s; Provider.Service service; for (Iterator it1 = Services.getProvidersList().iterator(); it1.hasNext();) { service = ((Provider)it1.next()).getService("SecureRandom"); Index: modules/security/src/common/javasrc/java/security/Signature.java =================================================================== --- modules/security/src/common/javasrc/java/security/Signature.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/Signature.java 2006-03-30 19:19:33.000000000 +0100 @@ -188,7 +188,7 @@ boolean critical = false; if (ce != null && !ce.isEmpty()) { for (Iterator i = ce.iterator(); i.hasNext();) { - if ("2.5.29.15".equals((String) i.next())) { + if ("2.5.29.15".equals(i.next())) { //KeyUsage OID = 2.5.29.15 critical = true; break; Index: modules/security/src/common/javasrc/java/security/Timestamp.java =================================================================== --- modules/security/src/common/javasrc/java/security/Timestamp.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/Timestamp.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,8 +22,8 @@ package java.security; import java.io.Serializable; -import java.util.Date; import java.security.cert.CertPath; +import java.util.Date; /** * @com.intel.drl.spec_ref Index: modules/security/src/common/javasrc/java/security/UnresolvedPermission.java =================================================================== --- modules/security/src/common/javasrc/java/security/UnresolvedPermission.java.orig 2006-03-30 11:24:30.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/UnresolvedPermission.java 2006-03-30 19:19:33.000000000 +0100 @@ -291,7 +291,7 @@ ClassNotFoundException { checkType(getUnresolvedType()); ObjectInputStream.GetField fields = in.readFields(); - if (!getUnresolvedType().equals((String)fields.get("type", null))) { + if (!getUnresolvedType().equals(fields.get("type", null))) { throw new InvalidObjectException("target type field is corrupted"); } targetName = (String)fields.get("name", null); Index: modules/security/src/common/javasrc/java/security/cert/X509CRL.java =================================================================== --- modules/security/src/common/javasrc/java/security/cert/X509CRL.java.orig 2006-03-30 08:09:04.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/cert/X509CRL.java 2006-03-30 19:19:33.000000000 +0100 @@ -28,13 +28,10 @@ import java.security.Principal; import java.security.PublicKey; import java.security.SignatureException; -import java.security.cert.CRL; -import java.security.cert.CRLException; -import java.security.cert.X509CRLEntry; -import java.security.cert.X509Extension; import java.util.Arrays; import java.util.Date; import java.util.Set; + import javax.security.auth.x500.X500Principal; /** Index: modules/security/src/common/javasrc/java/security/cert/X509CRLEntry.java =================================================================== --- modules/security/src/common/javasrc/java/security/cert/X509CRLEntry.java.orig 2006-03-30 08:09:04.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/cert/X509CRLEntry.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,11 +22,9 @@ package java.security.cert; import java.math.BigInteger; -import java.security.cert.CRLException; -import java.security.cert.X509CRLEntry; -import java.security.cert.X509Extension; import java.util.Arrays; import java.util.Date; + import javax.security.auth.x500.X500Principal; /** Index: modules/security/src/common/javasrc/java/security/cert/X509CRLSelector.java =================================================================== --- modules/security/src/common/javasrc/java/security/cert/X509CRLSelector.java.orig 2006-03-30 08:09:04.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/cert/X509CRLSelector.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,12 +22,12 @@ import java.io.IOException; import java.math.BigInteger; -import java.security.cert.CRLSelector; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.Iterator; + import javax.security.auth.x500.X500Principal; import org.apache.harmony.security.asn1.ASN1Integer; @@ -225,19 +225,19 @@ + ((X500Principal) issuerNames.get(i)).getName()); } result.append("\n ]"); - }; + } if (minCRL != null) { result.append("\n minCRL: " + minCRL); - }; + } if (maxCRL != null) { result.append("\n maxCRL: " + maxCRL); - }; + } if (dateAndTime != -1) { result.append("\n dateAndTime: " + (new Date(dateAndTime))); } if (certificateChecking != null) { result.append("\n certificateChecking: " + certificateChecking); - }; + } result.append("\n]"); return result.toString(); } @@ -254,7 +254,7 @@ // the search speed depends on the class of issuerNames !(issuerNames.contains(crlist.getIssuerX500Principal()))) { return false; - }; + } if ((minCRL != null) || (maxCRL != null)) { try { // As specified in rfc 3280 (http://www.ietf.org/rfc/rfc3280.txt) @@ -274,7 +274,7 @@ //e.printStackTrace(); return false; } - }; + } if (dateAndTime != -1) { Date thisUp = crlist.getThisUpdate(); Date nextUp = crlist.getNextUpdate(); @@ -285,7 +285,7 @@ || (dateAndTime > nextUp.getTime())) { return false; } - }; + } return true; } @@ -296,7 +296,7 @@ X509CRLSelector result = new X509CRLSelector(); if (issuerNames != null) { result.setIssuers(issuerNames); - }; + } result.minCRL = minCRL; result.maxCRL = maxCRL; result.dateAndTime = dateAndTime; Index: modules/security/src/common/javasrc/java/security/cert/X509CertSelector.java =================================================================== --- modules/security/src/common/javasrc/java/security/cert/X509CertSelector.java.orig 2006-03-30 08:09:04.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/cert/X509CertSelector.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,8 +23,6 @@ import java.io.IOException; import java.math.BigInteger; import java.security.PublicKey; -import java.security.cert.CertSelector; -import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -33,13 +31,11 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.NoSuchElementException; import java.util.Set; -import java.util.StringTokenizer; + import javax.security.auth.x500.X500Principal; import org.apache.harmony.security.asn1.ASN1OctetString; -import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.x509.AlgorithmIdentifier; import org.apache.harmony.security.x509.CertificatePolicies; import org.apache.harmony.security.x509.GeneralName; @@ -705,39 +701,39 @@ result.append("X509CertSelector: \n["); if (this.certificateEquals != null) { result.append("\n certificateEquals: " + certificateEquals); - }; + } if (this.serialNumber != null) { //FIXME: needs DRL's BigInteger.toString implementation //result.append("\n serialNumber: " + serialNumber); - }; + } if (this.issuer != null) { result.append("\n issuer: " + issuer); - }; + } if (this.subject != null) { result.append("\n subject: " + subject); - }; + } if (this.subjectKeyIdentifier != null) { result.append("\n subjectKeyIdentifier: " + getBytesAsString(subjectKeyIdentifier)); - }; + } if (this.authorityKeyIdentifier != null) { result.append("\n authorityKeyIdentifier: " + getBytesAsString(authorityKeyIdentifier)); - }; + } if (this.certificateValid != null) { result.append("\n certificateValid: " + certificateValid); - }; + } if (this.subjectPublicKeyAlgID != null) { result.append("\n subjectPublicKeyAlgID: " + subjectPublicKeyAlgID); - }; + } if (this.privateKeyValid != null) { result.append("\n privateKeyValid: " + privateKeyValid); - }; + } if (this.subjectPublicKey != null) { result.append("\n subjectPublicKey: " + getBytesAsString(subjectPublicKey)); - }; + } if (this.keyUsage != null) { result.append("\n keyUsage: \n ["); String[] kuNames = new String[] { @@ -751,7 +747,7 @@ } } result.append("\n ]"); - }; + } if (this.extendedKeyUsage != null) { result.append("\n extendedKeyUsage: " + extendedKeyUsage.toString()); @@ -771,20 +767,20 @@ } } result.append("\n ]"); - }; + } if (this.nameConstraints != null) { - }; + } if (this.policies != null) { result.append("\n policies: " + policies.toString()); - }; + } if (this.pathToNames != null) { result.append("\n pathToNames: \n ["); int size = pathToNames.size(); - for (int i=0; i 0) { return false; - }; + } if ((notAfter != null) && notAfter.compareTo(privateKeyValid) < 0) { return false; - }; + } } catch (IOException e) { return false; } @@ -1099,7 +1095,7 @@ new ArrayList(this.subjectAltNames[i]); } } - }; + } result.nameConstraints = this.nameConstraints; result.policies = (this.policies == null) ? null Index: modules/security/src/common/javasrc/java/security/cert/X509Certificate.java =================================================================== --- modules/security/src/common/javasrc/java/security/cert/X509Certificate.java.orig 2006-03-30 08:09:04.000000000 +0100 +++ modules/security/src/common/javasrc/java/security/cert/X509Certificate.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,15 +23,10 @@ import java.math.BigInteger; import java.security.Principal; -import java.security.cert.Certificate; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Extension; import java.util.Collection; import java.util.Date; import java.util.List; + import javax.security.auth.x500.X500Principal; /** Index: modules/security/src/common/javasrc/java/security/interfaces/ECPublicKey.java =================================================================== --- modules/security/src/common/javasrc/java/security/interfaces/ECPublicKey.java.orig 2006-03-20 18:38:15.000000000 +0000 +++ modules/security/src/common/javasrc/java/security/interfaces/ECPublicKey.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,8 +21,8 @@ package java.security.interfaces; -import java.security.spec.ECPoint; import java.security.PublicKey; +import java.security.spec.ECPoint; /** * @com.intel.drl.spec_ref Index: modules/security/src/common/javasrc/javax/security/auth/kerberos/DelegationPermission.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/kerberos/DelegationPermission.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/auth/kerberos/DelegationPermission.java 2006-03-30 19:19:33.000000000 +0100 @@ -227,8 +227,9 @@ Vector permissions; synchronized (this) { permissions = new Vector(offset); - for (int i = 0; i < offset; permissions.add(items[i++])) - ; + for (int i = 0; i < offset; i++) { + permissions.add(items[i]); + } } ObjectOutputStream.PutField fields = out.putFields(); fields.put("permissions", permissions); Index: modules/security/src/common/javasrc/javax/security/auth/kerberos/KerberosTicket.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/kerberos/KerberosTicket.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/auth/kerberos/KerberosTicket.java 2006-03-30 19:19:33.000000000 +0100 @@ -25,6 +25,7 @@ import java.net.InetAddress; import java.util.Arrays; import java.util.Date; + import javax.crypto.SecretKey; import javax.security.auth.DestroyFailedException; import javax.security.auth.Destroyable; @@ -224,7 +225,7 @@ */ public final SecretKey getSessionKey() { checkState(); - return (SecretKey)sessionKey; + return sessionKey; } /** Index: modules/security/src/common/javasrc/javax/security/auth/kerberos/ServicePermission.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/kerberos/ServicePermission.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/auth/kerberos/ServicePermission.java 2006-03-30 19:19:33.000000000 +0100 @@ -312,8 +312,9 @@ Vector permissions; synchronized (this) { permissions = new Vector(offset); - for (int i = 0; i < offset; permissions.add(items[i++])) - ; + for (int i = 0; i < offset; i++) { + permissions.add(items[i]); + } } ObjectOutputStream.PutField fields = out.putFields(); fields.put("permissions", permissions); Index: modules/security/src/common/javasrc/javax/security/auth/login/Configuration.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/login/Configuration.java.orig 2006-03-20 18:38:40.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/auth/login/Configuration.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,6 +22,7 @@ package javax.security.auth.login; import java.security.AccessController; + import javax.security.auth.AuthPermission; import org.apache.harmony.security.fortress.PolicyUtils; Index: modules/security/src/common/javasrc/javax/security/auth/login/LoginContext.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/login/LoginContext.java.orig 2006-03-20 18:38:40.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/auth/login/LoginContext.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,23 +22,21 @@ package javax.security.auth.login; import java.io.IOException; -import java.security.AccessController; import java.security.AccessControlContext; -import java.security.PrivilegedExceptionAction; +import java.security.AccessController; import java.security.PrivilegedActionException; - +import java.security.PrivilegedExceptionAction; import java.security.Security; import java.util.HashMap; import java.util.Map; +import javax.security.auth.AuthPermission; import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.spi.LoginModule; -import javax.security.auth.AuthPermission; - import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; +import javax.security.auth.spi.LoginModule; /** * @com.intel.drl.spec_ref Index: modules/security/src/common/javasrc/javax/security/auth/x500/X500PrivateCredential.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/x500/X500PrivateCredential.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/auth/x500/X500PrivateCredential.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,8 +21,9 @@ package javax.security.auth.x500; -import java.security.cert.X509Certificate; import java.security.PrivateKey; +import java.security.cert.X509Certificate; + import javax.security.auth.Destroyable; /** Index: modules/security/src/common/javasrc/javax/security/cert/Certificate.java =================================================================== --- modules/security/src/common/javasrc/javax/security/cert/Certificate.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/cert/Certificate.java 2006-03-30 19:19:33.000000000 +0100 @@ -27,8 +27,6 @@ import java.security.PublicKey; import java.security.SignatureException; import java.util.Arrays; -import javax.security.cert.CertificateEncodingException; -import javax.security.cert.CertificateException; /** * @com.intel.drl.spec_ref Index: modules/security/src/common/javasrc/javax/security/cert/X509Certificate.java =================================================================== --- modules/security/src/common/javasrc/javax/security/cert/X509Certificate.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/cert/X509Certificate.java 2006-03-30 19:19:33.000000000 +0100 @@ -35,11 +35,6 @@ import java.security.SignatureException; import java.security.cert.CertificateFactory; import java.util.Date; -import javax.security.cert.Certificate; -import javax.security.cert.CertificateEncodingException; -import javax.security.cert.CertificateException; -import javax.security.cert.CertificateExpiredException; -import javax.security.cert.CertificateNotYetValidException; /** * @com.intel.drl.spec_ref Index: modules/security/src/common/javasrc/javax/security/sasl/AuthorizeCallback.java =================================================================== --- modules/security/src/common/javasrc/javax/security/sasl/AuthorizeCallback.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/sasl/AuthorizeCallback.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,6 +22,7 @@ package javax.security.sasl; import java.io.Serializable; + import javax.security.auth.callback.Callback; /** Index: modules/security/src/common/javasrc/javax/security/sasl/Sasl.java =================================================================== --- modules/security/src/common/javasrc/javax/security/sasl/Sasl.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/sasl/Sasl.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,14 +23,14 @@ import java.security.Provider; import java.security.Security; -import javax.security.auth.callback.CallbackHandler; - import java.util.Collection; import java.util.Collections; import java.util.Enumeration; -import java.util.Map; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; + +import javax.security.auth.callback.CallbackHandler; /** * @@ -160,7 +160,7 @@ while (keys.hasMoreElements()) { String s = (String) keys.nextElement(); if (s.startsWith(service)) { - prop = (String) pp[i].getProperty(s); + prop = pp[i].getProperty(s); try { if (props.add(prName.concat(prop))) { fact.add(newInstance(prop, pp[i])); Index: modules/security/src/common/javasrc/javax/security/sasl/SaslClientFactory.java =================================================================== --- modules/security/src/common/javasrc/javax/security/sasl/SaslClientFactory.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/sasl/SaslClientFactory.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,6 +22,7 @@ package javax.security.sasl; import java.util.Map; + import javax.security.auth.callback.CallbackHandler; /** Index: modules/security/src/common/javasrc/javax/security/sasl/SaslServerFactory.java =================================================================== --- modules/security/src/common/javasrc/javax/security/sasl/SaslServerFactory.java.orig 2006-03-20 18:38:41.000000000 +0000 +++ modules/security/src/common/javasrc/javax/security/sasl/SaslServerFactory.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,6 +22,7 @@ package javax.security.sasl; import java.util.Map; + import javax.security.auth.callback.CallbackHandler; /** Index: modules/security/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Time.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Time.java.orig 2006-03-20 18:38:27.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Time.java 2006-03-30 19:19:33.000000000 +0100 @@ -85,8 +85,7 @@ // the number of passed leap years without this year int leap_years_num = (times[0] > 1970) ? (times[0] - 1969)/4 : (times[0] - 1971)/4; - res += (long) (times[0] - 1970) * 31536000000l - + (long) leap_years_num * 86400000; + res += (times[0] - 1970L) * 31536000000L + leap_years_num * 86400000L; // if this year is a leap year and this is time after the february if ((times[0] % 4 == 0) && (times[1] > 2)) { res += (times[0] > 1970) ? 86400000 : -86400000; Index: modules/security/src/common/javasrc/org/apache/harmony/security/asn1/BerInputStream.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/asn1/BerInputStream.java.orig 2006-03-20 18:38:27.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/asn1/BerInputStream.java 2006-03-30 19:19:33.000000000 +0100 @@ -214,7 +214,7 @@ } // tag length long_form content return 1 + 1 + numOctets + length; - }; + } /** * Decodes ASN.1 bitstring type Index: modules/security/src/common/javasrc/org/apache/harmony/security/asn1/BerOutputStream.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/asn1/BerOutputStream.java.orig 2006-03-20 18:38:27.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/asn1/BerOutputStream.java 2006-03-30 19:19:33.000000000 +0100 @@ -78,7 +78,7 @@ } public void encodeANY() { - System.arraycopy(((byte[]) content), 0, encoded, offset, length); + System.arraycopy(content, 0, encoded, offset, length); offset += length; } @@ -108,22 +108,22 @@ } public void encodeGeneralizedTime() { - System.arraycopy(((byte[]) content), 0, encoded, offset, length); + System.arraycopy(content, 0, encoded, offset, length); offset += length; } public void encodeUTCTime() { - System.arraycopy(((byte[]) content), 0, encoded, offset, length); + System.arraycopy(content, 0, encoded, offset, length); offset += length; } public void encodeInteger() { - System.arraycopy(((byte[]) content), 0, encoded, offset, length); + System.arraycopy(content, 0, encoded, offset, length); offset += length; } public void encodeOctetString() { - System.arraycopy(((byte[]) content), 0, encoded, offset, length); + System.arraycopy(content, 0, encoded, offset, length); offset += length; } @@ -184,7 +184,7 @@ } public void encodeString() { - System.arraycopy(((byte[]) content), 0, encoded, offset, length); + System.arraycopy(content, 0, encoded, offset, length); offset += length; } Index: modules/security/src/common/javasrc/org/apache/harmony/security/asn1/DerOutputStream.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/asn1/DerOutputStream.java.orig 2006-03-20 18:38:27.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/asn1/DerOutputStream.java 2006-03-30 19:19:33.000000000 +0100 @@ -189,7 +189,7 @@ push(compLens, values); int seqLen = 0; - for (int i = 0, cur = 0; i < type.length; i++) { + for (int i = 0; i < type.length; i++) { if (values[i] == null) { continue; //FIXME raise exception if non-optional data is missing } @@ -233,7 +233,7 @@ push(compLens, values); int seqLen = 0; - for (int i = 0, cur = 0; i < values.length; i++) { + for (int i = 0; i < values.length; i++) { content = cv[i]; Index: modules/security/src/common/javasrc/org/apache/harmony/security/asn1/InformationObjectSet.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/asn1/InformationObjectSet.java.orig 2006-03-20 18:38:27.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/asn1/InformationObjectSet.java 2006-03-30 19:19:33.000000000 +0100 @@ -36,7 +36,7 @@ private final int capacity; - private final int size; + //private final int size; private final Entry[][] pool; @@ -46,7 +46,7 @@ public InformationObjectSet(int capacity, int size) { this.capacity = capacity; - this.size = size; + //this.size = size; pool = new Entry[capacity][size]; } Index: modules/security/src/common/javasrc/org/apache/harmony/security/fortress/DefaultPolicyParser.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/fortress/DefaultPolicyParser.java.orig 2006-03-20 18:38:32.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/fortress/DefaultPolicyParser.java 2006-03-30 19:19:33.000000000 +0100 @@ -26,9 +26,6 @@ import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; -import java.security.cert.Certificate; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; import java.security.AccessController; import java.security.CodeSource; import java.security.KeyStore; @@ -36,6 +33,9 @@ import java.security.Permission; import java.security.Principal; import java.security.UnresolvedPermission; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -48,6 +48,7 @@ import org.apache.harmony.security.DefaultPolicyScanner; import org.apache.harmony.security.PolicyEntry; import org.apache.harmony.security.UnresolvedPrincipal; +import org.apache.harmony.security.fortress.PolicyUtils.ExpansionFailedException; /** @@ -293,7 +294,7 @@ private DefaultPolicyScanner.GrantEntry ge; // Store PermissionEntry - private DefaultPolicyScanner.PermissionEntry pe; + //private DefaultPolicyScanner.PermissionEntry pe; /** * Combined setter of all required fields. @@ -301,7 +302,7 @@ public PermissionExpander configure(DefaultPolicyScanner.GrantEntry ge, DefaultPolicyScanner.PermissionEntry pe, KeyStore ks) { this.ge = ge; - this.pe = pe; + //this.pe = pe; this.ks = ks; return this; } Index: modules/security/src/common/javasrc/org/apache/harmony/security/fortress/Engine.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/fortress/Engine.java.orig 2006-03-20 18:38:32.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/fortress/Engine.java 2006-03-30 19:19:33.000000000 +0100 @@ -38,7 +38,6 @@ // for getInstance(String algorithm, Object param) optimization: // previous result private Provider.Service returnedService; - private Provider returnedProvider; // previous parameter private String lastAlgorithm; @@ -80,9 +79,6 @@ */ public synchronized void getInstance(String algorithm, Object param) throws NoSuchAlgorithmException { - String className; - Class c; - Provider p; Provider.Service serv; if (algorithm == null) { @@ -126,8 +122,6 @@ public synchronized void getInstance(String algorithm, Provider provider, Object param) throws NoSuchAlgorithmException { - String className; - Object o; Provider.Service serv = null; if (algorithm == null) { throw new NoSuchAlgorithmException(serviceName Index: modules/security/src/common/javasrc/org/apache/harmony/security/fortress/SecurityAccess.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/fortress/SecurityAccess.java.orig 2006-03-20 18:38:32.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/fortress/SecurityAccess.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,8 +21,8 @@ package org.apache.harmony.security.fortress; -import java.util.Iterator; import java.security.Provider; +import java.util.Iterator; /** * Index: modules/security/src/common/javasrc/org/apache/harmony/security/fortress/Services.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/fortress/Services.java.orig 2006-03-20 18:38:32.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/fortress/Services.java 2006-03-30 19:19:33.000000000 +0100 @@ -111,7 +111,6 @@ * @return */ public static Provider getProvider(String name) { - Provider p; if (name == null) { return null; } Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/Cache.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/Cache.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/Cache.java 2006-03-30 19:19:33.000000000 +0100 @@ -186,8 +186,6 @@ //*/ } - private int XXX = 0; - public Object get(long hash, byte[] encoding) { hash |= getSuffHash(encoding); int idx = -1*Arrays.binarySearch(hashes_idx, hash)-1; Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/DRLCertFactory.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/DRLCertFactory.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/DRLCertFactory.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,8 +24,6 @@ import java.security.AccessController; import java.security.Provider; -import java.security.cert.CertificateFactory; - /** * DRLCertFactory */ Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,10 +22,11 @@ package org.apache.harmony.security.provider.cert; import java.math.BigInteger; -import java.util.Date; -import java.util.Set; import java.security.cert.CRLException; import java.security.cert.X509CRLEntry; +import java.util.Date; +import java.util.Set; + import javax.security.auth.x500.X500Principal; import org.apache.harmony.security.x509.Extensions; Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CRLImpl.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CRLImpl.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CRLImpl.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,26 +21,27 @@ package org.apache.harmony.security.provider.cert; -import java.security.cert.X509CRL; -import java.security.cert.X509Certificate; -import java.security.cert.Certificate; +import java.io.IOException; +import java.io.InputStream; import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.Principal; import java.security.PublicKey; +import java.security.Signature; import java.security.SignatureException; -import java.security.cert.CRL; import java.security.cert.CRLException; +import java.security.cert.Certificate; +import java.security.cert.X509CRL; import java.security.cert.X509CRLEntry; -import java.security.cert.X509Extension; +import java.security.cert.X509Certificate; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashSet; -import java.util.Set; import java.util.List; +import java.util.Set; + import javax.security.auth.x500.X500Principal; import org.apache.harmony.security.x.crypto.utils.AlgNameMapper; @@ -49,11 +50,6 @@ import org.apache.harmony.security.x509.TBSCertList; -import java.io.InputStream; -import java.io.IOException; -import java.security.Signature; - - /** * X509CRLImpl */ Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,12 +22,21 @@ package org.apache.harmony.security.provider.cert; -import java.io.*; -import java.util.*; -import java.security.cert.*; +import java.io.IOException; +import java.io.InputStream; +import java.security.cert.CRL; +import java.security.cert.CRLException; +import java.security.cert.CertPath; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactorySpi; +import java.security.cert.X509CRL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; import org.apache.harmony.misc.Base64; -import org.apache.harmony.security.asn1.ASN1Any; import org.apache.harmony.security.asn1.BerInputStream; /** @@ -55,7 +64,7 @@ if (inStream.read(buff) < 28) { throw new CertificateException( "Input Stream contains not enought data."); - }; + } if ("-----BEGIN CERTIFICATE-----".equals(new String(buff, 0, 27))) { int size = inStream.available(); if (size == 0) { @@ -167,7 +176,7 @@ if (inStream.read(buff) < 28) { throw new CRLException( "Input Stream contains not enought data."); - }; + } inStream.reset(); long hash = CRL_CASHE.getHash(buff); @@ -312,7 +321,7 @@ } } return inStream.read(); - }; + } public int read(byte[] b) throws IOException { return read(b, 0, b.length); Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertImpl.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertImpl.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertImpl.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,32 +21,33 @@ package org.apache.harmony.security.provider.cert; -import java.security.cert.X509Certificate; -import java.math.BigInteger; -import javax.security.auth.x500.X500Principal; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.HashMap; -import java.util.Date; -import java.util.Set; -import java.security.Signature; -import java.security.PublicKey; -import java.security.Principal; +import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.security.SignatureException; import java.security.NoSuchProviderException; -import java.security.cert.CertificateException; +import java.security.Principal; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; import java.security.cert.CertificateParsingException; -import org.apache.harmony.security.asn1.*; +import java.security.cert.X509Certificate; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Set; + +import javax.security.auth.x500.X500Principal; + import org.apache.harmony.security.x.crypto.utils.AlgNameMapper; -import org.apache.harmony.security.x509.*; +import org.apache.harmony.security.x509.Certificate; +import org.apache.harmony.security.x509.Extensions; +import org.apache.harmony.security.x509.TBSCertificate; /** * X509CertImpl @@ -114,7 +115,7 @@ if (time > notAfter) { throw new CertificateExpiredException(); } - }; + } public void checkValidity(Date date) throws CertificateExpiredException, @@ -130,18 +131,18 @@ if (time > notAfter) { throw new CertificateExpiredException(); } - }; + } public int getVersion() { return 3; - }; + } public BigInteger getSerialNumber() { if (serialNumber == null) { serialNumber = tbsCert.getSerialNumber(); } return serialNumber; - }; + } public Principal getIssuerDN() { if (issuer == null) { @@ -149,7 +150,7 @@ tbsCert.getIssuer().getName(X500Principal.RFC2253)); } return issuer; - }; + } public X500Principal getIssuerX500Principal() { if (issuer == null) { @@ -165,7 +166,7 @@ tbsCert.getSubject().getName(X500Principal.RFC2253)); } return subject; - }; + } public X500Principal getSubjectX500Principal() { if (subject == null) { @@ -181,7 +182,7 @@ notAfter = tbsCert.getValidity().getNotAfter().getTime(); } return new Date(notBefore); - }; + } public Date getNotAfter() { if (notBefore == -1) { @@ -189,7 +190,7 @@ notAfter = tbsCert.getValidity().getNotAfter().getTime(); } return new Date(notAfter); - }; + } public byte[] getTBSCertificate() throws CertificateEncodingException @@ -200,7 +201,7 @@ byte[] result = new byte[tbsCertificate.length]; System.arraycopy(tbsCertificate, 0, result, 0, tbsCertificate.length); return result; - }; + } public byte[] getSignature() { if (signature == null) { @@ -209,7 +210,7 @@ byte[] result = new byte[signature.length]; System.arraycopy(signature, 0, result, 0, signature.length); return result; - }; + } public String getSigAlgName() { if (sigAlgOID == null) { @@ -220,7 +221,7 @@ } } return sigAlgName; - }; + } public String getSigAlgOID() { if (sigAlgOID == null) { @@ -231,7 +232,7 @@ } } return sigAlgOID; - }; + } public byte[] getSigAlgParams() { if (nullSigAlgParams) { @@ -245,21 +246,21 @@ } } return sigAlgParams; - }; + } /** * @return */ public boolean[] getIssuerUniqueID() { return tbsCert.getIssuerUniqueID(); - }; + } /** * @return */ public boolean[] getSubjectUniqueID() { return tbsCert.getSubjectUniqueID(); - }; + } /** * @return @@ -269,7 +270,7 @@ return null; } return extensions.valueOfKeyUsage(); - }; + } public List/**/ getExtendedKeyUsage() throws CertificateParsingException { @@ -288,7 +289,7 @@ return Integer.MAX_VALUE; } return extensions.valueOfBasicConstrains(); - }; + } public Collection/*>*/ getSubjectAlternativeNames() throws CertificateParsingException { Index: modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertPathImpl.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertPathImpl.java.orig 2006-03-20 18:38:34.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/provider/cert/X509CertPathImpl.java 2006-03-30 19:19:33.000000000 +0100 @@ -40,7 +40,6 @@ import org.apache.harmony.security.pkcs7.ContentInfo; import org.apache.harmony.security.pkcs7.SignedData; import org.apache.harmony.security.x509.Certificate; -import org.apache.harmony.security.x509.Extensions; /** @@ -56,7 +55,7 @@ private static final String[] encodingsArr = new String[] {"PkiPath", "PKCS7"}; static final List encodings = Collections.unmodifiableList( - Arrays.asList(encodingsArr));; + Arrays.asList(encodingsArr)); private final List certificates; private byte[] pkiPathEncoding; private byte[] pkcs7Encoding; Index: modules/security/src/common/javasrc/org/apache/harmony/security/utils/JarUtils.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/utils/JarUtils.java.orig 2006-03-20 18:38:23.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/utils/JarUtils.java 2006-03-30 19:19:33.000000000 +0100 @@ -110,7 +110,7 @@ return null; } - if (((X509Certificate)certs[issuerSertIndex]).hasUnsupportedCriticalExtension()) { + if ((certs[issuerSertIndex]).hasUnsupportedCriticalExtension()) { throw new SecurityException("Can not recognize a critical extension"); } Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,8 +21,8 @@ package org.apache.harmony.security.x509; -import java.math.BigInteger; import java.io.IOException; +import java.math.BigInteger; import org.apache.harmony.security.asn1.ASN1Implicit; import org.apache.harmony.security.asn1.ASN1Integer; @@ -31,8 +31,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with Authority Key Identifier Extension (OID = 2.5.29.35). Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/CRLDistributionPoints.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/CRLDistributionPoints.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/CRLDistributionPoints.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,15 +22,13 @@ package org.apache.harmony.security.x509; import java.util.ArrayList; -import java.util.List; import java.util.Collection; +import java.util.List; import org.apache.harmony.security.asn1.ASN1SequenceOf; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the CRL Distribution Points which is the part of X.509 CRL Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/Certificate.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/Certificate.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/Certificate.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,13 +21,12 @@ package org.apache.harmony.security.x509; +import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.BitString; -import org.apache.harmony.security.asn1.ASN1BitString; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the X.509 certificate. Its ASN notation is as follows Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/CertificateList.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/CertificateList.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/CertificateList.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,13 +21,12 @@ package org.apache.harmony.security.x509; +import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.BitString; -import org.apache.harmony.security.asn1.ASN1BitString; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the X.509 CRL. Its ASN notation is as follows Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/CertificatePolicies.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/CertificatePolicies.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/CertificatePolicies.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,9 +21,7 @@ package org.apache.harmony.security.x509; -import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.Collection; import java.util.List; @@ -31,8 +29,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with Certificate Policies structure which is a part of X.509 certificate Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/DistributionPoint.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/DistributionPoint.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/DistributionPoint.java 2006-03-30 19:19:33.000000000 +0100 @@ -28,8 +28,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the DistributionPoint stucture which is the part of X.509 CRL Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/DistributionPointName.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/DistributionPointName.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/DistributionPointName.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,8 +24,6 @@ import org.apache.harmony.security.asn1.ASN1Choice; import org.apache.harmony.security.asn1.ASN1Implicit; import org.apache.harmony.security.asn1.ASN1Type; - -import org.apache.harmony.security.asn1.*; import org.apache.harmony.security.x501.Name; /** Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/EDIPartyName.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/EDIPartyName.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/EDIPartyName.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,14 +21,10 @@ package org.apache.harmony.security.x509; -import java.io.IOException; - import org.apache.harmony.security.asn1.ASN1Explicit; import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; - -import org.apache.harmony.security.asn1.*; import org.apache.harmony.security.x501.DirectoryString; /** Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/Extension.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/Extension.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/Extension.java 2006-03-30 19:19:33.000000000 +0100 @@ -29,6 +29,7 @@ import javax.security.auth.x500.X500Principal; +import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.asn1.ASN1Boolean; import org.apache.harmony.security.asn1.ASN1Enumerated; import org.apache.harmony.security.asn1.ASN1GeneralizedTime; @@ -41,8 +42,6 @@ import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.BitString; import org.apache.harmony.security.asn1.ObjectIdentifier; - -import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.x501.Name; /** Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/Extensions.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/Extensions.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/Extensions.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,14 +22,15 @@ package org.apache.harmony.security.x509; import java.io.IOException; -import java.util.Set; -import java.util.HashSet; -import java.util.Arrays; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + import javax.security.auth.x500.X500Principal; import org.apache.harmony.security.asn1.ASN1SequenceOf; Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralName.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralName.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralName.java 2006-03-30 19:19:33.000000000 +0100 @@ -38,8 +38,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.ObjectIdentifier; - -import org.apache.harmony.security.asn1.*; import org.apache.harmony.security.x501.Name; /** @@ -158,7 +156,7 @@ this.name = name; break; case REG_ID: - this.name = ObjectIdentifier.toIntArray((String) name); + this.name = ObjectIdentifier.toIntArray(name); break; case DIR_NAME : try { Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralNames.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralNames.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralNames.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,10 +21,9 @@ package org.apache.harmony.security.x509; -import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.Collection; +import java.util.Iterator; import java.util.List; import org.apache.harmony.security.asn1.ASN1SequenceOf; Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralSubtree.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralSubtree.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralSubtree.java 2006-03-30 19:19:33.000000000 +0100 @@ -27,8 +27,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the GeneralSubtree structure which is a part of X.509 certificate: @@ -158,10 +156,10 @@ Object[] values = (Object[]) in.content; int maximum = -1; // is optional maximum missing? if (values[2] != null) { - maximum = ASN1Integer.toIntValue((byte[]) values[2]); // no! + maximum = ASN1Integer.toIntValue(values[2]); // no! } return new GeneralSubtree((GeneralName) values[0], - ASN1Integer.toIntValue((byte[]) values[1]), + ASN1Integer.toIntValue(values[1]), maximum); } Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralSubtrees.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralSubtrees.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/GeneralSubtrees.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,9 +21,7 @@ package org.apache.harmony.security.x509; -import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.Collection; import java.util.List; @@ -31,8 +29,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the GeneralSubtrees structure which is a part of X.509 certificate: Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/NameConstraints.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/NameConstraints.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/NameConstraints.java 2006-03-30 19:19:33.000000000 +0100 @@ -33,8 +33,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the following structure which is a part of X.509 certificate @@ -75,7 +73,7 @@ */ public NameConstraints() { this(null, null); - }; + } /** * Constructs NameConstrains object @@ -100,7 +98,7 @@ } this.permittedSubtrees = permittedSubtrees; this.excludedSubtrees = excludedSubtrees; - }; + } // // Constructs NameConstrains object Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/ORAddress.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/ORAddress.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/ORAddress.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,14 +21,10 @@ package org.apache.harmony.security.x509; -import java.io.IOException; - import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the ORAddress structure which is a part of X.509 certificate: Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/OtherName.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/OtherName.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/OtherName.java 2006-03-30 19:19:33.000000000 +0100 @@ -29,8 +29,6 @@ import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.ObjectIdentifier; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with OtherName structure which is a subpart of GeneralName Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/PolicyConstraints.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/PolicyConstraints.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/PolicyConstraints.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,12 +21,7 @@ package org.apache.harmony.security.x509; -import java.io.IOException; -import java.security.cert.X509Certificate; import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import org.apache.harmony.security.asn1.ASN1Implicit; import org.apache.harmony.security.asn1.ASN1Integer; @@ -34,8 +29,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with PolicyConstraints structure which is a part of X.509 certificate @@ -73,7 +66,7 @@ */ public PolicyConstraints() { this(null, null); - }; + } /** * TODO @@ -84,7 +77,7 @@ BigInteger inhibitPolicyMapping) { this.requireExplicitPolicy = requireExplicitPolicy; this.inhibitPolicyMapping = inhibitPolicyMapping; - }; + } // // TODO Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/PolicyInformation.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/PolicyInformation.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/PolicyInformation.java 2006-03-30 19:19:33.000000000 +0100 @@ -27,8 +27,6 @@ import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.ObjectIdentifier; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with PolicyInformation structure which is a subpart of certificatePolicies Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,7 +21,6 @@ package org.apache.harmony.security.x509; -import java.io.IOException; import java.util.Date; import org.apache.harmony.security.asn1.ASN1GeneralizedTime; @@ -30,8 +29,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the following certificate extension (OID: 2.5.29.16) Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/ReasonFlags.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/ReasonFlags.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/ReasonFlags.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,11 +23,10 @@ import java.io.IOException; +import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.BerOutputStream; -import org.apache.harmony.security.asn1.ASN1BitString; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with the following part of X.509 CRL Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,19 +21,15 @@ package org.apache.harmony.security.x509; -import java.io.IOException; import java.security.KeyFactory; import java.security.PublicKey; import java.security.spec.X509EncodedKeySpec; -import org.apache.harmony.security.PublicKeyImpl; +import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.BitString; - - -import org.apache.harmony.security.asn1.*; import org.apache.harmony.security.x.crypto.utils.AlgNameMapper; /** Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/TBSCertList.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/TBSCertList.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/TBSCertList.java 2006-03-30 19:19:33.000000000 +0100 @@ -25,8 +25,9 @@ import java.math.BigInteger; import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.Date; +import java.util.List; + import javax.security.auth.x500.X500Principal; import org.apache.harmony.security.asn1.ASN1Explicit; Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/TBSCertificate.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/TBSCertificate.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/TBSCertificate.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,6 +23,7 @@ import java.math.BigInteger; +import org.apache.harmony.security.asn1.ASN1BitString; import org.apache.harmony.security.asn1.ASN1Explicit; import org.apache.harmony.security.asn1.ASN1Implicit; import org.apache.harmony.security.asn1.ASN1Integer; @@ -30,8 +31,6 @@ import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.asn1.BitString; - -import org.apache.harmony.security.asn1.*; import org.apache.harmony.security.x501.Name; /** Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/Time.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/Time.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/Time.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,16 +21,11 @@ package org.apache.harmony.security.x509; -import java.io.IOException; -import java.util.Date; - import org.apache.harmony.security.asn1.ASN1Choice; import org.apache.harmony.security.asn1.ASN1GeneralizedTime; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.ASN1UTCTime; -import org.apache.harmony.security.asn1.*; - /** * Class represents the work with the following X.509 structure: * (as specified in RFC 3280 - Index: modules/security/src/common/javasrc/org/apache/harmony/security/x509/Validity.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x509/Validity.java.orig 2006-03-20 18:38:31.000000000 +0000 +++ modules/security/src/common/javasrc/org/apache/harmony/security/x509/Validity.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,15 +21,12 @@ package org.apache.harmony.security.x509; -import java.io.IOException; import java.util.Date; import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.asn1.*; - /** * The class incapsulates the ASN.1 DER encoding/decoding work * with Validity structure which is the part of X.509 certificate Index: modules/security/test/common/unit/java/security/AccessControlExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/AccessControlExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/AccessControlExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -50,7 +50,7 @@ */ public void testAccessControlExceptionStringPermission() { Permission perm = new AllPermission(); - AccessControlException ex = new AccessControlException("001", perm); + new AccessControlException("001", perm); } /** Index: modules/security/test/common/unit/java/security/AlgorithmParameterGenerator1Test.java =================================================================== --- modules/security/test/common/unit/java/security/AlgorithmParameterGenerator1Test.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/AlgorithmParameterGenerator1Test.java 2006-03-30 19:19:33.000000000 +0100 @@ -53,7 +53,7 @@ private static String validProviderName = null; - private static Provider validProvider = null;; + private static Provider validProvider = null; private static boolean DSASupported = false; Index: modules/security/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTest.java =================================================================== --- modules/security/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -51,9 +51,7 @@ public void testAlgorithmParameterGeneratorSpi01() throws InvalidAlgorithmParameterException { AlgorithmParameterGeneratorSpi algParGen = - (AlgorithmParameterGeneratorSpi) new MyAlgorithmParameterGeneratorSpi(); - assertTrue("Not AlgorithmParameterGeneratorSpi object", - algParGen instanceof AlgorithmParameterGeneratorSpi); + new MyAlgorithmParameterGeneratorSpi(); AlgorithmParameters param = algParGen.engineGenerateParameters(); assertNull("Not null parameters", param); AlgorithmParameterSpec pp = null; Index: modules/security/test/common/unit/java/security/AlgorithmParametersTest.java =================================================================== --- modules/security/test/common/unit/java/security/AlgorithmParametersTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/AlgorithmParametersTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -189,9 +189,6 @@ } private void checkAP(AlgorithmParameters ap, Provider p) { - if (!(ap instanceof AlgorithmParameters)) { - fail("getInstance() failed"); - } if (ap.getProvider() != p) { fail("getProvider() failed"); } Index: modules/security/test/common/unit/java/security/BasicPermissionCollectionTest.java =================================================================== --- modules/security/test/common/unit/java/security/BasicPermissionCollectionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/BasicPermissionCollectionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -170,8 +170,7 @@ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream( baos.toByteArray())); try { - BasicPermissionCollection b = (BasicPermissionCollection)in - .readObject(); + in.readObject(); fail("should throw InvalidObjectException"); } catch (java.io.InvalidObjectException e) { } finally { @@ -198,8 +197,7 @@ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream( baos.toByteArray())); try { - BasicPermissionCollection b = (BasicPermissionCollection)in - .readObject(); + in.readObject(); fail("should throw InvalidObjectException"); } catch (java.io.InvalidObjectException e) { } finally { Index: modules/security/test/common/unit/java/security/CodeSourceTest.java =================================================================== --- modules/security/test/common/unit/java/security/CodeSourceTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/CodeSourceTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -549,7 +549,7 @@ return false; } return true; - }; + } /** * must not imply null CodeSource @@ -748,8 +748,8 @@ Certificate[] thizCerts = { c0, c1 }; Certificate[] thatCerts = { c1, c0, c2 }; - CodeSource thiz = new CodeSource(urlSite, (Certificate[]) thizCerts); - CodeSource that = new CodeSource(urlSite, (Certificate[]) thatCerts); + CodeSource thiz = new CodeSource(urlSite, thizCerts); + CodeSource that = new CodeSource(urlSite, thatCerts); // two CodeSource-s with different set of certificates assertTrue(thiz.implies(that)); Index: modules/security/test/common/unit/java/security/DigestExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/DigestExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/DigestExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not DigestException"; - static String createErr(Exception tE, Exception eE) { return "DigestException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/GeneralSecurityExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/GeneralSecurityExceptionTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/GeneralSecurityExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not GeneralSecurityException"; - static String createErr(Exception tE, Exception eE) { return "GeneralSecurityException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/IdentityTest.java =================================================================== --- modules/security/test/common/unit/java/security/IdentityTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/IdentityTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -163,7 +163,7 @@ try { i.addCertificate(new CertificateStub("ccc", null, null, new PublicKeyStub("k2", "fff", new byte[]{6,7,8,9,0}))); fail("KeyManagementException should be thrown"); - } catch (KeyManagementException ok) {}; + } catch (KeyManagementException ok) {} } /** @@ -353,7 +353,7 @@ try { i2.setPublicKey(null); //fail("KeyManagementException should be thrown - key is null"); - } catch (KeyManagementException ok) {}; + } catch (KeyManagementException ok) {} } // Index: modules/security/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not InvalidAlgorithmParameterException"; - static String createErr(Exception tE, Exception eE) { return "InvalidAlgorithmParameterException: ".concat(tE.toString()) .concat(" is not equal to caught exception: ").concat( Index: modules/security/test/common/unit/java/security/InvalidKeyExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/InvalidKeyExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/InvalidKeyExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not InvalidKeyException"; - static String createErr(Exception tE, Exception eE) { return "InvalidKeyException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/InvalidParameterExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/InvalidParameterExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/InvalidParameterExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not InvalidParameterException"; - static String createErr(Exception tE, Exception eE) { return "InvalidParameterException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/KSBuilderTest.java =================================================================== --- modules/security/test/common/unit/java/security/KSBuilderTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/KSBuilderTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -280,7 +280,7 @@ KeyStore.Builder ksB1; KeyStore ks = null; KeyStore ks1 = null; - ; + myProtectionParameter myPP = new myProtectionParameter(new byte[5]); // check exceptions try { Index: modules/security/test/common/unit/java/security/KSCallbackHandlerProtectionTest.java =================================================================== --- modules/security/test/common/unit/java/security/KSCallbackHandlerProtectionTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/KSCallbackHandlerProtectionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -62,8 +62,6 @@ public void testGetCallBackHandler() { CallbackHandler cbh = new tmpCallbackHandler(); KeyStore.CallbackHandlerProtection ksCBH = new KeyStore.CallbackHandlerProtection(cbh); - assertTrue("Not KeyStore.CallbackHandlerProtection object", - ksCBH instanceof KeyStore.CallbackHandlerProtection); assertEquals("Incorrect CallbackHandler", cbh, ksCBH.getCallbackHandler()); } Index: modules/security/test/common/unit/java/security/KSPasswordProtectionTest.java =================================================================== --- modules/security/test/common/unit/java/security/KSPasswordProtectionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/KSPasswordProtectionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -54,8 +54,6 @@ public void testGetPassword() throws DestroyFailedException { char [] pass = {'a', 'b', 'c'}; KeyStore.PasswordProtection ksPWP = new KeyStore.PasswordProtection(pass); - assertTrue("Not KeyStore.PasswordProtection object", - ksPWP instanceof KeyStore.PasswordProtection); char [] rPass = ksPWP.getPassword(); assertFalse("PasswordProtection Should not be descroyed", ksPWP.isDestroyed()); assertEquals("Incorrect password length", pass.length, rPass.length); Index: modules/security/test/common/unit/java/security/KeyExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/KeyExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/KeyExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not KeyException"; - static String createErr(Exception tE, Exception eE) { return "KeyException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/KeyManagementExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/KeyManagementExceptionTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/KeyManagementExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not KeyManagementException"; - static String createErr(Exception tE, Exception eE) { return "KeyManagementException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/KeyStoreExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/KeyStoreExceptionTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/KeyStoreExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not KeyStoreException"; - static String createErr(Exception tE, Exception eE) { return "KeyStoreException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/MessageDigestTest2.java =================================================================== --- modules/security/test/common/unit/java/security/MessageDigestTest2.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/MessageDigestTest2.java 2006-03-30 19:19:20.000000000 +0100 @@ -187,9 +187,6 @@ private void checkMD2(MessageDigest md2, Provider p) { byte[] b = {1, 2, 3, 4, 5}; - if (!(md2 instanceof MessageDigestSpi)) { - fail("getInstance() failed"); - } if (md2.getProvider() != p) { fail("getProvider() failed"); } Index: modules/security/test/common/unit/java/security/MyKeyStore.java =================================================================== --- modules/security/test/common/unit/java/security/MyKeyStore.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/MyKeyStore.java 2006-03-30 19:19:20.000000000 +0100 @@ -177,17 +177,17 @@ Enumeration e = Keys.keys(); while (e.hasMoreElements()) { alias = (String) e.nextElement(); - KeysSL.put(alias, (Key) Keys.get(alias)); - DatesSL.put(alias, (Date) Dates.get(alias)); + KeysSL.put(alias, Keys.get(alias)); + DatesSL.put(alias, Dates.get(alias)); if (Chain.containsKey(alias)) { - ChainSL.put(alias, (Certificate[]) Chain.get(alias)); + ChainSL.put(alias, Chain.get(alias)); } } e = Cert.keys(); while (e.hasMoreElements()) { alias = (String) e.nextElement(); - CertSL.put(alias, (Certificate) Cert.get(alias)); - DatesSL.put(alias, (Date) Dates.get(alias)); + CertSL.put(alias, Cert.get(alias)); + DatesSL.put(alias, Dates.get(alias)); } } @@ -201,17 +201,17 @@ Enumeration e = KeysSL.keys(); while (e.hasMoreElements()) { alias = (String) e.nextElement(); - Keys.put(alias, (Key) KeysSL.get(alias)); - Dates.put(alias, (Date) DatesSL.get(alias)); + Keys.put(alias, KeysSL.get(alias)); + Dates.put(alias, DatesSL.get(alias)); if (ChainSL.containsKey(alias)) { - Chain.put(alias, (Certificate[]) ChainSL.get(alias)); + Chain.put(alias, ChainSL.get(alias)); } } e = CertSL.keys(); while (e.hasMoreElements()) { alias = (String) e.nextElement(); - Cert.put(alias, (Certificate) CertSL.get(alias)); - Dates.put(alias, (Date) DatesSL.get(alias)); + Cert.put(alias, CertSL.get(alias)); + Dates.put(alias, DatesSL.get(alias)); } } Index: modules/security/test/common/unit/java/security/NoSuchAlgorithmExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/NoSuchAlgorithmExceptionTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/NoSuchAlgorithmExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not NoSuchAlgorithmException"; - static String createErr(Exception tE, Exception eE) { return "NoSuchAlgorithmException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/PermissionsTest.java =================================================================== --- modules/security/test/common/unit/java/security/PermissionsTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/PermissionsTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -190,7 +190,6 @@ */ public void testNull(){ Permissions ps = new Permissions(); - Permissions ps1 = new Permissions(); try { ps.elements().nextElement(); fail("should throw NoSuchElementException"); Index: modules/security/test/common/unit/java/security/PolicyTest.java =================================================================== --- modules/security/test/common/unit/java/security/PolicyTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/PolicyTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -25,7 +25,6 @@ import java.util.Enumeration; import java.util.HashSet; -import org.apache.harmony.security.fortress.DefaultPolicy; import junit.framework.TestCase; import org.apache.harmony.security.test.SecurityChecker; Index: modules/security/test/common/unit/java/security/ProtectionDomainTest.java =================================================================== --- modules/security/test/common/unit/java/security/ProtectionDomainTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/ProtectionDomainTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -251,7 +251,7 @@ boolean getPdTracked() { return pdTracked; - }; + } public PermissionCollection getPermissions(CodeSource cs) { return new Permissions(); Index: modules/security/test/common/unit/java/security/ProviderExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/ProviderExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/ProviderExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not ProviderException"; - static String createErr(Exception tE, Exception eE) { return "ProviderException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/SecureRandomTest1.java =================================================================== --- modules/security/test/common/unit/java/security/SecureRandomTest1.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/SecureRandomTest1.java 2006-03-30 19:19:20.000000000 +0100 @@ -96,7 +96,7 @@ */ public final void testSecureRandombyteArray() { byte[] b = {1,2,3}; - SecureRandom sr = new SecureRandom(b); + new SecureRandom(b); if (!RandomImpl.runEngineSetSeed) { fail("No setSeed"); } Index: modules/security/test/common/unit/java/security/SecureRandomTest2.java =================================================================== --- modules/security/test/common/unit/java/security/SecureRandomTest2.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/SecureRandomTest2.java 2006-03-30 19:19:20.000000000 +0100 @@ -21,6 +21,7 @@ package java.security; +import java.util.Arrays; import java.util.Random; import junit.framework.TestCase; @@ -87,11 +88,15 @@ * Class under test for void SecureRandom() */ public final void testSecureRandom() { - SecureRandom sr = new SecureRandom(); - Random r = new Random(0); - sr.setSeed(0); - byte[] b1 = new byte[8]; - sr.nextBytes(b1); + SecureRandom sr = new SecureRandom(); + Random r = new Random(); + byte[] b1 = new byte[8]; + byte[] b2 = new byte[8]; + sr.nextBytes(b1); + r.nextBytes(b2); + if (!Arrays.equals(b1, b2)) { + fail("incorrect random bytes"); + } } /* @@ -110,11 +115,9 @@ byte[] b2 = new byte[8]; sr.nextBytes(b1); r.nextBytes(b2); - for (int i = 0; i < b1.length; i++) { - if (b1[i] != b2[i]) { - fail("incorrect random bytes"); - } - } + if (!Arrays.equals(b1, b2)) { + fail("incorrect random bytes"); + } } Index: modules/security/test/common/unit/java/security/SignatureExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/SignatureExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/SignatureExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SignatureException"; - static String createErr(Exception tE, Exception eE) { return "SignatureException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/SignatureTest2.java =================================================================== --- modules/security/test/common/unit/java/security/SignatureTest2.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/SignatureTest2.java 2006-03-30 19:19:20.000000000 +0100 @@ -255,9 +255,6 @@ private void checkSig2(Signature s, Provider p) { byte[] b = {1, 2, 3, 4}; - if (!(s instanceof SignatureSpi)) { - fail("getInstance() failed"); - } if (s.getProvider() != p) { fail("getProvider() failed"); } Index: modules/security/test/common/unit/java/security/SignedObjectTest.java =================================================================== --- modules/security/test/common/unit/java/security/SignedObjectTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/SignedObjectTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -70,7 +70,7 @@ assertEquals("SHA1withDSA", so.getAlgorithm()); try { - assertEquals((Properties)so.getObject(), prop); + assertEquals(so.getObject(), prop); } catch (ClassNotFoundException e) { fail(e.toString()); } catch (IOException e) { Index: modules/security/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -56,7 +56,6 @@ */ public void testUnrecoverableEntryException() { UnrecoverableEntryException tE = new UnrecoverableEntryException(); - assertTrue(errNotExc, tE instanceof UnrecoverableEntryException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -73,8 +72,6 @@ UnrecoverableEntryException tE; for (int i = 0; i < msgs.length; i++) { tE = new UnrecoverableEntryException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof UnrecoverableEntryException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); Index: modules/security/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java.orig 2006-03-20 18:37:39.000000000 +0000 +++ modules/security/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not UnrecoverableKeyException"; - static String createErr(Exception tE, Exception eE) { return "UnrecoverableKeyException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CRLExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CRLExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CRLExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CRLException"; - static String createErr(Exception tE, Exception eE) { return "CRLException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertPathBuilder1Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathBuilder1Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathBuilder1Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -151,7 +151,6 @@ } for (int i = 0; i < validValues.length; i++) { CertPathBuilder cpb = CertPathBuilder.getInstance(validValues[i]); - assertTrue("Not CertPathBuilder object", cpb instanceof CertPathBuilder); assertEquals("Incorrect algorithm", cpb.getAlgorithm(), validValues[i]); } } @@ -243,7 +242,6 @@ CertPathBuilder certPB; for (int i = 0; i < validValues.length; i++) { certPB = CertPathBuilder.getInstance(validValues[i], defaultProviderName); - assertTrue("Not CertPathBuilder object", certPB instanceof CertPathBuilder); assertEquals("Incorrect algorithm", certPB.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider name", certPB.getProvider().getName(), defaultProviderName); } @@ -308,7 +306,6 @@ CertPathBuilder certPB; for (int i = 0; i < invalidValues.length; i++) { certPB = CertPathBuilder.getInstance(validValues[i], defaultProvider); - assertTrue("Not CertPathBuilder object", certPB instanceof CertPathBuilder); assertEquals("Incorrect algorithm", certPB.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider name", certPB.getProvider(), defaultProvider); } @@ -350,7 +347,6 @@ CertPathBuilderSpi spi = new MyCertPathBuilderSpi(); CertPathBuilder certPB = new myCertPathBuilder(spi, defaultProvider, defaultType); - assertTrue("Not CertPathBuilder object", certPB instanceof CertPathBuilder); assertEquals("Incorrect algorithm", certPB.getAlgorithm(), defaultType); assertEquals("Incorrect provider", certPB.getProvider(), defaultProvider); try { @@ -359,7 +355,6 @@ } catch (CertPathBuilderException e) { } certPB = new myCertPathBuilder(null, null, null); - assertTrue("Not CertPathBuilder object", certPB instanceof CertPathBuilder); assertNull("Incorrect algorithm", certPB.getAlgorithm()); assertNull("Incorrect provider", certPB.getProvider()); try { Index: modules/security/test/common/unit/java/security/cert/CertPathBuilder2Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathBuilder2Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathBuilder2Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -132,8 +132,6 @@ CertPathBuilder cerPB; for (int i = 0; i < validValues.length; i++) { cerPB = CertPathBuilder.getInstance(validValues[i]); - assertTrue("Not instanceof CertPathBuilder object", - cerPB instanceof CertPathBuilder); assertEquals("Incorrect type", cerPB.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", cerPB.getProvider(), mProv); checkResult(cerPB); @@ -198,8 +196,6 @@ for (int i = 0; i < validValues.length; i++) { cerPB = CertPathBuilder.getInstance(validValues[i], mProv .getName()); - assertTrue("Not instanceof CertPathBuilder object", - cerPB instanceof CertPathBuilder); assertEquals("Incorrect type", cerPB.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", cerPB.getProvider().getName(), mProv.getName()); @@ -244,8 +240,6 @@ CertPathBuilder cerPB; for (int i = 0; i < validValues.length; i++) { cerPB = CertPathBuilder.getInstance(validValues[i], mProv); - assertTrue("Not instanceof CertPathBuilder object", - cerPB instanceof CertPathBuilder); assertEquals("Incorrect type", cerPB.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", cerPB.getProvider(), mProv); checkResult(cerPB); Index: modules/security/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertPathBuilderException"; - static String createErr(Exception tE, Exception eE) { return "CertPathBuilderException ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertPathBuilderSpiTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathBuilderSpiTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathBuilderSpiTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -46,8 +46,7 @@ */ public void testCertPathBuilderSpi01() throws CertPathBuilderException, InvalidAlgorithmParameterException { - CertPathBuilderSpi certPathBuilder = (CertPathBuilderSpi) new MyCertPathBuilderSpi(); - assertTrue(certPathBuilder instanceof CertPathBuilderSpi); + CertPathBuilderSpi certPathBuilder = new MyCertPathBuilderSpi(); CertPathParameters cpp = null; try { certPathBuilder.engineBuild(cpp); Index: modules/security/test/common/unit/java/security/cert/CertPathValidator1Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathValidator1Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathValidator1Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -156,7 +156,6 @@ CertPathValidator certPV; for (int i = 0; i < validValues.length; i++) { certPV = CertPathValidator.getInstance(validValues[i]); - assertTrue("Not CertPathValidator object", certPV instanceof CertPathValidator); assertEquals("Incorrect algorithm", certPV.getAlgorithm(), validValues[i]); } } @@ -248,8 +247,6 @@ for (int i = 0; i < validValues.length; i++) { certPV = CertPathValidator.getInstance(validValues[i], defaultProviderName); - assertTrue("Not CertPathValidator object", - certPV instanceof CertPathValidator); assertEquals("Incorrect algorithm", certPV.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider name", certPV.getProvider() @@ -317,8 +314,6 @@ for (int i = 0; i < invalidValues.length; i++) { certPV = CertPathValidator.getInstance(validValues[i], defaultProvider); - assertTrue("Not CertPathValidator object", - certPV instanceof CertPathValidator); assertEquals("Incorrect algorithm", certPV.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider name", certPV.getProvider(), @@ -370,7 +365,6 @@ CertPathValidatorSpi spi = new MyCertPathValidatorSpi(); CertPathValidator certPV = new myCertPathValidator(spi, defaultProvider, defaultType); - assertTrue("Not CertPathValidator object", certPV instanceof CertPathValidator); assertEquals("Incorrect algorithm", certPV.getAlgorithm(), defaultType); assertEquals("Incorrect provider", certPV.getProvider(), defaultProvider); certPV.validate(null, null); @@ -380,7 +374,6 @@ } catch (CertPathValidatorException e) { } certPV = new myCertPathValidator(null, null, null); - assertTrue("Not CertPathValidator object", certPV instanceof CertPathValidator); assertEquals("Incorrect algorithm", certPV.getAlgorithm(), null); assertEquals("Incorrect provider", certPV.getProvider(), null); try { Index: modules/security/test/common/unit/java/security/cert/CertPathValidator2Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathValidator2Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathValidator2Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -130,8 +130,6 @@ CertPathValidator cerPV; for (int i = 0; i < validValues.length; i++) { cerPV = CertPathValidator.getInstance(validValues[i]); - assertTrue("Not instanceof CertPathValidator object", - cerPV instanceof CertPathValidator); assertEquals("Incorrect type", cerPV.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", cerPV.getProvider(), mProv); checkResult(cerPV); @@ -196,8 +194,6 @@ for (int i = 0; i < validValues.length; i++) { cerPV = CertPathValidator.getInstance(validValues[i], mProv .getName()); - assertTrue("Not instanceof CertPathValidator object", - cerPV instanceof CertPathValidator); assertEquals("Incorrect type", cerPV.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", cerPV.getProvider().getName(), mProv.getName()); @@ -243,8 +239,6 @@ CertPathValidator cerPV; for (int i = 0; i < validValues.length; i++) { cerPV = CertPathValidator.getInstance(validValues[i], mProv); - assertTrue("Not instanceof CertPathValidator object", - cerPV instanceof CertPathValidator); assertEquals("Incorrect type", cerPV.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", cerPV.getProvider(), mProv); checkResult(cerPV); Index: modules/security/test/common/unit/java/security/cert/CertPathValidator3Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathValidator3Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathValidator3Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -47,9 +47,6 @@ super(name); } private static final String defaultType = CertPathBuilder1Test.defaultType; - private static final String [] validValues = CertPathBuilder1Test.validValues; - - private static String [] invalidValues = SpiEngUtils.invalidValues; private static boolean PKIXSupport = false; @@ -99,7 +96,7 @@ return; } MyCertPath mCP = new MyCertPath(new byte[0]); - CertPathParameters params = (CertPathParameters)new PKIXParameters(TestUtils.getTrustAnchorSet()); + CertPathParameters params = new PKIXParameters(TestUtils.getTrustAnchorSet()); CertPathValidator [] certPV = createCPVs(); assertNotNull("CertPathValidator objects were not created", certPV); for (int i = 0; i < certPV.length; i++) { Index: modules/security/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -67,8 +67,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertPathValidatorException"; - static String createErr(Exception tE, Exception eE) { return "CertPathValidatorException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertPathValidatorSpiTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertPathValidatorSpiTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertPathValidatorSpiTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -46,9 +46,7 @@ */ public void testCertPathValidatorSpi01() throws CertPathValidatorException, InvalidAlgorithmParameterException { - CertPathValidatorSpi certPathValid = - (CertPathValidatorSpi) new MyCertPathValidatorSpi(); - assertTrue(certPathValid instanceof CertPathValidatorSpi); + CertPathValidatorSpi certPathValid = new MyCertPathValidatorSpi(); CertPathParameters params = null; CertPath certPath = null; CertPathValidatorResult cpvResult = certPathValid.engineValidate( Index: modules/security/test/common/unit/java/security/cert/CertStore1Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertStore1Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertStore1Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -52,7 +52,7 @@ private static final String defaultType = "LDAP"; public static final String [] validValues = { - "LDAP", "ldap", "Ldap", "lDAP", "lDaP" };; + "LDAP", "ldap", "Ldap", "lDAP", "lDaP" }; public static String [] validValuesC = null; private static String [] invalidValues = SpiEngUtils.invalidValues; @@ -67,16 +67,12 @@ private static String defaultProviderColName; private static String NotSupportMsg = ""; - private static String NotSLDAP = ""; - private static String NotSColl = ""; static { defaultProvider = SpiEngUtils.isSupport(defaultType, srvCertStore); LDAPSupport = (defaultProvider != null); defaultProviderName = (LDAPSupport ? defaultProvider.getName() : null); NotSupportMsg = "LDAP and Collection algorithm are not supported"; - NotSLDAP = "LDAP is not supported"; - NotSColl = "Collection is not supported"; defaultProviderCol = SpiEngUtils.isSupport(CollectionType, srvCertStore); @@ -163,7 +159,6 @@ MyCertStoreParameters pp = new MyCertStoreParameters(); CertStoreSpi spi = new MyCertStoreSpi(pp); CertStore certS = new myCertStore(spi, dProv, dType, pp); - assertTrue("Not CertStore object", certS instanceof CertStore); assertEquals("Incorrect algorithm", certS.getType(), dType); assertEquals("Incorrect provider", certS.getProvider(), dProv); assertTrue("Incorrect parameters", certS.getCertStoreParameters() @@ -174,7 +169,6 @@ } catch (CertStoreException e) { } certS = new myCertStore(null, null, null, null); - assertTrue("Not CertStore object", certS instanceof CertStore); assertNull("Incorrect algorithm", certS.getType()); assertNull("Incorrect provider", certS.getProvider()); assertNull("Incorrect parameters", certS.getCertStoreParameters()); @@ -222,7 +216,7 @@ CertStoreParameters paramsContr = null; if (CollectionSupport) { if (LDAPSupport) { - paramsContr = (CertStoreParameters)new LDAPCertStoreParameters(); + paramsContr = new LDAPCertStoreParameters(); } } for (int i = 0; i < dValid.length; i++ ) { @@ -253,10 +247,8 @@ CertStore certS; for (int i = 0; i < dValid.length; i++) { certS = CertStore.getInstance(dValid[i], dParams); - assertTrue("Not CertStore object", certS instanceof CertStore); assertEquals("Incorrect type", certS.getType(), dValid[i]); - assertTrue("Incorrect parameters", certS.getCertStoreParameters() - instanceof CertStoreParameters); + certS.getCertStoreParameters(); } } /** @@ -349,7 +341,7 @@ CertStoreParameters paramsContr = null; if (CollectionSupport) { if (LDAPSupport) { - paramsContr = (CertStoreParameters)new LDAPCertStoreParameters(); + paramsContr = new LDAPCertStoreParameters(); } } for (int i = 0; i < dValid.length; i++ ) { @@ -380,10 +372,8 @@ CertStore certS; for (int i = 0; i < dValid.length; i++) { certS = CertStore.getInstance(dValid[i], dParams, dName); - assertTrue("Not CertStore object", certS instanceof CertStore); assertEquals("Incorrect type", certS.getType(), dValid[i]); - assertTrue("Incorrect parameters", certS.getCertStoreParameters() - instanceof CertStoreParameters); + certS.getCertStoreParameters(); } } @@ -448,7 +438,7 @@ CertStoreParameters paramsContr = null; if (CollectionSupport) { if (LDAPSupport) { - paramsContr = (CertStoreParameters)new LDAPCertStoreParameters(); + paramsContr = new LDAPCertStoreParameters(); } } for (int i = 0; i < dValid.length; i++ ) { @@ -479,10 +469,8 @@ CertStore certS; for (int i = 0; i < dValid.length; i++) { certS = CertStore.getInstance(dValid[i], dParams, dProv); - assertTrue("Not CertStore object", certS instanceof CertStore); assertEquals("Incorrect type", certS.getType(), dValid[i]); - assertTrue("Incorrect parameters", certS.getCertStoreParameters() - instanceof CertStoreParameters); + certS.getCertStoreParameters(); } } /** Index: modules/security/test/common/unit/java/security/cert/CertStore2Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertStore2Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertStore2Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -135,8 +135,6 @@ CertStore certS; for (int i = 0; i < validValues.length; i++) { certS = CertStore.getInstance(validValues[i], p); - assertTrue("Not instanceof CertStore object", - certS instanceof CertStore); assertEquals("Incorrect type", certS.getType(), validValues[i]); assertEquals("Incorrect provider", certS.getProvider(), mProv); assertTrue("Invalid parameters",certS.getCertStoreParameters() instanceof MyCertStoreParameters); @@ -218,8 +216,6 @@ for (int i = 0; i < validValues.length; i++) { certS = CertStore.getInstance(validValues[i], p, mProv .getName()); - assertTrue("Not instanceof CertStore object", - certS instanceof CertStore); assertEquals("Incorrect type", certS.getType(), validValues[i]); assertEquals("Incorrect provider", certS.getProvider().getName(), mProv.getName()); @@ -281,8 +277,6 @@ CertStore certS; for (int i = 0; i < validValues.length; i++) { certS = CertStore.getInstance(validValues[i], p, mProv); - assertTrue("Not instanceof CertStore object", - certS instanceof CertStore); assertEquals("Incorrect type", certS.getType(), validValues[i]); assertEquals("Incorrect provider", certS.getProvider(), mProv); assertTrue("Invalid parameters",certS.getCertStoreParameters() instanceof MyCertStoreParameters); @@ -305,7 +299,7 @@ return null; } try { - return (Object)super.clone(); + return super.clone(); } catch (CloneNotSupportedException e) { return null; } Index: modules/security/test/common/unit/java/security/cert/CertStoreExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertStoreExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertStoreExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertStoreException"; - static String createErr(Exception tE, Exception eE) { return "CertStoreException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertStoreSpiTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertStoreSpiTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertStoreSpiTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -56,14 +56,11 @@ // X509CertSelector(); CRLSelector crlSelector = new tmpCRLSelector();//new X509CRLSelector(); try { - certStoreSpi = (CertStoreSpi) new MyCertStoreSpi(null); + certStoreSpi = new MyCertStoreSpi(null); fail("InvalidAlgorithmParameterException must be thrown"); } catch (InvalidAlgorithmParameterException e) { } - certStoreSpi = (CertStoreSpi) new MyCertStoreSpi( - (CertStoreParameters) new MyCertStoreParameters()); - assertTrue("Not CertStoreSpi object", - certStoreSpi instanceof CertStoreSpi); + certStoreSpi = new MyCertStoreSpi(new MyCertStoreParameters()); assertNull("Not null collection", certStoreSpi .engineGetCertificates(certSelector)); assertNull("Not null collection", certStoreSpi Index: modules/security/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateEncodingException"; - static String createErr(Exception tE, Exception eE) { return "CertificateEncodingException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertificateExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateException"; - static String createErr(Exception tE, Exception eE) { return "CertificateException ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateExpiredException"; - static String createErr(Exception tE, Exception eE) { return "CertificateExpiredException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/CertificateFactory2Test.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateFactory2Test.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateFactory2Test.java 2006-03-30 19:19:20.000000000 +0100 @@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; -import java.io.InputStream; import java.security.NoSuchProviderException; import java.security.Provider; import java.security.Security; @@ -91,12 +90,12 @@ ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); DataInputStream dis = new DataInputStream(bais); try { - certFactory.generateCertPath((InputStream) bais); + certFactory.generateCertPath(bais); fail("CertificateException must be thrown"); } catch (CertificateException e) { } try { - certFactory.generateCertPath((InputStream) dis); + certFactory.generateCertPath(dis); if (!mode) { fail("CertificateException must be thrown because encodings list is empty"); } @@ -106,12 +105,12 @@ } } try { - certFactory.generateCertPath((InputStream) bais, "aa"); + certFactory.generateCertPath(bais, "aa"); fail("CertificateException must be thrown"); } catch (CertificateException e) { } try { - certFactory.generateCertPath((InputStream) dis, ""); + certFactory.generateCertPath(dis, ""); if (mode) { fail("IllegalArgumentException must be thrown"); } @@ -120,10 +119,10 @@ fail("Unexpected IllegalArgumentException was thrown"); } } - certFactory.generateCertPath((InputStream) dis, "ss"); + certFactory.generateCertPath(dis, "ss"); try { - certFactory.generateCertificate((InputStream) bais); + certFactory.generateCertificate(bais); fail("CertificateException must be thrown"); } catch (CertificateException e) { } @@ -132,13 +131,13 @@ fail("CertificateException must be thrown"); } catch (CertificateException e) { } - Certificate cert = certFactory.generateCertificate((InputStream) dis); + Certificate cert = certFactory.generateCertificate(dis); assertNull("Result must be null", cert); - Collection col = certFactory.generateCertificates((InputStream) dis); + Collection col = certFactory.generateCertificates(dis); assertNull("Result must be null", col); try { - certFactory.generateCRL((InputStream) bais); + certFactory.generateCRL(bais); fail("CRLException must be thrown"); } catch (CRLException e) { } @@ -147,9 +146,9 @@ fail("CRLException must be thrown"); } catch (CRLException e) { } - CRL crl = certFactory.generateCRL((InputStream) dis); + CRL crl = certFactory.generateCRL(dis); assertNull("Result must be null", crl); - col = certFactory.generateCRLs((InputStream) dis); + col = certFactory.generateCRLs(dis); assertNull("Result must be null", col); List list = null; @@ -167,7 +166,6 @@ } } Iterator it = certFactory.getCertPathEncodings(); - assertTrue("Not Iterator object", it instanceof Iterator); if (mode) { assertTrue(it.hasNext()); } else { @@ -200,8 +198,6 @@ CertificateFactory cerF; for (int i = 0; i < validValues.length; i++) { cerF = CertificateFactory.getInstance(validValues[i]); - assertTrue("Not instanceof CertificateFactory object", - cerF instanceof CertificateFactory); assertEquals("Incorrect type", cerF.getType(), validValues[i]); assertEquals("Incorrect provider", cerF.getProvider(), mProv); checkResult(cerF, mode); @@ -265,8 +261,6 @@ for (int i = 0; i < validValues.length; i++) { cerF = CertificateFactory.getInstance(validValues[i], mProv .getName()); - assertTrue("Not instanceof CertificateFactory object", - cerF instanceof CertificateFactory); assertEquals("Incorrect type", cerF.getType(), validValues[i]); assertEquals("Incorrect provider", cerF.getProvider().getName(), mProv.getName()); @@ -311,8 +305,6 @@ CertificateFactory cerF; for (int i = 0; i < validValues.length; i++) { cerF = CertificateFactory.getInstance(validValues[i], mProv); - assertTrue("Not instanceof CertificateFactory object", - cerF instanceof CertificateFactory); assertEquals("Incorrect type", cerF.getType(), validValues[i]); assertEquals("Incorrect provider", cerF.getProvider(), mProv); checkResult(cerF, mode); Index: modules/security/test/common/unit/java/security/cert/CertificateFactorySpiTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateFactorySpiTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateFactorySpiTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -52,16 +52,15 @@ */ public void testCertificateFactorySpi01() throws CertificateException, CRLException { - CertificateFactorySpi certFactorySpi = (CertificateFactorySpi) new extCertificateFactorySpi(); - assertTrue(certFactorySpi instanceof CertificateFactorySpi); + CertificateFactorySpi certFactorySpi = new extCertificateFactorySpi(); ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); try { - certFactorySpi.engineGenerateCertPath((InputStream) bais); + certFactorySpi.engineGenerateCertPath(bais); fail("UnsupportedOperationException must be thrown"); } catch (UnsupportedOperationException e) { } try { - certFactorySpi.engineGenerateCertPath((InputStream) bais, ""); + certFactorySpi.engineGenerateCertPath(bais, ""); fail("UnsupportedOperationException must be thrown"); } catch (UnsupportedOperationException e) { } @@ -77,7 +76,7 @@ } catch (UnsupportedOperationException e) { } Certificate cc = certFactorySpi - .engineGenerateCertificate((InputStream) bais); + .engineGenerateCertificate(bais); assertNull("Not null Cerificate", cc); try { certFactorySpi.engineGenerateCertificate(null); @@ -85,7 +84,7 @@ } catch (CertificateException e) { } Collection col = certFactorySpi - .engineGenerateCertificates((InputStream) bais); + .engineGenerateCertificates(bais); assertNull("Not null Collection", col); try { certFactorySpi.engineGenerateCertificates(null); @@ -93,7 +92,7 @@ } catch (CertificateException e) { } - CRL ccCRL = certFactorySpi.engineGenerateCRL((InputStream) bais); + CRL ccCRL = certFactorySpi.engineGenerateCRL(bais); assertNull("Not null CRL", ccCRL); try { certFactorySpi.engineGenerateCRL(null); @@ -102,7 +101,7 @@ } Collection colCRL = certFactorySpi - .engineGenerateCRLs((InputStream) bais); + .engineGenerateCRLs(bais); assertNull("Not null CRL", colCRL); try { certFactorySpi.engineGenerateCRLs(null); @@ -117,31 +116,30 @@ */ public void testCertificateFactorySpi02() throws CertificateException, CRLException { - CertificateFactorySpi certFactorySpi = (CertificateFactorySpi) new MyCertificateFactorySpi(); + CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); MyCertificateFactorySpi.putMode(true); - assertTrue(certFactorySpi instanceof CertificateFactorySpi); ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); DataInputStream dis = new DataInputStream(bais); try { - certFactorySpi.engineGenerateCertPath((InputStream) bais); + certFactorySpi.engineGenerateCertPath(bais); fail("CertificateException must be thrown"); } catch (CertificateException e) { } - certFactorySpi.engineGenerateCertPath((InputStream) dis); + certFactorySpi.engineGenerateCertPath(dis); try { - certFactorySpi.engineGenerateCertPath((InputStream) bais, "aa"); + certFactorySpi.engineGenerateCertPath(bais, "aa"); fail("CertificateException must be thrown"); } catch (CertificateException e) { } try { - certFactorySpi.engineGenerateCertPath((InputStream) dis, ""); + certFactorySpi.engineGenerateCertPath(dis, ""); fail("IllegalArgumentException must be thrown"); } catch (IllegalArgumentException e) { } - certFactorySpi.engineGenerateCertPath((InputStream) dis, "ss"); + certFactorySpi.engineGenerateCertPath(dis, "ss"); try { - certFactorySpi.engineGenerateCertificate((InputStream) bais); + certFactorySpi.engineGenerateCertificate(bais); fail("CertificateException must be thrown"); } catch (CertificateException e) { } @@ -151,14 +149,14 @@ } catch (CertificateException e) { } Certificate cert = certFactorySpi - .engineGenerateCertificate((InputStream) dis); + .engineGenerateCertificate(dis); assertNull("Result must be null", cert); Collection col = certFactorySpi - .engineGenerateCertificates((InputStream) dis); + .engineGenerateCertificates(dis); assertNull("Result must be null", col); try { - certFactorySpi.engineGenerateCRL((InputStream) bais); + certFactorySpi.engineGenerateCRL(bais); fail("CRLException must be thrown"); } catch (CRLException e) { } @@ -167,9 +165,9 @@ fail("CRLException must be thrown"); } catch (CRLException e) { } - CRL crl = certFactorySpi.engineGenerateCRL((InputStream) dis); + CRL crl = certFactorySpi.engineGenerateCRL(dis); assertNull("Result must be null", crl); - col = certFactorySpi.engineGenerateCRLs((InputStream) dis); + col = certFactorySpi.engineGenerateCRLs(dis); assertNull("Result must be null", col); List list = null; @@ -179,7 +177,6 @@ } catch (NullPointerException e) { } Iterator enc = certFactorySpi.engineGetCertPathEncodings(); - assertTrue("Not Iterator object", enc instanceof Iterator); assertTrue("Incorrect Iterator", enc.hasNext()); } @@ -189,31 +186,30 @@ */ public void testCertificateFactorySpi03() throws CertificateException, CRLException { - CertificateFactorySpi certFactorySpi = (CertificateFactorySpi) new MyCertificateFactorySpi(); + CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); MyCertificateFactorySpi.putMode(false); - assertTrue(certFactorySpi instanceof CertificateFactorySpi); ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); DataInputStream dis = new DataInputStream(bais); try { - certFactorySpi.engineGenerateCertPath((InputStream) bais); + certFactorySpi.engineGenerateCertPath(bais); fail("CertificateException must be thrown"); } catch (CertificateException e) { } try { - certFactorySpi.engineGenerateCertPath((InputStream) dis); + certFactorySpi.engineGenerateCertPath(dis); fail("CertificateException must be thrown"); } catch (CertificateException e) { } try { - certFactorySpi.engineGenerateCertPath((InputStream) bais, "aa"); + certFactorySpi.engineGenerateCertPath(bais, "aa"); fail("CertificateException must be thrown"); } catch (CertificateException e) { } - certFactorySpi.engineGenerateCertPath((InputStream) dis, ""); - certFactorySpi.engineGenerateCertPath((InputStream) dis, "ss"); + certFactorySpi.engineGenerateCertPath(dis, ""); + certFactorySpi.engineGenerateCertPath(dis, "ss"); try { - certFactorySpi.engineGenerateCertificate((InputStream) bais); + certFactorySpi.engineGenerateCertificate(bais); fail("CertificateException must be thrown"); } catch (CertificateException e) { } @@ -223,14 +219,14 @@ } catch (CertificateException e) { } Certificate cert = certFactorySpi - .engineGenerateCertificate((InputStream) dis); + .engineGenerateCertificate(dis); assertNull("Result must be null", cert); Collection col = certFactorySpi - .engineGenerateCertificates((InputStream) dis); + .engineGenerateCertificates(dis); assertNull("Result must be null", col); try { - certFactorySpi.engineGenerateCRL((InputStream) bais); + certFactorySpi.engineGenerateCRL(bais); fail("CRLException must be thrown"); } catch (CRLException e) { } @@ -239,15 +235,14 @@ fail("CRLException must be thrown"); } catch (CRLException e) { } - CRL crl = certFactorySpi.engineGenerateCRL((InputStream) dis); + CRL crl = certFactorySpi.engineGenerateCRL(dis); assertNull("Result must be null", crl); - col = certFactorySpi.engineGenerateCRLs((InputStream) dis); + col = certFactorySpi.engineGenerateCRLs(dis); assertNull("Result must be null", col); List list = null; certFactorySpi.engineGenerateCertPath(list); Iterator enc = certFactorySpi.engineGetCertPathEncodings(); - assertTrue("Not Iterator object", enc instanceof Iterator); assertFalse("Incorrect Iterator", enc.hasNext()); } Index: modules/security/test/common/unit/java/security/cert/CertificateNotYetValidExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateNotYetValidExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateNotYetValidExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateNotYetValidException"; - static String createErr(Exception tE, Exception eE) { return "CertificateNotYetValidException: ".concat(tE.toString()) .concat(" is not equal to caught exception: ").concat( Index: modules/security/test/common/unit/java/security/cert/CertificateParsingExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/CertificateParsingExceptionTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/CertificateParsingExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateParsingException"; - static String createErr(Exception tE, Exception eE) { return "CertificateParsingException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/cert/MyCertStoreParameters.java =================================================================== --- modules/security/test/common/unit/java/security/cert/MyCertStoreParameters.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/MyCertStoreParameters.java 2006-03-30 19:19:20.000000000 +0100 @@ -32,7 +32,7 @@ } public Object clone() { try { - return (Object)super.clone(); + return super.clone(); } catch (CloneNotSupportedException e) { return null; } Index: modules/security/test/common/unit/java/security/cert/X509CRLSelectorTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/X509CRLSelectorTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/X509CRLSelectorTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -29,23 +29,20 @@ import java.security.Principal; import java.security.PublicKey; import java.security.SignatureException; -import java.security.cert.CRLException; -import java.security.cert.X509CRLEntry; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Set; -import javax.security.auth.x500.X500Principal; -import org.apache.harmony.security.asn1.ASN1Integer; -import org.apache.harmony.security.asn1.ASN1OctetString; - -import org.apache.harmony.security.asn1.*; +import javax.security.auth.x500.X500Principal; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1OctetString; + /** */ @@ -568,7 +565,7 @@ X509CRLSelector selector = new X509CRLSelector(); X500Principal iss1 = new X500Principal("O=First Org."); X500Principal iss2 = new X500Principal("O=Second Org."); - X500Principal iss3 = new X500Principal("O=Third Org."); + new X500Principal("O=Third Org."); BigInteger minCRL = new BigInteger("10000"); BigInteger maxCRL = new BigInteger("10000"); Date date = new Date(200); Index: modules/security/test/common/unit/java/security/cert/X509CertSelectorTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/X509CertSelectorTest.java.orig 2006-03-24 07:43:55.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/X509CertSelectorTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -29,21 +29,21 @@ import java.security.Principal; import java.security.PublicKey; import java.security.SignatureException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Date; -import java.util.Set; import java.util.HashSet; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.List; import java.util.Iterator; -import java.util.Collection; +import java.util.List; +import java.util.Set; + import javax.security.auth.x500.X500Principal; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.harmony.security.TestKeyPair; import org.apache.harmony.security.asn1.ASN1Boolean; import org.apache.harmony.security.asn1.ASN1Integer; @@ -51,15 +51,24 @@ import org.apache.harmony.security.asn1.ASN1Oid; import org.apache.harmony.security.asn1.ASN1Sequence; import org.apache.harmony.security.asn1.ASN1Type; - -import org.apache.harmony.security.asn1.*; import org.apache.harmony.security.x501.Name; -import org.apache.harmony.security.x509.*; - - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.apache.harmony.security.x509.AlgorithmIdentifier; +import org.apache.harmony.security.x509.CertificatePolicies; +import org.apache.harmony.security.x509.EDIPartyName; +import org.apache.harmony.security.x509.Extension; +import org.apache.harmony.security.x509.Extensions; +import org.apache.harmony.security.x509.GeneralName; +import org.apache.harmony.security.x509.GeneralNames; +import org.apache.harmony.security.x509.GeneralSubtree; +import org.apache.harmony.security.x509.GeneralSubtrees; +import org.apache.harmony.security.x509.NameConstraints; +import org.apache.harmony.security.x509.ORAddress; +import org.apache.harmony.security.x509.OtherName; +import org.apache.harmony.security.x509.PolicyInformation; +import org.apache.harmony.security.x509.PrivateKeyUsagePeriod; +import org.apache.harmony.security.x509.SubjectPublicKeyInfo; +import org.apache.harmony.security.x509.TBSCertificate; +import org.apache.harmony.security.x509.Validity; /** * X509CertSelectorTest @@ -90,79 +99,79 @@ protected NameConstraints nameConstraints = null; /* Stuff methods */ - public TestCert() {}; + public TestCert() {} public TestCert(GeneralNames sans) { setSubjectAlternativeNames(sans); - }; + } public TestCert(NameConstraints nameConstraints) { this.nameConstraints = nameConstraints; - }; + } public TestCert(String equalCriteria) { setEqualCriteria(equalCriteria); - }; + } public TestCert(String[] policies) { setPolicies(policies); - }; + } public TestCert(BigInteger serial) { setSerialNumber(serial); - }; + } public TestCert(X500Principal principal) { setIssuer(principal); setSubject(principal); - }; + } public TestCert(byte[] array) { setKeyIdentifier(array); - }; + } public TestCert(Date date) { setDate(date); - }; + } public TestCert(Date notBefore, Date notAfter) { setPeriod(notBefore, notAfter); - }; + } public TestCert(PublicKey key) { setPublicKey(key); - }; + } public TestCert(boolean[] keyUsage) { setKeyUsage(keyUsage); - }; + } public TestCert(Set extKeyUsage) { setExtendedKeyUsage(extKeyUsage); - }; + } public TestCert(int pathLen) { this.pathLen = pathLen; - }; + } public void setPolicies(String[] policies) { this.policies = policies; - }; + } public void setSubjectAlternativeNames(GeneralNames sans) { this.sans = sans; - }; + } public void setExtendedKeyUsage(Set extKeyUsage) { this.extKeyUsage = (extKeyUsage == null) ? null : new ArrayList(extKeyUsage); - }; + } public void setKeyUsage(boolean[] keyUsage) { this.keyUsage = (keyUsage == null) ? null : (boolean[]) keyUsage.clone(); - }; + } public void setPublicKey(PublicKey key) { this.key = key; @@ -175,7 +184,7 @@ public void setSerialNumber(BigInteger serial) { this.serialNumber = serial; - }; + } public void setEqualCriteria(String equalCriteria) { this.equalCriteria = equalCriteria; @@ -222,7 +231,7 @@ } public void checkValidity() throws CertificateExpiredException, - CertificateNotYetValidException {}; + CertificateNotYetValidException {} public void checkValidity(Date date) throws CertificateExpiredException, @@ -237,21 +246,21 @@ if (result < 0) { throw new CertificateNotYetValidException(); } - }; + } public int getVersion() { return 3; - }; + } public BigInteger getSerialNumber() { return (serialNumber == null) ? new BigInteger("1111") : serialNumber; - }; + } public Principal getIssuerDN() { return issuer; - }; + } public X500Principal getIssuerX500Principal() { return issuer; @@ -259,7 +268,7 @@ public Principal getSubjectDN() { return subject; - }; + } public X500Principal getSubjectX500Principal() { return subject; @@ -267,45 +276,45 @@ public Date getNotBefore() { return null; - }; + } public Date getNotAfter() { return null; - }; + } public byte[] getTBSCertificate() throws CertificateEncodingException { return null; - }; + } public byte[] getSignature() { return null; - }; + } public String getSigAlgName() { return null; - }; + } public String getSigAlgOID() { return null; - }; + } public byte[] getSigAlgParams() { return null; - }; + } public boolean[] getIssuerUniqueID() { return null; - }; + } public boolean[] getSubjectUniqueID() { return null; - }; + } public boolean[] getKeyUsage() { return keyUsage; - }; + } public List/**/ getExtendedKeyUsage() throws CertificateParsingException { @@ -314,7 +323,7 @@ public int getBasicConstraints() { return pathLen; - }; + } public Collection/*>*/ getSubjectAlternativeNames() throws CertificateParsingException { @@ -357,15 +366,13 @@ public byte[] getExtensionValue(String oid) { if (("2.5.29.14".equals(oid)) || ("2.5.29.35".equals(oid))) { // Extension value is represented as an OctetString - return (byte[]) - ASN1OctetString.getInstance().encode(keyIdentifier); + return ASN1OctetString.getInstance().encode(keyIdentifier); } if ("2.5.29.16".equals(oid)) { PrivateKeyUsagePeriod pkup = new PrivateKeyUsagePeriod(notBefore, notAfter); byte[] encoded = pkup.getEncoded(); - return (byte[]) - ASN1OctetString.getInstance().encode(encoded); + return ASN1OctetString.getInstance().encode(encoded); } if (("2.5.29.37".equals(oid)) && (extKeyUsage != null)) { ASN1Oid[] oa = new ASN1Oid[extKeyUsage.size()]; @@ -376,13 +383,11 @@ oa[id] = ASN1Oid.getInstanceForString(); val[id++] = (String) it.next(); } - return (byte[]) - ASN1OctetString.getInstance().encode( + return ASN1OctetString.getInstance().encode( new ASN1Sequence(oa).encode(val)); } if ("2.5.29.19".equals(oid)) { - return (byte[]) - ASN1OctetString.getInstance().encode( + return ASN1OctetString.getInstance().encode( new ASN1Sequence( new ASN1Type[] { ASN1Boolean.getInstance(), @@ -399,7 +404,7 @@ if (sans.getNames() == null) { return null; } - return (byte[]) + return ASN1OctetString.getInstance().encode( GeneralNames.ASN1.encode(sans)); } @@ -413,14 +418,12 @@ new PolicyInformation(policies[i]); certificatePolicies.addPolicyInformation(policyInformation); } - return (byte[]) - ASN1OctetString.getInstance().encode( + return ASN1OctetString.getInstance().encode( certificatePolicies.getEncoded()); } if ("2.5.29.30".equals(oid) && (nameConstraints != null)) { // Name Constraints Extension (as specified in rfc 3280) - return (byte[]) - ASN1OctetString.getInstance().encode( + return ASN1OctetString.getInstance().encode( nameConstraints.getEncoded()); } return null; @@ -429,7 +432,7 @@ public boolean hasUnsupportedCriticalExtension() { return false; } - }; + } /* ********************************************************************** */ /* ************************* Test implementation ************************ */ Index: modules/security/test/common/unit/java/security/cert/X509CertificateTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/X509CertificateTest.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/X509CertificateTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -54,73 +54,73 @@ public void checkValidity() throws CertificateExpiredException, - CertificateNotYetValidException {}; + CertificateNotYetValidException {} public void checkValidity(Date date) throws CertificateExpiredException, - CertificateNotYetValidException {}; + CertificateNotYetValidException {} public int getVersion() { return 3; - }; + } public BigInteger getSerialNumber() { return null; - }; + } public Principal getIssuerDN() { return null; - }; + } public Principal getSubjectDN() { return null; - }; + } public Date getNotBefore() { return null; - }; + } public Date getNotAfter() { return null; - }; + } public byte[] getTBSCertificate() throws CertificateEncodingException { return null; - }; + } public byte[] getSignature() { return null; - }; + } public String getSigAlgName() { return null; - }; + } public String getSigAlgOID() { return null; - }; + } public byte[] getSigAlgParams() { return null; - }; + } public boolean[] getIssuerUniqueID() { return null; - }; + } public boolean[] getSubjectUniqueID() { return null; - }; + } public boolean[] getKeyUsage() { return null; - }; + } public int getBasicConstraints() { return 0; - }; + } public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, Index: modules/security/test/common/unit/java/security/cert/myCertPath.java =================================================================== --- modules/security/test/common/unit/java/security/cert/myCertPath.java.orig 2006-03-20 18:37:34.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/myCertPath.java 2006-03-30 19:19:20.000000000 +0100 @@ -32,7 +32,7 @@ public class myCertPath extends CertPath { public List getCertificates() { - return (List) (new Vector()); + return new Vector(); } public byte[] getEncoded() { @@ -52,7 +52,7 @@ } public CertPath get(String s) { - return (CertPath) (new myCertPath(s)); + return new myCertPath(s); } public myCertPath(String s, String s1) { Index: modules/security/test/common/unit/java/security/cert/serialization/CertPathTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/serialization/CertPathTest.java.orig 2006-03-20 18:37:32.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/serialization/CertPathTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -167,9 +167,7 @@ * * @throws IOException */ - public final void testSerialization03() - throws IOException { - boolean passed = false; + public final void testSerialization03() throws Exception { // Create object to be serialized CertPath cp1 = new MyCertPath(new byte[] {(byte)0, (byte)1}); // This testcase uses ByteArray streams @@ -178,15 +176,10 @@ serialize(cp1, bos); // try to deserialize it try { - CertPath cp2 = deserialize(new ByteArrayInputStream(bos.toByteArray())); - } catch (Exception e) { - System.out.println(getName() + ": " + e); - if (e instanceof ObjectStreamException) { - passed = true; - } + deserialize(new ByteArrayInputStream(bos.toByteArray())); + fail("expected ObjectStreamException"); + } catch (ObjectStreamException e) { } - // check that exception has been thrown - assertTrue(passed); } /** Index: modules/security/test/common/unit/java/security/cert/serialization/CertPathValidatorExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/serialization/CertPathValidatorExceptionTest.java.orig 2006-03-20 18:37:32.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/serialization/CertPathValidatorExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -23,7 +23,6 @@ import java.security.cert.CertPath; import java.security.cert.CertPathValidatorException; -import java.security.cert.myCertPath; import org.apache.harmony.security.test.SerializationTest; @@ -45,9 +44,7 @@ msgs[0], cause); String msg = null; Throwable th = null; - byte[] enc = { (byte) 0, (byte) 1, (byte) 2, (byte) 3, (byte) 4 }; - // MyCertPath mcp = new MyCertPath(enc); - myCertPath mcp = new myCertPath("X.509", ""); + return new Object[] { new CertPathValidatorException(), new CertPathValidatorException(msg), new CertPathValidatorException(msgs[1]), Index: modules/security/test/common/unit/java/security/cert/serialization/CertificateTest.java =================================================================== --- modules/security/test/common/unit/java/security/cert/serialization/CertificateTest.java.orig 2006-03-20 18:37:32.000000000 +0000 +++ modules/security/test/common/unit/java/security/cert/serialization/CertificateTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -167,7 +167,7 @@ throws CertificateException, IOException, ClassNotFoundException { - boolean passed = false; + // Create object to be serialized Certificate c1 = new MyCertificate("DUMMY", new byte[] {(byte)0, (byte)1}); // This testcase uses ByteArray streams @@ -176,15 +176,10 @@ serialize(c1, bos); // try to deserialize it try { - Certificate c2 = deserialize(new ByteArrayInputStream(bos.toByteArray())); - } catch (Exception e) { - System.out.println(getName() + ": " + e); - if (e instanceof ObjectStreamException) { - passed = true; - } + deserialize(new ByteArrayInputStream(bos.toByteArray())); + fail("expected ObjectStreamException"); + } catch (ObjectStreamException e) { } - // check that exception has been thrown - assertTrue(passed); } /** Index: modules/security/test/common/unit/java/security/serialization/AccessControlExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/serialization/AccessControlExceptionTest.java.orig 2006-03-20 18:37:15.000000000 +0000 +++ modules/security/test/common/unit/java/security/serialization/AccessControlExceptionTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -56,7 +56,7 @@ } else { assertTrue(s.equals(test.getMessage())); } - ; + Permission p = ref.getPermission(); if (p == null) { assertNull(test.getPermission()); Index: modules/security/test/common/unit/java/security/serialization/CodeSourceTest.java =================================================================== --- modules/security/test/common/unit/java/security/serialization/CodeSourceTest.java.orig 2006-03-20 18:37:15.000000000 +0000 +++ modules/security/test/common/unit/java/security/serialization/CodeSourceTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -98,10 +98,9 @@ ObjectInputStream ois = new ObjectInputStream(bais); try { - CodeSource got = (CodeSource)ois.readObject(); + ois.readObject(); fail("must not pass here"); - } - catch(ClassNotFoundException ex) { + } catch(ClassNotFoundException ex) { // ok } }//~ @@ -121,10 +120,9 @@ ObjectInputStream ois = new ObjectInputStream(bais); try { - CodeSource got = (CodeSource)ois.readObject(); + ois.readObject(); fail("must not pass here"); - } - catch(IOException ex) { + } catch(IOException ex) { // ok } }//~ Index: modules/security/test/common/unit/java/security/serialization/KeyPairTest.java =================================================================== --- modules/security/test/common/unit/java/security/serialization/KeyPairTest.java.orig 2006-03-20 18:37:15.000000000 +0000 +++ modules/security/test/common/unit/java/security/serialization/KeyPairTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -21,8 +21,6 @@ package java.security.serialization; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; Index: modules/security/test/common/unit/java/security/serialization/SignedObjectTest.java =================================================================== --- modules/security/test/common/unit/java/security/serialization/SignedObjectTest.java.orig 2006-03-20 18:37:15.000000000 +0000 +++ modules/security/test/common/unit/java/security/serialization/SignedObjectTest.java 2006-03-30 19:19:20.000000000 +0100 @@ -79,7 +79,7 @@ assertEquals(test.getAlgorithm(), ref.getAlgorithm()); try { - assertEquals((Properties)test.getObject(), prop); + assertEquals(test.getObject(), prop); } catch (ClassNotFoundException e) { fail(e.toString()); } catch (IOException e) { Index: modules/security/test/common/unit/java/security/spec/ECGenParameterSpecTest.java =================================================================== --- modules/security/test/common/unit/java/security/spec/ECGenParameterSpecTest.java.orig 2006-03-20 18:37:38.000000000 +0000 +++ modules/security/test/common/unit/java/security/spec/ECGenParameterSpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -62,7 +62,7 @@ * using valid name */ public final void testECGenParameterSpec01() { - AlgorithmParameterSpec ps = new ECGenParameterSpec("someName"); + new ECGenParameterSpec("someName"); } /** @@ -73,7 +73,7 @@ */ public final void testECGenParameterSpec02() { try { - AlgorithmParameterSpec ps = new ECGenParameterSpec(null); + new ECGenParameterSpec(null); } catch (NullPointerException ok) {} } Index: modules/security/test/common/unit/java/security/spec/InvalidKeySpecExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/spec/InvalidKeySpecExceptionTest.java.orig 2006-03-20 18:37:38.000000000 +0000 +++ modules/security/test/common/unit/java/security/spec/InvalidKeySpecExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ private static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not InvalidKeySpecException"; - static String createErr(Exception tE, Exception eE) { return "InvalidKeySpecException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/spec/InvalidParameterSpecExceptionTest.java =================================================================== --- modules/security/test/common/unit/java/security/spec/InvalidParameterSpecExceptionTest.java.orig 2006-03-20 18:37:38.000000000 +0000 +++ modules/security/test/common/unit/java/security/spec/InvalidParameterSpecExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not InvalidParameterSpecException"; - static String createErr(Exception tE, Exception eE) { return "InvalidParameterSpecException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/java/security/spec/RSAPrivateCrtKeySpecTest.java =================================================================== --- modules/security/test/common/unit/java/security/spec/RSAPrivateCrtKeySpecTest.java.orig 2006-03-20 18:37:38.000000000 +0000 +++ modules/security/test/common/unit/java/security/spec/RSAPrivateCrtKeySpecTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -96,7 +96,7 @@ * object using valid parameters */ public final void testRSAPrivateCrtKeySpec03() { - RSAPrivateKeySpec ks = new RSAPrivateCrtKeySpec( + new RSAPrivateCrtKeySpec( null, null, null, @@ -105,7 +105,6 @@ null, null, null); - assertTrue(ks instanceof KeySpec); } /** Index: modules/security/test/common/unit/javax/security/auth/PolicyTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/PolicyTest.java.orig 2006-03-20 18:38:03.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/PolicyTest.java 2006-03-30 19:23:09.000000000 +0100 @@ -329,7 +329,6 @@ public void test_Refresh() { - PermissionCollection c; Permission per; Subject subject; Enumeration e; Index: modules/security/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java.orig 2006-03-20 18:38:03.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -64,7 +64,6 @@ s_this = "a.b.Credential a.b.Principal \"duke\""; p_that = new PrivateCredentialPermission(s_that, "read"); p_this = new PrivateCredentialPermission(s_this, "read"); - assertTrue(p_this instanceof PrivateCredentialPermission); assertTrue(p_this.implies(p_that)); assertTrue(p_this.implies(p_this)); } @@ -740,8 +739,7 @@ public final void testSerialization_Golden() throws Exception { - PrivateCredentialPermission z = new PrivateCredentialPermission( - "a b \"c\" d \"e\"", "read"); + new PrivateCredentialPermission("a b \"c\" d \"e\"", "read"); ByteArrayInputStream in = new ByteArrayInputStream(gForm); ObjectInputStream sIn = new ObjectInputStream(in); Index: modules/security/test/common/unit/javax/security/auth/SubjectTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/SubjectTest.java.orig 2006-03-20 18:38:03.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/SubjectTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -188,11 +188,9 @@ * in resticted security context */ public final void testSubject_3Set_NoPermissions() { - // all sets modifications are denied denyPermission(new AuthPermission("*")); - - Subject subject = new Subject(true, h1, h2, h3); + new Subject(true, h1, h2, h3); } /** @@ -202,22 +200,19 @@ public final void testSubject_3Set_NPE() { try { - Subject subject = new Subject(false, null, new HashSet(), - new HashSet()); + new Subject(false, null, new HashSet(), new HashSet()); fail("No expected NullPointerException"); } catch (NullPointerException e) { } try { - Subject subject = new Subject(false, new HashSet(), null, - new HashSet()); + new Subject(false, new HashSet(), null, new HashSet()); fail("No expected NullPointerException"); } catch (NullPointerException e) { } try { - Subject subject = new Subject(false, new HashSet(), new HashSet(), - null); + new Subject(false, new HashSet(), new HashSet(), null); fail("No expected NullPointerException"); } catch (NullPointerException e) { } @@ -233,8 +228,7 @@ hash.add(null); try { - Subject subject = new Subject(false, hash, new HashSet(), - new HashSet()); + new Subject(false, hash, new HashSet(), new HashSet()); if (!testing) { // possible to add 'null' principal via constructor @@ -244,8 +238,7 @@ } try { - Subject subject = new Subject(false, new HashSet(), hash, - new HashSet()); + new Subject(false, new HashSet(), hash, new HashSet()); if (!testing) { fail("No expected NullPointerException"); @@ -254,8 +247,7 @@ } try { - Subject subject = new Subject(false, new HashSet(), new HashSet(), - hash); + new Subject(false, new HashSet(), new HashSet(), hash); if (!testing) { fail("No expected NullPointerException"); @@ -266,8 +258,7 @@ hash.clear(); hash.add(new Object()); try { - Subject subject = new Subject(false, hash, new HashSet(), - new HashSet()); + new Subject(false, hash, new HashSet(), new HashSet()); if (!testing) { // possible to add 'null' principal via constructor Index: modules/security/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -41,7 +41,7 @@ */ public final void testUnsupportedCallbackException_01() { UnsupportedCallbackException ce = new UnsupportedCallbackException(nc); - assertEquals((Callback)nc, ce.getCallback()); + assertEquals(nc, ce.getCallback()); try { throw ce; }catch (Exception e){ @@ -55,14 +55,14 @@ * Test for UnsupportedCallbackException(Callback c, String msg) ctor */ public final void testUnsupportedCallbackException_02() { - UnsupportedCallbackException ce = new UnsupportedCallbackException((Callback)nc, "message"); + UnsupportedCallbackException ce = new UnsupportedCallbackException(nc, "message"); assertEquals ("message", ce.getMessage()); - assertEquals((Callback)nc, ce.getCallback()); + assertEquals(nc, ce.getCallback()); try { throw ce; }catch (Exception e){ assertTrue(ce.equals(e)); - assertEquals((Callback)nc, ce.getCallback()); + assertEquals(nc, ce.getCallback()); } } Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -42,13 +42,11 @@ String prompt = "prompt"; int defaultChoice = 1; String[] choices = {"AAA", "BBB"}; - int index[] = {1, 2, 3}; return new Object[] {new ChoiceCallback(prompt, choices, defaultChoice, true)}; } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((ChoiceCallback) golden) instanceof ChoiceCallback); assertEquals(((ChoiceCallback) golden).getPrompt(), ((ChoiceCallback) test).getPrompt()); assertEquals(((ChoiceCallback) golden).getDefaultChoice(), Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -44,7 +44,6 @@ } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((LanguageCallback) test) instanceof LanguageCallback); assertEquals(((LanguageCallback) golden).getLocale(), ((LanguageCallback) test).getLocale()); } Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerNameCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerNameCallbackTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerNameCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -43,7 +43,6 @@ } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((NameCallback) test) instanceof NameCallback); assertEquals(((NameCallback) golden).getDefaultName(), ((NameCallback) test).getDefaultName()); assertEquals(((NameCallback) golden).getName(), ((NameCallback) test) Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -45,13 +45,11 @@ protected void assertDeserialized(Object golden, Object test) { - assertTrue(((PasswordCallback) test) instanceof PasswordCallback); assertEquals(((PasswordCallback) golden).getPrompt(), ((PasswordCallback) test).getPrompt()); if (((PasswordCallback) test).getPassword() != null) { - assertEquals(new String((char[]) ((PasswordCallback) golden) - .getPassword()), new String( - (char[]) ((PasswordCallback) test).getPassword())); + assertEquals(new String(((PasswordCallback) golden).getPassword()), + new String(((PasswordCallback) test).getPassword())); } } } \ No newline at end of file Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -43,7 +43,6 @@ } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((TextInputCallback) test) instanceof TextInputCallback); assertEquals(((TextInputCallback) golden).getDefaultText(), ((TextInputCallback) test).getDefaultText()); assertEquals(((TextInputCallback) golden).getPrompt(), Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -42,7 +42,6 @@ } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((TextOutputCallback) test) instanceof TextOutputCallback); assertEquals(((TextOutputCallback) golden).getMessage(), ((TextOutputCallback) test).getMessage()); assertEquals(((TextOutputCallback) golden).getMessageType(), Index: modules/security/test/common/unit/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java.orig 2006-03-20 18:37:53.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,7 +21,6 @@ package javax.security.auth.callback.serialization; -import javax.security.auth.callback.Callback; import javax.security.auth.callback.LanguageCallback; import javax.security.auth.callback.UnsupportedCallbackException; @@ -41,7 +40,7 @@ } protected Object[] getData() { - return new Object[] {new UnsupportedCallbackException((Callback) nc)}; + return new Object[] {new UnsupportedCallbackException(nc)}; } protected void assertDeserialized(Object golden, Object test) { Index: modules/security/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java.orig 2006-03-20 18:38:02.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -64,49 +64,48 @@ * testing of a incorrect ctor */ public void testFailCtor() { - DelegationPermission dp; try { - dp = new DelegationPermission(null); + new DelegationPermission(null); fail("no expected NPE"); } catch(NullPointerException e){ } try { - dp = new DelegationPermission(""); + new DelegationPermission(""); fail("no expected IAE"); } catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\"aaa.bbb.com\" ccc.ddd.com"); + new DelegationPermission("\"aaa.bbb.com\" ccc.ddd.com"); fail("Target name must be enveloped by quotes"); } catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\"aaa.bbb.com\" ccc.ddd.com\""); + new DelegationPermission("\"aaa.bbb.com\" ccc.ddd.com\""); fail("Target name must be enveloped by quotes"); } catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\"aaa.bbb.com\" \"ccc.ddd.com"); + new DelegationPermission("\"aaa.bbb.com\" \"ccc.ddd.com"); fail("Target name must be enveloped by quotes"); } catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\" \" \" \""); + new DelegationPermission("\" \" \" \""); //XXX fail("Target name is empty"); }catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\"\""); + new DelegationPermission("\"\""); fail("Target name is incorrect"); } catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\"aaa.bbb.com\" \"\""); + new DelegationPermission("\"aaa.bbb.com\" \"\""); fail("service principal is empty"); } catch(IllegalArgumentException e){ } try { - dp = new DelegationPermission("\"\" \"aaa.bbb.com\""); + new DelegationPermission("\"\" \"aaa.bbb.com\""); fail("subordinate service principal is empty"); } catch(IllegalArgumentException e){ } @@ -114,9 +113,8 @@ } public void testFailCtor_2() { - DelegationPermission dp = null; try { - dp = new DelegationPermission("\"AAA\""); + new DelegationPermission("\"AAA\""); fail("target name should be specifies a pair of kerberos service principals"); } catch (IllegalArgumentException e) { } Index: modules/security/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java.orig 2006-03-20 18:38:02.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -55,74 +55,74 @@ public void testFailedCtor() { try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "read"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "read"); fail("incorrect actions"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", ""); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", ""); fail("actions is empty"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp = new ServicePermission("krbtgt/AAA.COM@BBB.COM", null); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", null); fail("actions is null"); } catch(NullPointerException e){ } catch(IllegalArgumentException e){} try { - ServicePermission sp = new ServicePermission(null, "accept"); + new ServicePermission(null, "accept"); fail("permission is null"); } catch(NullPointerException e){ } try { - ServicePermission sp = new ServicePermission("", "accept"); + new ServicePermission("", "accept"); //fail("No expected IAE"); // } catch(IllegalArgumentException e){} try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "accept, read"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "accept, read"); fail("Incorrect actions"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, read"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, read"); fail("Incorrect actions"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "read, initiate "); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "read, initiate "); fail("Incorrect actions"); } catch(Exception e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "read, accept "); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "read, accept "); fail("Incorrect actions"); }catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", ", accept "); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", ", accept "); //fail("No expected IAE"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, accept, read"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, accept, read"); fail("Incorrect actions"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, read, accept"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, read, accept"); fail("Incorrect actions"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, accept, accept"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate, accept, accept"); //fail("Incorrect actions"); } catch(IllegalArgumentException e){ } try { - ServicePermission sp1 = new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate accept"); + new ServicePermission("krbtgt/AAA.COM@BBB.COM", "initiate accept"); fail("Incorrect actions"); } catch(IllegalArgumentException e){ } Index: modules/security/test/common/unit/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java.orig 2006-03-20 18:38:02.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -39,7 +39,6 @@ } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((DelegationPermission) golden) instanceof DelegationPermission); assertEquals(((DelegationPermission) golden).getName(), ((DelegationPermission) test).getName()); } Index: modules/security/test/common/unit/javax/security/auth/kerberos/serialization/ServicePermissionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/kerberos/serialization/ServicePermissionTest.java.orig 2006-03-20 18:38:02.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/kerberos/serialization/ServicePermissionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -39,7 +39,6 @@ } protected void assertDeserialized(Object golden, Object test) { - assertTrue(((ServicePermission) golden) instanceof ServicePermission); assertEquals(((ServicePermission) golden).getName(), ((ServicePermission) test).getName()); assertEquals(((ServicePermission) golden).getActions(), Index: modules/security/test/common/unit/javax/security/auth/login/LoginContextTest_1.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/login/LoginContextTest_1.java.orig 2006-03-20 18:38:01.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/login/LoginContextTest_1.java 2006-03-30 19:19:33.000000000 +0100 @@ -331,12 +331,6 @@ public CallbackHandler cbHandler; - private Subject subject; - - private Map sharedState; - - private Map options; - // private int mask; @@ -475,10 +469,7 @@ public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { - this.subject = subject; this.cbHandler = callbackHandler; - this.sharedState = sharedState; - this.options = options; initCalled = true; boolean doit = ((mask == -1) && (staticMask & FAIL_AT_INIT) != 0) @@ -724,7 +715,7 @@ Security.setProperty(DEFAULT_CBHANDLER_PROPERTY, klassName); // This also shows that the cbHandler is instantiated at the ctor - LoginContext lc = new LoginContext(CONFIG_NAME); + new LoginContext(CONFIG_NAME); assertTrue(TestCallbackHandler.size() == 1); // ugh... cant set 'null' here... Security.setProperty(DEFAULT_CBHANDLER_PROPERTY, ""); @@ -1072,7 +1063,7 @@ TestConfig.clear(); boolean expectedResult = ((Boolean) variants[0][2]).booleanValue(); String caseName = variants[0][1].toString(); - ; + int startIndex = 0; for (int i = 0; i < variants.length; i++) { int flag = ((Integer) variants[i][0]).intValue(); @@ -2046,7 +2037,7 @@ lc.login(); lc.logout(); // - assertTrue(TestCallbackHandler_Contexted.size() == 1); + assertTrue(LoginContextTest_1.TestCallbackHandler.size() == 1); // now, get abort() called TestLoginModule.staticMask = TestLoginModule.FAIL_AT_LOGIN; Index: modules/security/test/common/unit/javax/security/auth/x500/X500PrincipalTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/x500/X500PrincipalTest.java.orig 2006-03-20 18:37:55.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/x500/X500PrincipalTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -736,7 +736,7 @@ public void testGetNameUnicodeNormalized() throws Exception { String unicodeStr = "CN= \u0401\u0410"; X500Principal principal = new X500Principal(unicodeStr); - String s = principal.getName(X500Principal.CANONICAL); + principal.getName(X500Principal.CANONICAL); //System.out.println("s = " + s); //assertEquals("CN=\u0415\u0308\u0410".toLowerCase(Locale.US), s); } @@ -874,8 +874,7 @@ public void testIllegalInputName_15() { try { - String dn = "CN=,C"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=,C"); fail("No IllegalArgumentException on improper attribute value"); } catch (IllegalArgumentException e) { } @@ -883,8 +882,7 @@ public void testIllegalInputName_16() { try { - String dn = "CN=,C=+"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=,C=+"); fail("No IllegalArgumentException on improper attribute value"); } catch (IllegalArgumentException e) { } @@ -909,8 +907,7 @@ */ public void testIllegalInputName_05() { try { - String dn = "CN=X+YZ"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=X+YZ"); fail("No IllegalArgumentException on improper attribute value"); } catch (IllegalArgumentException e) { } @@ -955,8 +952,7 @@ */ public void testIllegalInputName_09() { try { - String dn = "CN=#"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=#"); fail("No IllegalArgumentException on improper attribute hex value"); } catch (IllegalArgumentException e) { //ignore @@ -970,8 +966,7 @@ */ public void testIllegalInputName_10() { try { - String dn = "CN=#13"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=#13"); fail("No IllegalArgumentException on improper attribute hex value"); } catch (IllegalArgumentException e) { //ignore @@ -985,8 +980,7 @@ */ public void testIllegalInputName_11() { try { - String dn = "CN=#1301"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=#1301"); fail("No IllegalArgumentException on improper attribute hex value"); } catch (IllegalArgumentException e) { //ignore @@ -1000,8 +994,7 @@ */ public void testIllegalInputName_12() { try { - String dn = "CN=#13010101"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=#13010101"); fail("No IllegalArgumentException on improper attribute hex value"); } catch (IllegalArgumentException e) { } @@ -1013,8 +1006,7 @@ */ public void testIllegalInputName_13() { try { - String dn = "CN=# 0"; - X500Principal p = new X500Principal(dn); + new X500Principal("CN=# 0"); fail("No IllegalArgumentException on improper attribute hex value"); } catch (IllegalArgumentException e) { } @@ -1484,9 +1476,8 @@ * checks if the proper exception is thrown */ public void testNameWithQuotation_01() throws Exception { - String dn = "CN=\"ABCDEF"; try { - X500Principal principal = new X500Principal(dn); + new X500Principal("CN=\"ABCDEF"); fail("No IllegalArgumentException on string with no closing quotations"); } catch (IllegalArgumentException e) { } @@ -1798,9 +1789,8 @@ * checks if the proper exception is thrown */ public void testNameQu() throws Exception { - String dn = "CN=\"\"B"; try { - X500Principal principal = new X500Principal(dn); + new X500Principal("CN=\"\"B"); fail("No IllegalArgumentException on improper string"); } catch (IllegalArgumentException e) { } Index: modules/security/test/common/unit/javax/security/auth/x500/X500PrivateCredentialTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/x500/X500PrivateCredentialTest.java.orig 2006-03-20 18:37:55.000000000 +0000 +++ modules/security/test/common/unit/javax/security/auth/x500/X500PrivateCredentialTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -163,30 +163,27 @@ public void testIllegalArg() { try { - X500PrivateCredential cred= new X500PrivateCredential(cert, key, null); + new X500PrivateCredential(cert, key, null); fail("No IllegalArgumentException on null value"); - } - catch(IllegalArgumentException e) { + } catch(IllegalArgumentException e) { //ignore } } public void testIllegalArg_0() { try { - X500PrivateCredential cred= new X500PrivateCredential(cert, null, null); + new X500PrivateCredential(cert, null, null); fail("No IllegalArgumentException on null value"); - } - catch(IllegalArgumentException e) { + } catch(IllegalArgumentException e) { //ignore } } public void testIllegalArg_1() { try { - X500PrivateCredential cred= new X500PrivateCredential(null, key, ""); + new X500PrivateCredential(null, key, ""); fail("No IllegalArgumentException on null value"); - } - catch(IllegalArgumentException e) { + } catch(IllegalArgumentException e) { //ignore } } Index: modules/security/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java.orig 2006-03-20 18:38:07.000000000 +0000 +++ modules/security/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateEncodingException"; - static String createErr(Exception tE, Exception eE) { return "CertificateEncodingException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/javax/security/cert/CertificateExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/cert/CertificateExceptionTest.java.orig 2006-03-20 18:38:07.000000000 +0000 +++ modules/security/test/common/unit/javax/security/cert/CertificateExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateException"; - static String createErr(Exception tE, Exception eE) { return "CertificateException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java.orig 2006-03-20 18:38:07.000000000 +0000 +++ modules/security/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateExpiredException"; - static String createErr(Exception tE, Exception eE) { return "CertificateExpiredException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java.orig 2006-03-20 18:38:07.000000000 +0000 +++ modules/security/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateNotYetValidException"; - static String createErr(Exception tE, Exception eE) { return "CertificateNotYetValidException: ".concat(tE.toString()) .concat(" is not equal to caught exception: ").concat( Index: modules/security/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java.orig 2006-03-20 18:38:07.000000000 +0000 +++ modules/security/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not CertificateParsingException"; - static String createErr(Exception tE, Exception eE) { return "CertificateParsingException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/security/test/common/unit/javax/security/cert/X509CertificateTest.java =================================================================== --- modules/security/test/common/unit/javax/security/cert/X509CertificateTest.java.orig 2006-03-20 18:38:07.000000000 +0000 +++ modules/security/test/common/unit/javax/security/cert/X509CertificateTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,17 +22,10 @@ package javax.security.cert; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.security.Security; import java.security.cert.CertificateFactory; import java.util.Arrays; import java.util.Calendar; import java.util.Date; -import java.util.Iterator; -import javax.security.cert.CertificateEncodingException; -import javax.security.cert.CertificateException; -import javax.security.cert.X509Certificate; import junit.framework.Test; import junit.framework.TestCase; @@ -100,12 +93,9 @@ return; } try { - ByteArrayInputStream bais = - new ByteArrayInputStream(cert.getEncoded()); + ByteArrayInputStream bais = new ByteArrayInputStream(cert.getEncoded()); - X509Certificate c = X509Certificate.getInstance(bais); - assertTrue("The returned value is not an instance " - + "of X509Certificate", c instanceof X509Certificate); + X509Certificate.getInstance(bais); } catch (java.security.cert.CertificateEncodingException e) { e.printStackTrace(); fail("Unexpected CertificateEncodingException was thrown."); @@ -128,9 +118,7 @@ return; } try { - X509Certificate c = X509Certificate.getInstance(cert.getEncoded()); - assertTrue("The returned value is not an instance " - + "of X509Certificate", c instanceof X509Certificate); + X509Certificate.getInstance(cert.getEncoded()); } catch (java.security.cert.CertificateEncodingException e) { e.printStackTrace(); fail("Unexpected CertificateEncodingException was thrown."); Index: modules/security/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -49,8 +49,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not AuthenticationException"; - static String createErr(Exception tE, Exception eE) { return "AuthenticationException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); @@ -64,7 +62,6 @@ public void testAuthenticationException01() { AuthenticationException tE; tE = new AuthenticationException(); - assertTrue(errNotExc, tE instanceof AuthenticationException); assertNull("getMessage() must return null", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); } @@ -79,8 +76,6 @@ AuthenticationException tE; for (int i = 0; i < msgs.length; i++) { tE = new AuthenticationException(msgs[i]); - assertTrue(errNotExc.concat(" (detail: ").concat(msgs[i]).concat(")"), - tE instanceof AuthenticationException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -99,7 +94,6 @@ public void testAuthenticationException03() { String msg = null; AuthenticationException tE = new AuthenticationException(msg); - assertTrue(errNotExc, tE instanceof AuthenticationException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -116,7 +110,6 @@ */ public void testAuthenticationException04() { AuthenticationException tE = new AuthenticationException(null, null); - assertTrue(errNotExc, tE instanceof AuthenticationException); assertNull("getMessage() must return null", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -135,8 +128,6 @@ AuthenticationException tE; for (int i = 0; i < msgs.length; i++) { tE = new AuthenticationException(msgs[i], null); - assertTrue(errNotExc.concat(" (detail: ").concat(msgs[i]).concat(")"), - tE instanceof AuthenticationException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -155,7 +146,6 @@ */ public void testAuthenticationException06() { AuthenticationException tE = new AuthenticationException(null, tCause); - assertTrue(errNotExc, tE instanceof AuthenticationException); if (tE.getMessage() != null) { String toS = tCause.toString(); String getM = tE.getMessage(); @@ -180,8 +170,6 @@ AuthenticationException tE; for (int i = 0; i < msgs.length; i++) { tE = new AuthenticationException(msgs[i], tCause); - assertTrue(errNotExc.concat(" (detail: ").concat(msgs[i]).concat(")"), - tE instanceof AuthenticationException); String getM = tE.getMessage(); String toS = tCause.toString(); if (msgs[i].length() > 0) { Index: modules/security/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -40,7 +40,6 @@ */ public void test01() { AuthorizeCallback auth = new AuthorizeCallback(null, null); - assertTrue(auth instanceof AuthorizeCallback); assertNull(auth.getAuthenticationID()); assertNull(auth.getAuthorizationID()); assertNull(auth.getAuthorizedID()); @@ -83,7 +82,6 @@ for (int j = 0; j < authorizedIDs.length; j++) { auth = new AuthorizeCallback(authenticationIDs[i], authorizedIDs[j]); - assertTrue(auth instanceof AuthorizeCallback); assertEquals(auth.getAuthenticationID(), authenticationIDs[i]); assertEquals(auth.getAuthorizationID(), authorizedIDs[j]); assertNull(auth.getAuthorizedID()); Index: modules/security/test/common/unit/javax/security/sasl/RealmCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/RealmCallbackTest.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/RealmCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,7 +22,6 @@ package javax.security.sasl; import junit.framework.TestCase; -; /** * Tests for constructors and methods of RealmCallback class @@ -90,7 +89,6 @@ for (int i = 0; i < prompts.length; i++) { for (int j = 0; j < prompts.length; j++) { rCB = new RealmCallback(prompts[i], defInfo[j]); - assertTrue("Incorrect object", rCB instanceof RealmCallback); assertEquals("Incoorect default info", rCB.getDefaultText(), defInfo[j]); assertEquals("Incorrect prompt", rCB.getPrompt(), prompts[i]); @@ -134,7 +132,6 @@ String ss; for (int i = 0; i < prompts.length; i++) { rCB = new RealmCallback(prompts[i]); - assertTrue("Incorrect object", rCB instanceof RealmCallback); assertNull("Incoorect default info", rCB.getDefaultText()); assertEquals("Incorrect prompt", rCB.getPrompt(), prompts[i]); assertNull("Not null text", rCB.getText()); Index: modules/security/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -120,7 +120,6 @@ RealmChoiceCallback rCCB; for (int i = 0; i < prompts.length; i++) { rCCB = new RealmChoiceCallback(prompts[i], choices, 0, false); - assertTrue("Incorrect object", rCCB instanceof RealmChoiceCallback); assertEquals("Incorrect prompt", rCCB.getPrompt(), prompts[i]); String [] ch = rCCB.getChoices(); assertEquals("Incorrect choices length", ch.length, choices.length); @@ -161,7 +160,6 @@ RealmChoiceCallback rCCB; for (int i = 0; i < prompts.length; i++) { rCCB = new RealmChoiceCallback(prompts[i], choices, 0, true); - assertTrue("Incorrect object", rCCB instanceof RealmChoiceCallback); assertEquals("Incorrect prompt", rCCB.getPrompt(), prompts[i]); String[] ch = rCCB.getChoices(); assertEquals("Incorrect choices length", ch.length, choices.length); Index: modules/security/test/common/unit/javax/security/sasl/SaslExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/SaslExceptionTest.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/SaslExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -58,8 +58,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SaslException"; - static String createErr(Exception tE, Exception eE) { return "SaslException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); @@ -73,7 +71,6 @@ public void testSaslException01() { SaslException tE; tE = new SaslException(); - assertTrue(errNotExc, tE instanceof SaslException); assertNull("getMessage() must return null", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); } @@ -88,8 +85,6 @@ SaslException tE; for (int i = 0; i < msgs.length; i++) { tE = new SaslException(msgs[i]); - assertTrue(errNotExc.concat(" (detail: ").concat(msgs[i]).concat(")"), - tE instanceof SaslException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -108,7 +103,6 @@ public void testSaslException03() { String msg = null; SaslException tE = new SaslException(msg); - assertTrue(errNotExc, tE instanceof SaslException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -125,7 +119,6 @@ */ public void testSaslException04() { SaslException tE = new SaslException(null, null); - assertTrue(errNotExc, tE instanceof SaslException); assertNull("getMessage() must return null", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -144,8 +137,6 @@ SaslException tE; for (int i = 0; i < msgs.length; i++) { tE = new SaslException(msgs[i], null); - assertTrue(errNotExc.concat(" (detail: ").concat(msgs[i]).concat(")"), - tE instanceof SaslException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -164,7 +155,6 @@ */ public void testSaslException06() { SaslException tE = new SaslException(null, tCause); - assertTrue(errNotExc, tE instanceof SaslException); if (tE.getMessage() != null) { String toS = tCause.toString(); String getM = tE.getMessage(); @@ -194,8 +184,6 @@ SaslException tE; for (int i = 0; i < msgs.length; i++) { tE = new SaslException(msgs[i], tCause); - assertTrue(errNotExc.concat(" (detail: ").concat(msgs[i]).concat(")"), - tE instanceof SaslException); String getM = tE.getMessage(); String toS = tCause.toString(); if (msgs[i].length() > 0) { Index: modules/security/test/common/unit/javax/security/sasl/SaslTest2.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/SaslTest2.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/SaslTest2.java 2006-03-30 19:19:33.000000000 +0100 @@ -47,8 +47,6 @@ private static final String fClientClass01 = "javax.security.sasl.myClientFactory01"; - private static final String fClientClass02 = "javax.security.sasl.myClientFactory02"; - private static final String fServerClass01 = "javax.security.sasl.myServerFactory01"; private static final String fServerClass02 = "javax.security.sasl.myServerFactory02"; @@ -213,9 +211,7 @@ .hasMoreElements()); myClientFactory01 mm1 = new myClientFactory01(); - myClientFactory02 mm2 = new myClientFactory02(); String[] mech01 = mm1.getMechanismNames(null); - String[] mech02 = mm1.getMechanismNames(null); int l = 0; while (en.hasMoreElements()) { SaslClientFactory f = (SaslClientFactory) en.nextElement(); @@ -437,9 +433,7 @@ .hasMoreElements()); myServerFactory01 mm1 = new myServerFactory01(); - myServerFactory02 mm2 = new myServerFactory02(); String[] mech01 = mm1.getMechanismNames(null); - String[] mech02 = mm1.getMechanismNames(null); int l = 0; while (en.hasMoreElements()) { SaslServerFactory f = (SaslServerFactory) en.nextElement(); @@ -497,7 +491,7 @@ assertNotNull("List of SaslServerFactories should not be null", en); assertTrue("List of SaslServerFactories should have elements", en .hasMoreElements()); - myServerFactory02 mm = new myServerFactory02(); + int l = 0; while (en.hasMoreElements()) { SaslServerFactory f = (SaslServerFactory) en.nextElement(); Index: modules/security/test/common/unit/javax/security/sasl/SaslTest3.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/SaslTest3.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/SaslTest3.java 2006-03-30 19:19:33.000000000 +0100 @@ -191,7 +191,6 @@ SaslClient saslC = Sasl.createSaslClient(new String[] { "NAME-2" }, null, "protocol", null, null, cbH); assertNotNull("Null result", saslC); - assertTrue("Not SaslClient", saslC instanceof SaslClient); try { saslC.unwrap(null, 1, 1); fail("SaslException sould be thrown"); @@ -228,7 +227,6 @@ SaslClient saslC = Sasl.createSaslClient(new String[] { "NAME-2" }, null, "protocol", null, null, cbH); assertNotNull("Null result for NAME-2", saslC); - assertTrue("Not SaslClient", saslC instanceof SaslClient); assertFalse("Incorrect isComplete() result", saslC.isComplete()); // try to create client for wrong mechanism try { @@ -276,7 +274,6 @@ saslC = Sasl.createSaslClient(new String[] { "NAME-2" }, null, "protocol", null, null, cbH); assertNotNull("Null result for NAME-2", saslC); - assertTrue("Incorrect object", saslC instanceof SaslClient); try { saslC.unwrap(null, 1, 1); fail("SaslException sould be thrown"); @@ -297,7 +294,6 @@ saslC = Sasl.createSaslClient(new String[] { "NAME-6", "NAME-5" }, null, "protocol", null, null, cbH); assertNotNull("Null result for NAME-6 and NAME-5", saslC); - assertTrue("Incorrect object", saslC instanceof SaslClient); } } Index: modules/security/test/common/unit/javax/security/sasl/SaslTest4.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/SaslTest4.java.orig 2006-03-20 18:38:06.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/SaslTest4.java 2006-03-30 19:19:33.000000000 +0100 @@ -189,7 +189,6 @@ SaslServer saslS = Sasl.createSaslServer("MECH-2", "protocol", null, null, cbH); assertNotNull("Null result", saslS); - assertTrue("Not SaslServer", saslS instanceof SaslServer); try { saslS.unwrap(null, 1, 1); fail("SaslException sould be thrown"); @@ -228,7 +227,6 @@ SaslServer saslS = Sasl.createSaslServer("MECH-2", "protocol", null, null, cbH); assertNotNull("Null result for MECH-2", saslS); - assertTrue("Not SaslServer", saslS instanceof SaslServer); assertFalse("Incorrect isComplete() result", saslS.isComplete()); // try to create Server for wrong mechanism try { @@ -276,7 +274,6 @@ saslS = Sasl.createSaslServer("MECH-2", "protocol", null, null, cbH); assertNotNull("Null result for MECH-2", saslS); - assertTrue("Incorrect object", saslS instanceof SaslServer); try { saslS.unwrap(null, 1, 1); fail("SaslException sould be thrown"); @@ -294,10 +291,8 @@ // in another provider saslS = Sasl.createSaslServer("MECH-6", "protocol", null, null, cbH); assertNotNull("Null result for MECH-6", saslS); - assertTrue("Incorrect object", saslS instanceof SaslServer); saslS = Sasl.createSaslServer("MECH-5", "protocol", null, null, cbH); assertNotNull("Null result for MECH-5", saslS); - assertTrue("Incorrect object", saslS instanceof SaslServer); } } Index: modules/security/test/common/unit/javax/security/sasl/serialization/AuthenticationExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/serialization/AuthenticationExceptionTest.java.orig 2006-03-20 18:38:05.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/serialization/AuthenticationExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -39,7 +39,7 @@ protected Object[] getData() { String msg = null; Exception cause = new Exception(msgs[1]); - AuthenticationException excAuthorication = new AuthenticationException(msgs[0]); + return new Object[] { new AuthenticationException(), new AuthenticationException(msg), new AuthenticationException(msgs[1]), Index: modules/security/test/common/unit/javax/security/sasl/serialization/SaslExceptionTest.java =================================================================== --- modules/security/test/common/unit/javax/security/sasl/serialization/SaslExceptionTest.java.orig 2006-03-20 18:38:05.000000000 +0000 +++ modules/security/test/common/unit/javax/security/sasl/serialization/SaslExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -39,7 +39,7 @@ protected Object[] getData() { String msg = null; Exception cause = new Exception(msgs[1]); - SaslException excSasl = new SaslException(msgs[0]); + return new Object[] { new SaslException(), new SaslException(msg), new SaslException(msgs[1]), Index: modules/security/test/common/unit/org/apache/harmony/security/SystemScopeTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/SystemScopeTest.java.orig 2006-03-20 18:37:44.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/SystemScopeTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,11 +21,11 @@ package org.apache.harmony.security; -import junit.framework.TestCase; -import java.security.*; +import java.security.Identity; +import java.security.IdentityScope; +import java.security.KeyManagementException; import java.util.Enumeration; -import org.apache.harmony.security.SystemScope; import junit.framework.TestCase; Index: modules/security/test/common/unit/org/apache/harmony/security/TestCertUtils.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/TestCertUtils.java.orig 2006-03-20 18:37:44.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/TestCertUtils.java 2006-03-30 19:19:33.000000000 +0100 @@ -53,7 +53,7 @@ private TestCertUtils() { throw new Error("statics only"); - }; + } /** * Returns new instance of test certificate each time the method is called. @@ -618,8 +618,6 @@ int len; try { while ((len = is.read(chunk)) > 0) { - String sch = new String(chunk); - String sdata = new String(data); byte[] tmp = new byte[data.length + len]; System.arraycopy(data, 0, tmp, 0, data.length); System.arraycopy(chunk, 0, tmp, data.length, len); Index: modules/security/test/common/unit/org/apache/harmony/security/asn1/der/BooleanTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/asn1/der/BooleanTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/asn1/der/BooleanTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,17 +21,16 @@ package org.apache.harmony.security.asn1.der; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Arrays; +import junit.framework.TestCase; + import org.apache.harmony.security.asn1.ASN1Boolean; import org.apache.harmony.security.asn1.ASN1Exception; import org.apache.harmony.security.asn1.DerInputStream; import org.apache.harmony.security.asn1.DerOutputStream; -import junit.framework.TestCase; - /** * ASN.1 DER test for Boolean type Index: modules/security/test/common/unit/org/apache/harmony/security/asn1/der/ChoiceTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/asn1/der/ChoiceTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/asn1/der/ChoiceTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -185,11 +185,10 @@ byte[] encoded = new byte[] { (byte) 0xA0, 0x03, 0x01, 0x01, 0x00 }; - assertEquals("False: ", Boolean.FALSE, (Boolean) explicit - .decode(encoded)); + assertEquals("False: ", Boolean.FALSE, explicit.decode(encoded)); encoded[4] = (byte) 0xFF; - assertEquals("True: ", Boolean.TRUE, (Boolean) explicit.decode(encoded)); + assertEquals("True: ", Boolean.TRUE, explicit.decode(encoded)); } } \ No newline at end of file Index: modules/security/test/common/unit/org/apache/harmony/security/asn1/der/OidTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/asn1/der/OidTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/asn1/der/OidTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -107,8 +107,7 @@ public void testEncode() throws IOException { for (int i = 0; i < oid.length; i++) { - DerOutputStream out = new DerOutputStream(ASN1Oid.getInstance(), - (int[]) oid[i][1]); + DerOutputStream out = new DerOutputStream(ASN1Oid.getInstance(), oid[i][1]); assertTrue((String) oid[i][0], Arrays.equals((byte[]) oid[i][2], out.encoded)); } Index: modules/security/test/common/unit/org/apache/harmony/security/cert/TestUtils.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/cert/TestUtils.java.orig 2006-03-20 18:37:41.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/cert/TestUtils.java 2006-03-30 19:19:33.000000000 +0100 @@ -27,7 +27,6 @@ import java.io.IOException; import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; -import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertPathValidatorException; import java.security.cert.CertStore; Index: modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CRLImplTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CRLImplTest.java.orig 2006-03-20 18:37:41.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CRLImplTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,31 +21,27 @@ package org.apache.harmony.security.provider.cert; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; -import java.security.cert.CRL; -import java.security.cert.CertificateFactory; -import java.security.cert.X509Certificate; import java.security.cert.CRLException; +import java.security.cert.CertificateFactory; import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Set; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.PublicKey; -import java.security.PrivateKey; + import javax.security.auth.x500.X500Principal; -import org.apache.harmony.security.asn1.ASN1GeneralizedTime; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.harmony.security.asn1.ASN1Integer; -import org.apache.harmony.security.asn1.ASN1OctetString; -import org.apache.harmony.security.provider.cert.X509CRLImpl; -import org.apache.harmony.security.provider.cert.X509CertImpl; import org.apache.harmony.security.x501.Name; import org.apache.harmony.security.x509.AlgorithmIdentifier; import org.apache.harmony.security.x509.AuthorityKeyIdentifier; @@ -60,10 +56,6 @@ import org.apache.harmony.security.x509.TBSCertificate; import org.apache.harmony.security.x509.Validity; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * X509CRLImplTest */ Index: modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java.orig 2006-03-20 18:37:41.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,19 +24,12 @@ import java.io.ByteArrayInputStream; import java.security.cert.CRL; import java.security.cert.CRLException; -import java.security.cert.CertPath; import java.security.cert.Certificate; import java.security.cert.CertificateException; -import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Iterator; -import org.apache.harmony.security.pkcs7.ContentInfo; -import org.apache.harmony.security.pkcs7.SignedData; -import org.apache.harmony.security.provider.cert.X509CertFactoryImpl; - - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -99,7 +92,6 @@ */ public void testEngineGenerateCertificates() { X509CertFactoryImpl certFactory = new X509CertFactoryImpl(); - Certificate cert; // DER encoded certificate generation testing ByteArrayInputStream bais = @@ -159,7 +151,6 @@ */ public void testEngineGenerateCRLs() { X509CertFactoryImpl certFactory = new X509CertFactoryImpl(); - CRL crl; // DER encoded crt generation testing ByteArrayInputStream bais = Index: modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryPerfTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryPerfTest.java.orig 2006-03-20 18:37:41.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryPerfTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -333,7 +333,6 @@ } private static int XXX = 0, flag = 0; - private static java.security.cert.Certificate prev = null; public void testCreationCRL() { try { @@ -653,7 +652,7 @@ if (certSans == null) { fail("Returned value should not be null."); } - List sans = (List) extnSANames.getPairsList(); + List sans = extnSANames.getPairsList(); if (sans.size() != certSans.size()) { fail("Size of returned collection does not match to the actual"); } @@ -663,7 +662,7 @@ Integer tag = (Integer) extnSan.get(0); for (int i=0; i< sans.size(); i++) { List san = (List) sans.get(i); - if (tag.equals((Integer) san.get(0))) { + if (tag.equals(san.get(0))) { assertEquals( "Incorrect value of Subject Alternative Name", extnSan.get(1), san.get(1)); @@ -684,7 +683,7 @@ if (certIans == null) { fail("Returned value should not be null."); } - List ians = (List) extnSANames.getPairsList(); + List ians = extnSANames.getPairsList(); if (ians.size() != certIans.size()) { fail("Size of returned collection does not match to the actual"); } @@ -694,7 +693,7 @@ Integer tag = (Integer) extnIan.get(0); for (int i=0; i< ians.size(); i++) { List ian = (List) ians.get(i); - if (tag.equals((Integer) ian.get(0))) { + if (tag.equals(ian.get(0))) { assertEquals( "Incorrect value of Issuer Alternative Name", extnIan.get(1), ian.get(1)); Index: modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertImplTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertImplTest.java.orig 2006-03-20 18:37:41.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertImplTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -532,7 +532,7 @@ if (certSans == null) { fail("Returned value should not be null."); } - List sans = (List) extnSANames.getPairsList(); + List sans = extnSANames.getPairsList(); if (sans.size() != certSans.size()) { fail("Size of returned collection does not match to the actual"); } @@ -542,7 +542,7 @@ Integer tag = (Integer) extnSan.get(0); for (int i=0; i< sans.size(); i++) { List san = (List) sans.get(i); - if (tag.equals((Integer) san.get(0))) { + if (tag.equals(san.get(0))) { assertEquals( "Incorrect value of Subject Alternative Name", extnSan.get(1), san.get(1)); @@ -563,7 +563,7 @@ if (certIans == null) { fail("Returned value should not be null."); } - List ians = (List) extnSANames.getPairsList(); + List ians = extnSANames.getPairsList(); if (ians.size() != certIans.size()) { fail("Size of returned collection does not match to the actual"); } @@ -573,7 +573,7 @@ Integer tag = (Integer) extnIan.get(0); for (int i=0; i< ians.size(); i++) { List ian = (List) ians.get(i); - if (tag.equals((Integer) ian.get(0))) { + if (tag.equals(ian.get(0))) { assertEquals( "Incorrect value of Issuer Alternative Name", extnIan.get(1), ian.get(1)); Index: modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertPathImplTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertPathImplTest.java.orig 2006-03-20 18:37:41.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/provider/cert/X509CertPathImplTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,22 +22,13 @@ package org.apache.harmony.security.provider.cert; import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.security.cert.CertPath; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.harmony.security.asn1.BerInputStream; -import org.apache.harmony.security.provider.cert.X509CertImplTest; -import org.apache.harmony.security.provider.cert.X509CertPathImpl; -import org.apache.harmony.security.x509.Certificate; - - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -144,18 +135,8 @@ /** * getEncoded() method testing. */ - public void testGetEncoded1() { - try { - byte[] encoding = certPath.getEncoded(); - } catch (CertificateEncodingException e) { - e.printStackTrace(); - fail("Unexpected CertificateEncodingException was thrown:" - + e.getMessage()); - } catch (CertificateException e) { - e.printStackTrace(); - fail("Unexpected CertificateException was thrown:" - + e.getMessage()); - } + public void testGetEncoded1() throws Exception { + certPath.getEncoded(); } /** @@ -166,11 +147,6 @@ certPath.getEncoded("ABRACADABRA"); fail("CertificateEncodingException should be thrown"); } catch (CertificateEncodingException e) { - // pass - } catch (CertificateException e) { - e.printStackTrace(); - fail("Unexpected CertificateException was thrown:" - + e.getMessage()); } } Index: modules/security/test/common/unit/org/apache/harmony/security/test/SecurityTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/test/SecurityTest.java.orig 2006-03-20 18:37:40.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/test/SecurityTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -896,9 +896,6 @@ } public void testToArray_NotEmptySet() { - - Object[] sample; - set.add(element); assertEquals("Set is not empty", set.toArray().length, 1); assertTrue("Set element", set.toArray()[0] == element); @@ -1419,8 +1416,6 @@ } public void testToArray_NotEmptySet() { - Object[] sample; - set.add(element); setReadOnly(); @@ -1701,8 +1696,6 @@ } public void testToArray_NotEmptySet() { - Object[] sample; - set.add(element); setSecure(); Index: modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java.orig 2006-03-20 18:37:44.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -114,7 +114,7 @@ */ public final void testConfigParser_02() throws Exception { - DefaultConfigurationParser dcp = new DefaultConfigurationParser(); + new DefaultConfigurationParser(); Map config = DefaultConfigurationParser.configParser(url, p, new HashMap()); entriesList = (LinkedList) config.get("Login1"); @@ -145,7 +145,6 @@ */ public final void testNegConfig() throws Exception { - final String path = p.getProperty("java.io.tmpdir") + File.separator; String[] str = { "Login ERR {\n com.intel.security.auth.module.LoginModule required debug=\"true\" test=false;\n};", @@ -179,7 +178,7 @@ os.flush(); os.close(); try { - Map config = DefaultConfigurationParser.configParser(file.toURL(), p, new HashMap()); + DefaultConfigurationParser.configParser(file.toURL(), p, new HashMap()); fail("no expected InvalidFormatException" + i); } catch (NullPointerException e) { System.out.println(file.getCanonicalPath()); Index: modules/security/test/common/unit/org/apache/harmony/security/x509/CertificateListTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x509/CertificateListTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x509/CertificateListTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,35 +24,23 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; +import java.math.BigInteger; import java.security.cert.CertificateFactory; import java.security.cert.X509CRL; import java.security.cert.X509CRLEntry; -import java.math.BigInteger; import java.util.Arrays; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; -import org.apache.harmony.security.asn1.ASN1GeneralizedTime; -import org.apache.harmony.security.asn1.ASN1Integer; -import org.apache.harmony.security.asn1.ASN1OctetString; -import org.apache.harmony.security.x501.Name; -import org.apache.harmony.security.x509.AlgorithmIdentifier; -import org.apache.harmony.security.x509.CertificateList; -import org.apache.harmony.security.x509.Extension; -import org.apache.harmony.security.x509.Extensions; -import org.apache.harmony.security.x509.GeneralName; -import org.apache.harmony.security.x509.GeneralNames; -import org.apache.harmony.security.x509.TBSCertList; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.harmony.security.asn1.ASN1GeneralizedTime; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.x501.Name; + /** * CertificateListTest */ @@ -216,7 +204,7 @@ Set rcerts = crl.getRevokedCertificates(); System.out.println(">> rcerts:"+rcerts); - System.out.println("}>> "+((X509CRLEntry) rcerts.toArray()[0])); + System.out.println("}>> "+ rcerts.toArray()[0]); System.out.println("}>> "+((X509CRLEntry) rcerts.toArray()[0]).getCertificateIssuer()); System.out.println("}>> "+((X509CRLEntry) rcerts.toArray()[1]).getCertificateIssuer()); System.out.println("}>> "+((X509CRLEntry) rcerts.toArray()[2]).getCertificateIssuer()); Index: modules/security/test/common/unit/org/apache/harmony/security/x509/CertificatePoliciesTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x509/CertificatePoliciesTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x509/CertificatePoliciesTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,9 +23,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.harmony.security.asn1.*; -import org.apache.harmony.security.x509.CertificatePolicies; -import org.apache.harmony.security.x509.PolicyInformation; import junit.framework.Test; import junit.framework.TestCase; Index: modules/security/test/common/unit/org/apache/harmony/security/x509/CertificateTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x509/CertificateTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x509/CertificateTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,33 +21,21 @@ package org.apache.harmony.security.x509; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.cert.*; - -import org.apache.harmony.security.asn1.ASN1Integer; - -import org.apache.harmony.security.asn1.*; -import org.apache.harmony.security.x501.Name; -import org.apache.harmony.security.x509.AlgorithmIdentifier; -import org.apache.harmony.security.x509.Certificate; -import org.apache.harmony.security.x509.EDIPartyName; -import org.apache.harmony.security.x509.Extension; -import org.apache.harmony.security.x509.Extensions; -import org.apache.harmony.security.x509.GeneralName; -import org.apache.harmony.security.x509.GeneralNames; -import org.apache.harmony.security.x509.NameConstraints; -import org.apache.harmony.security.x509.ORAddress; -import org.apache.harmony.security.x509.OtherName; -import org.apache.harmony.security.x509.SubjectPublicKeyInfo; -import org.apache.harmony.security.x509.TBSCertificate; -import org.apache.harmony.security.x509.Validity; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.util.Arrays; +import java.util.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.x501.Name; + /** * Testing the encoding/decoding work of the following structure: * (as specified in RFC 3280 - @@ -155,21 +143,20 @@ extensions.addExtension(extension); byte[] encoding = extensions.getEncoded(); - Extensions exts = (Extensions) Extensions.ASN1.decode(encoding); + //Extensions exts = (Extensions) Extensions.ASN1.decode(encoding); TBSCertificate tbsCertificate = new TBSCertificate(version, serialNumber, signature, issuer, validity, subject, subjectPublicKeyInfo, issuerUniqueID, subjectUniqueID, extensions); encoding = tbsCertificate.getEncoded(); - TBSCertificate tbsCert = (TBSCertificate) - TBSCertificate.ASN1.decode(encoding); + //TBSCertificate tbsCert = (TBSCertificate)TBSCertificate.ASN1.decode(encoding); Certificate certificate = new Certificate(tbsCertificate, signature, new byte[10]); encoding = certificate.getEncoded(); - Certificate cert = (Certificate) Certificate.ASN1.decode(encoding); + //Certificate cert = (Certificate) Certificate.ASN1.decode(encoding); encoding = Certificate.ASN1.encode(certificate); @@ -178,7 +165,7 @@ try { CertificateFactory cf = CertificateFactory.getInstance("X.509"); - X509Certificate _cert = (X509Certificate) cf.generateCertificate(bais); + cf.generateCertificate(bais); } catch (CertificateException e) { // there is no X.509 certificate factory implementation installed } Index: modules/security/test/common/unit/org/apache/harmony/security/x509/EDIPartyNameTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x509/EDIPartyNameTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x509/EDIPartyNameTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,13 +21,7 @@ package org.apache.harmony.security.x509; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import org.apache.harmony.security.asn1.*; -import org.apache.harmony.security.x509.EDIPartyName; -import org.apache.harmony.security.x509.GeneralName; -import org.apache.harmony.security.x509.GeneralNames; +import java.util.Arrays; import junit.framework.Test; import junit.framework.TestCase; @@ -80,7 +74,7 @@ printAsHex(16, "", " ", _encoded); System.out.println(""); pass = false; - }; + } GeneralName gName = new GeneralName(ediPN); encoded = gName.getEncoded(); @@ -102,7 +96,7 @@ printAsHex(16, "", " ", _encoded); System.out.println(""); pass = false; - }; + } GeneralNames gNames = new GeneralNames(); gNames.addName(gName); @@ -126,7 +120,7 @@ printAsHex(16, "", " ", _encoded); System.out.println(""); pass = false; - }; + } } catch (Exception e) { e.printStackTrace(); fail("Unexpected Exception was thrown."); Index: modules/security/test/common/unit/org/apache/harmony/security/x509/GeneralNameTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x509/GeneralNameTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x509/GeneralNameTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,13 +21,12 @@ package org.apache.harmony.security.x509; -import org.apache.harmony.security.x501.Name; -import org.apache.harmony.security.x509.*; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.harmony.security.x501.Name; + /** * GeneralNameTest Index: modules/security/test/common/unit/org/apache/harmony/security/x509/ORAddressTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x509/ORAddressTest.java.orig 2006-03-20 18:37:43.000000000 +0000 +++ modules/security/test/common/unit/org/apache/harmony/security/x509/ORAddressTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,12 +21,6 @@ package org.apache.harmony.security.x509; -import java.io.*; - -import org.apache.harmony.security.x509.GeneralName; -import org.apache.harmony.security.x509.GeneralNames; -import org.apache.harmony.security.x509.ORAddress; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; Index: modules/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java =================================================================== --- modules/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java.orig 2006-03-20 18:36:57.000000000 +0000 +++ modules/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,11 +23,10 @@ import java.io.FileInputStream; import java.security.AccessController; +import java.security.KeyStore; import java.security.Provider; import java.security.Security; -import java.security.KeyStore; import java.util.Iterator; -import java.util.Set; import org.apache.harmony.security.fortress.Engine; import org.apache.harmony.security.fortress.Services; @@ -55,7 +54,6 @@ private static SSLContext findDefault() { // FIXME EXPORT CONTROL - Set s; Provider.Service service; for (Iterator it1 = Services.getProvidersList().iterator(); it1 .hasNext();) { Index: modules/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java =================================================================== --- modules/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java.orig 2006-03-20 18:36:57.000000000 +0000 +++ modules/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java 2006-03-30 19:19:33.000000000 +0100 @@ -24,9 +24,10 @@ import java.io.Serializable; import java.security.Principal; import java.security.cert.Certificate; -import javax.security.cert.X509Certificate; import java.util.EventObject; +import javax.security.cert.X509Certificate; + /** * @com.intel.drl.spec_ref * Index: modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java =================================================================== --- modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java.orig 2006-03-20 18:36:57.000000000 +0000 +++ modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java 2006-03-30 19:19:33.000000000 +0100 @@ -21,10 +21,10 @@ package javax.net.ssl; +import java.security.KeyStore; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.security.KeyStore; /** * @com.intel.drl.spec_ref Index: modules/x-net/src/main/java/javax/net/ssl/SSLSession.java =================================================================== --- modules/x-net/src/main/java/javax/net/ssl/SSLSession.java.orig 2006-03-20 18:36:57.000000000 +0000 +++ modules/x-net/src/main/java/javax/net/ssl/SSLSession.java 2006-03-30 19:19:33.000000000 +0100 @@ -23,6 +23,7 @@ import java.security.Principal; import java.security.cert.Certificate; + import javax.security.cert.X509Certificate; /** Index: modules/x-net/src/test/java/javax/net/ssl/HandshakeCompletedEventTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/HandshakeCompletedEventTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/HandshakeCompletedEventTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,7 +22,6 @@ package javax.net.ssl; import java.io.IOException; -import javax.net.SocketFactory; import junit.framework.TestCase; Index: modules/x-net/src/test/java/javax/net/ssl/HttpsURLConnectionTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/HttpsURLConnectionTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/HttpsURLConnectionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -90,7 +90,7 @@ public final void testGetDefaultSSLSocketFactory() { SSLSocketFactory sf = HttpsURLConnection.getDefaultSSLSocketFactory(); - if (!sf.equals((SSLSocketFactory) SSLSocketFactory.getDefault())) { + if (!sf.equals(SSLSocketFactory.getDefault())) { fail("incorrect DefaultSSLSocketFactory"); } } @@ -98,7 +98,7 @@ public final void testGetSSLSocketFactory() { HttpsURLConnection con = new MyHttpsURLConnection(null); SSLSocketFactory sf = con.getSSLSocketFactory(); - if (!sf.equals((SSLSocketFactory) SSLSocketFactory.getDefault())) { + if (!sf.equals(SSLSocketFactory.getDefault())) { fail("incorrect DefaultSSLSocketFactory"); } } Index: modules/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -52,8 +52,7 @@ * Assertion: constructs KeyManagerFactorySpi */ public void testKeyManagerFactorySpi01() { - KeyManagerFactorySpi kmfSpi = (KeyManagerFactorySpi) new MyKeyManagerFactorySpi(); - assertTrue(kmfSpi instanceof KeyManagerFactorySpi); + KeyManagerFactorySpi kmfSpi = new MyKeyManagerFactorySpi(); assertNull(kmfSpi.engineGetKeyManagers()); KeyStore kStore = null; ManagerFactoryParameters mfp = null; @@ -97,13 +96,13 @@ } catch (Exception e) { fail("Unexpected: ".concat(e.toString())); } - mfp = (ManagerFactoryParameters) new MyKeyManagerFactorySpi.Parameters(kStore, null); + mfp = new MyKeyManagerFactorySpi.Parameters(kStore, null); try { kmfSpi.engineInit(mfp); fail("InvalidAlgorithmParameterException must be thrown"); } catch (InvalidAlgorithmParameterException e) { } - mfp = (ManagerFactoryParameters) new MyKeyManagerFactorySpi.Parameters(kStore, pass); + mfp = new MyKeyManagerFactorySpi.Parameters(kStore, pass); try { kmfSpi.engineInit(mfp); } catch (InvalidAlgorithmParameterException e) { Index: modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java 2006-03-30 19:19:33.000000000 +0100 @@ -45,7 +45,7 @@ protected SSLSocketFactory engineGetSocketFactory() { if (!init) { throw new RuntimeException("Not initialiazed"); - }; + } return null; } @@ -111,7 +111,7 @@ public String[] getEnabledCipherSuites() { return null; } public String[] getEnabledProtocols() {return null; } public boolean getEnableSessionCreation() { return true; } - public SSLEngineResult.HandshakeStatus getHandshakeStatus() { return null; }; + public SSLEngineResult.HandshakeStatus getHandshakeStatus() { return null; } public boolean getNeedClientAuth() { return true; } public SSLSession getSession() { return null; } public String[] getSupportedCipherSuites() { return null; } Index: modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -22,8 +22,6 @@ package javax.net.ssl; import java.security.KeyManagementException; -import java.security.KeyStore; -import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import javax.net.ssl.SSLContextSpi; @@ -51,7 +49,7 @@ * Assertion: constructs SSLContextSpi */ public void testSSLContextSpi01() throws KeyManagementException { - SSLContextSpi sslConSpi = (SSLContextSpi) new MySSLContextSpi(); + SSLContextSpi sslConSpi = new MySSLContextSpi(); try { sslConSpi.engineGetSocketFactory(); fail("RuntimeException must be thrown"); @@ -89,7 +87,6 @@ assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); } sslConSpi.engineInit(null, null, new SecureRandom()); - assertTrue("Not SSLContextSpi object", sslConSpi instanceof SSLContextSpi); assertNull("Not null result", sslConSpi.engineGetSocketFactory()); assertNull("Not null result", sslConSpi.engineGetServerSocketFactory()); assertNotNull("Null result", sslConSpi.engineCreateSSLEngine()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -221,14 +221,4 @@ } */ - private boolean findEl(Object[] arr, Object el) { - boolean ok = false; - for (int i = 0; i < arr.length; i++) { - if (arr[i].equals(el)) { - ok = true; - break; - } - } - return ok; - } } Index: modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -43,7 +43,6 @@ */ public void test01() { SSLEngine e = new mySSLEngine(); - assertTrue(e instanceof SSLEngine); assertNull(e.getPeerHost()); assertEquals(e.getPeerPort(), -1); String[] suites = { "a", "b", "c" }; @@ -57,7 +56,6 @@ public void test02() throws SSLException { int port = 1010; SSLEngine e = new mySSLEngine(null, port); - assertTrue(e instanceof SSLEngine); assertNull(e.getPeerHost()); assertEquals(e.getPeerPort(), port); try { @@ -73,7 +71,6 @@ String host = "new host"; int port = 8080; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); assertEquals(e.getPeerHost(), host); assertEquals(e.getPeerPort(), port); String[] suites = { "a", "b", "c" }; @@ -99,7 +96,6 @@ ByteBuffer bbN = null; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.wrap(bbN, bb); fail("IllegalArgumentException must be thrown for null src byte buffer"); @@ -141,7 +137,6 @@ ByteBuffer bb = ByteBuffer.allocate(10); ByteBuffer bbN = null; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.wrap(bbNA, bb); fail("IllegalArgumentException must be thrown for null srcs byte buffer array"); @@ -182,14 +177,12 @@ ByteBuffer bbs = ByteBuffer.allocate(100); ByteBuffer bbd = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine1(host, port); - assertTrue(e instanceof SSLEngine); try { e.wrap(bbs, bbd); fail("SSLException must be thrown"); } catch (SSLException ex) { } SSLEngineResult res = e.wrap(bbd, bbs); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); @@ -199,7 +192,6 @@ } catch (SSLException ex) { } res = e.wrap(new ByteBuffer[] { bbd }, bbs); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); } @@ -215,10 +207,8 @@ int port = 8080; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.wrap(bb, ByteBuffer.allocate(10)); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); } @@ -236,10 +226,8 @@ ByteBuffer[] bbA = { ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5) }; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.wrap(bbA, bb); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); } @@ -261,7 +249,6 @@ ByteBuffer bbN = null; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.unwrap(bbN, bb); fail("IllegalArgumentException must be thrown for null src byte buffer"); @@ -303,7 +290,6 @@ ByteBuffer bb = ByteBuffer.allocate(10); ByteBuffer bbN = null; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.unwrap(bb, bbNA); fail("IllegalArgumentException must be thrown for null dsts byte buffer array"); @@ -344,14 +330,12 @@ ByteBuffer bbs = ByteBuffer.allocate(100); ByteBuffer bbd = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine1(); - assertTrue(e instanceof SSLEngine); try { e.unwrap(bbs, bbd); fail("SSLException must be thrown"); } catch (SSLException ex) { } SSLEngineResult res = e.unwrap(bbd, bbs); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); @@ -361,7 +345,6 @@ } catch (SSLException ex) { } res = e.unwrap(bbd, new ByteBuffer[] { bbs }); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); } @@ -376,10 +359,8 @@ int port = 8080; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.unwrap(bb, ByteBuffer.allocate(10)); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); } @@ -397,10 +378,8 @@ ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.unwrap(bb, bbA); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); } Index: modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLException"; - static String createErr(Exception tE, Exception eE) { return "SSLException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLHandshakeException"; - static String createErr(Exception tE, Exception eE) { return "SSLHandshakeException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLKeyException"; - static String createErr(Exception tE, Exception eE) { return "SSLKeyException ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLPeerUnverifiedException"; - static String createErr(Exception tE, Exception eE) { return "SSLPeerUnverifiedException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLProtocolException"; - static String createErr(Exception tE, Exception eE) { return "SSLProtocolException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java 2006-03-30 19:19:33.000000000 +0100 @@ -37,7 +37,7 @@ */ public void testSSLServerSocket() { try { - SSLServerSocket soc = new MySSLServerSocket(); + new MySSLServerSocket(); } catch (IOException e) { fail(e.toString()); } @@ -48,7 +48,7 @@ */ public void testSSLServerSocketint() { try { - SSLServerSocket soc = new MySSLServerSocket(0); + new MySSLServerSocket(0); } catch (IOException e) { fail(e.toString()); } @@ -59,7 +59,7 @@ */ public void testSSLServerSocketintint() { try { - SSLServerSocket soc = new MySSLServerSocket(0, 10); + new MySSLServerSocket(0, 10); } catch (IOException e) { fail(e.toString()); } @@ -70,8 +70,7 @@ */ public void testSSLServerSocketintintInetAddress() { try { - SSLServerSocket soc = new MySSLServerSocket(0, 10, InetAddress - .getLocalHost()); + new MySSLServerSocket(0, 10, InetAddress.getLocalHost()); } catch (IOException e) { fail(e.toString()); } Index: modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java.orig 2006-03-20 18:36:56.000000000 +0000 +++ modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java 2006-03-30 19:19:33.000000000 +0100 @@ -50,9 +50,7 @@ * Assertion: constructs TrustManagerFactorySpi */ public void testTrustManagerFactorySpi01() throws InvalidAlgorithmParameterException { - TrustManagerFactorySpi kmfSpi = (TrustManagerFactorySpi) new MyTrustManagerFactorySpi(); - assertTrue("Not TrustManagerFactorySpi", - kmfSpi instanceof TrustManagerFactorySpi); + TrustManagerFactorySpi kmfSpi = new MyTrustManagerFactorySpi(); assertNull("Not null results", kmfSpi.engineGetTrustManagers()); KeyStore kStore = null; ManagerFactoryParameters mfp = null; @@ -85,7 +83,7 @@ } catch (KeyStoreException e) { fail("Unexpected KeyStoreException was thrown"); } - mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(null); + mfp = new MyTrustManagerFactorySpi.Parameters(null); try { kmfSpi.engineInit(mfp); fail("RuntimeException must be thrown"); @@ -94,7 +92,7 @@ } catch (InvalidAlgorithmParameterException e) { fail("Unexpected: ".concat(e.toString())); } - mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(kStore); + mfp = new MyTrustManagerFactorySpi.Parameters(kStore); kmfSpi.engineInit(mfp); } }