diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:57 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:57 -0800 |
| commit | b7926325a1c1a370c84c81db80372f59af240a53 (patch) | |
| tree | b1d0214be443ea674d0ded8c502a8e074e50bdd2 /security/src | |
| parent | 687f18b91f4a0a728a027579110953ee729adcb8 (diff) | |
| download | libcore-b7926325a1c1a370c84c81db80372f59af240a53.zip libcore-b7926325a1c1a370c84c81db80372f59af240a53.tar.gz libcore-b7926325a1c1a370c84c81db80372f59af240a53.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'security/src')
159 files changed, 676 insertions, 1431 deletions
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/Services.java b/security/src/main/java/org/apache/harmony/security/fortress/Services.java index 2e92d82..300854a 100644 --- a/security/src/main/java/org/apache/harmony/security/fortress/Services.java +++ b/security/src/main/java/org/apache/harmony/security/fortress/Services.java @@ -44,7 +44,11 @@ public class Services { // The HashMap that contains information about preferred implementations for // all serviceName.algName in the registered providers - private static final Map<String, Provider.Service> services = new HashMap<String, Provider.Service>(512); + // BEGIN android-changed + // set the initial size to 600 so we don't grow to 1024 by default because + // initialization adds a few entries more than the growth threshold. + private static final Map<String, Provider.Service> services = new HashMap<String, Provider.Service>(600); + // END android-changed // Need refresh flag private static boolean needRefresh; // = false; diff --git a/security/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/security/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java index d802228..d9f4727 100644 --- a/security/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java +++ b/security/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java @@ -112,7 +112,10 @@ public final class BouncyCastleProvider extends Provider // END android-removed put("AlgorithmParameters.IES", "org.bouncycastle.jce.provider.JDKAlgorithmParameters$IES"); put("AlgorithmParameters.PKCS12PBE", "org.bouncycastle.jce.provider.JDKAlgorithmParameters$PKCS12PBE"); - put("AlgorithmParameters.1.2.840.113549.3.7", "org.bouncycastle.jce.provider.JDKAlgorithmParameters$IVAlgorithmParameters"); + // BEGIN android-removed + // double entry + // put("AlgorithmParameters.1.2.840.113549.3.7", "org.bouncycastle.jce.provider.JDKAlgorithmParameters$IVAlgorithmParameters"); + // END android-removed // BEGIN android-removed // put("AlgorithmParameters.IDEA", "org.bouncycastle.jce.provider.JDKAlgorithmParameters$IDEAAlgorithmParameters"); // put("AlgorithmParameters.1.3.6.1.4.1.188.7.1.1.2", "org.bouncycastle.jce.provider.JDKAlgorithmParameters$IDEAAlgorithmParameters"); @@ -171,12 +174,14 @@ public final class BouncyCastleProvider extends Provider put("Alg.Alias.AlgorithmParameters.PBEWITHSHA-256AND192BITAES-CBC-BC","PKCS12PBE"); put("Alg.Alias.AlgorithmParameters.PBEWITHSHA-256AND256BITAES-CBC-BC","PKCS12PBE"); - put("AlgorithmParameters.SHA1WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); - put("AlgorithmParameters.SHA224WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); - put("AlgorithmParameters.SHA256WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); - put("AlgorithmParameters.SHA384WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); - put("AlgorithmParameters.SHA512WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); - + // BEGIN android-removed + // put("AlgorithmParameters.SHA1WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); + // put("AlgorithmParameters.SHA224WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); + // put("AlgorithmParameters.SHA256WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); + // put("AlgorithmParameters.SHA384WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); + // put("AlgorithmParameters.SHA512WITHECDSA", "org.bouncycastle.jce.provider.JDKECDSAAlgParameters$SigAlgParameters"); + // END android-removed + // // key agreement // @@ -491,9 +496,10 @@ public final class BouncyCastleProvider extends Provider put("Alg.Alias.KeyFactory.1.2.840.113549.1.1.1", "RSA"); put("Alg.Alias.KeyFactory.1.2.840.10040.4.1", "DSA"); - put("Alg.Alias.KeyFactory." + X9ObjectIdentifiers.id_ecPublicKey, "EC"); + // BEGIN android-removed + // put("Alg.Alias.KeyFactory." + X9ObjectIdentifiers.id_ecPublicKey, "EC"); - // END android-removed + // put("KeyFactory.GOST3410", "org.bouncycastle.jce.provider.JDKKeyFactory$GOST3410"); // put("Alg.Alias.KeyFactory.GOST-3410", "GOST3410"); // put("Alg.Alias.KeyFactory.GOST-3410-94", "GOST3410"); @@ -732,16 +738,18 @@ public final class BouncyCastleProvider extends Provider // private void addMessageDigestAlgorithms() { - put("MessageDigest.SHA-1", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA1"); - put("Alg.Alias.MessageDigest.SHA1", "SHA-1"); - put("Alg.Alias.MessageDigest.SHA", "SHA-1"); - put("Alg.Alias.MessageDigest." + OIWObjectIdentifiers.idSHA1, "SHA-1"); - put("MessageDigest.SHA-224", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA224"); - put("Alg.Alias.MessageDigest.SHA224", "SHA-224"); - put("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha224, "SHA-224"); - put("MessageDigest.SHA-256", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA256"); - put("Alg.Alias.MessageDigest.SHA256", "SHA-256"); - put("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha256, "SHA-256"); + // BEGIN android-removed + // put("MessageDigest.SHA-1", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA1"); + // put("Alg.Alias.MessageDigest.SHA1", "SHA-1"); + // put("Alg.Alias.MessageDigest.SHA", "SHA-1"); + // put("Alg.Alias.MessageDigest." + OIWObjectIdentifiers.idSHA1, "SHA-1"); + // put("MessageDigest.SHA-224", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA224"); + // put("Alg.Alias.MessageDigest.SHA224", "SHA-224"); + // put("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha224, "SHA-224"); + // put("MessageDigest.SHA-256", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA256"); + // put("Alg.Alias.MessageDigest.SHA256", "SHA-256"); + // put("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha256, "SHA-256"); + // END android-removed put("MessageDigest.SHA-384", "org.bouncycastle.jce.provider.JDKMessageDigest$SHA384"); put("Alg.Alias.MessageDigest.SHA384", "SHA-384"); put("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha384, "SHA-384"); @@ -754,10 +762,8 @@ public final class BouncyCastleProvider extends Provider // put("Alg.Alias.MessageDigest." + PKCSObjectIdentifiers.md2, "MD2"); // put("MessageDigest.MD4", "org.bouncycastle.jce.provider.JDKMessageDigest$MD4"); // put("Alg.Alias.MessageDigest." + PKCSObjectIdentifiers.md4, "MD4"); - // END android-removed - put("MessageDigest.MD5", "org.bouncycastle.jce.provider.JDKMessageDigest$MD5"); - put("Alg.Alias.MessageDigest." + PKCSObjectIdentifiers.md5, "MD5"); - // BEGIN android-removed + // put("MessageDigest.MD5", "org.bouncycastle.jce.provider.JDKMessageDigest$MD5"); + // put("Alg.Alias.MessageDigest." + PKCSObjectIdentifiers.md5, "MD5"); // put("MessageDigest.RIPEMD128", "org.bouncycastle.jce.provider.JDKMessageDigest$RIPEMD128"); // put("Alg.Alias.MessageDigest." + TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128"); // put("MessageDigest.RIPEMD160", "org.bouncycastle.jce.provider.JDKMessageDigest$RIPEMD160"); diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java index 85d6c71..1ff236a 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java @@ -49,14 +49,6 @@ import junit.framework.TestCase; */ public class AlgorithmParameterGenerator1Test extends TestCase { - /** - * Constructor for AlgorithmParameterGeneratorTests. - * - * @param arg0 - */ - public AlgorithmParameterGenerator1Test(String arg0) { - super(arg0); - } private static String[] invalidValues = SpiEngUtils.invalidValues; private static String validAlgName = "DSA"; diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java index efa8e04..c67822a 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java @@ -82,15 +82,6 @@ public class AlgorithmParameterGenerator2Test extends TestCase { Security.removeProvider(mProv.getName()); } - /** - * Constructor for SecurityManagerFactoryTest2. - * - * @param arg0 - */ - public AlgorithmParameterGenerator2Test(String arg0) { - super(arg0); - } - private void checkResult(AlgorithmParameterGenerator algParGen) throws InvalidAlgorithmParameterException { AlgorithmParameters param = algParGen.generateParameters(); diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java index 100c077..5ec3d96 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java @@ -35,14 +35,6 @@ import junit.framework.TestCase; @TestTargetClass(AlgorithmParametersSpi.class) public class AlgorithmParametersSpiTest extends TestCase { - /** - * Constructor for AlgorithmParametersSpiTest. - * - * @param name - */ - public AlgorithmParametersSpiTest(String name) { - super(name); - } /** * Test for <code>AlgorithmParametersSpi</code> constructor diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java index d02f2c7..e29d9ac 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java @@ -180,7 +180,7 @@ public class CodeSignerTest extends TestCase { assertTrue(new CodeSigner(cpath, null).toString().contains("")); assertTrue(new CodeSigner(cpath, ts).toString().contains("")); - assertTrue(new CodeSigner(cpath, null).toString().contains("CodeSigner")); + assertTrue(new CodeSigner(cpath, null).toString().contains("Signer")); assertTrue(new CodeSigner(cpath, ts).toString().contains(ts.toString())); } diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java index ad59b99..276dfd7 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java @@ -83,45 +83,52 @@ public class CodeSourceTest extends TestCase { private static URL urlFileDirStar; private static URL urlRef1, urlRef2; - - static { - try { - String siteName = "www.intel.com"; - InetAddress addr = InetAddress.getByName(siteName); - String siteIP = addr.getHostAddress(); - - urlSite = new URL("http://"+siteName+""); - urlDir = new URL("http://"+siteName+"/drl_test"); - urlDirOtherSite = new URL("http://www.any-other-site-which-is-not-siteName.com/drl_test"); - - urlDir_port80 = new URL("http://"+siteName+":80/drl_test"); - urlDir_port81 = new URL("http://"+siteName+":81/drl_test"); - urlDirWithSlash = new URL(urlDir + "/"); - - //urlDirFtp = new URL("ftp://www.intel.com/drl_test"); - urlDir_FileProtocol = new URL("file://"+siteName+"/drl_test"); - - urlDirIP = new URL("http://"+siteIP+"/drl_test"); - - urlFile = new URL("http://"+siteName+"/drl_test/empty.jar"); - urlFileWithAdditionalDirs = new URL( - "http://"+siteName+"/drl_test/what/ever/here/empty.jar"); - - urlFileDirMinus = new URL("http://"+siteName+"/drl_test/-"); - urlFileDirStar = new URL("http://"+siteName+"/drl_test/*"); - urlFileDirOtherDir = new URL("http://"+siteName+"/_test_drl_/*"); - - urlRef1 = new URL("http://"+siteName+"/drl_test/index.html#ref1"); - urlRef2 = new URL("http://"+siteName+"/drl_test/index.html#ref2"); - } catch (MalformedURLException ex) { - throw new Error(ex); - } catch (UnknownHostException ex) { - throw new Error(ex); + + private boolean init = false; + + private void init() { + if (!init) { + try { + String siteName = "www.intel.com"; + InetAddress addr = InetAddress.getByName(siteName); + String siteIP = addr.getHostAddress(); + + urlSite = new URL("http://"+siteName+""); + urlDir = new URL("http://"+siteName+"/drl_test"); + urlDirOtherSite = new URL("http://www.any-other-site-which-is-not-siteName.com/drl_test"); + + urlDir_port80 = new URL("http://"+siteName+":80/drl_test"); + urlDir_port81 = new URL("http://"+siteName+":81/drl_test"); + urlDirWithSlash = new URL(urlDir + "/"); + + //urlDirFtp = new URL("ftp://www.intel.com/drl_test"); + urlDir_FileProtocol = new URL("file://"+siteName+"/drl_test"); + + urlDirIP = new URL("http://"+siteIP+"/drl_test"); + + urlFile = new URL("http://"+siteName+"/drl_test/empty.jar"); + urlFileWithAdditionalDirs = new URL( + "http://"+siteName+"/drl_test/what/ever/here/empty.jar"); + + urlFileDirMinus = new URL("http://"+siteName+"/drl_test/-"); + urlFileDirStar = new URL("http://"+siteName+"/drl_test/*"); + urlFileDirOtherDir = new URL("http://"+siteName+"/_test_drl_/*"); + + urlRef1 = new URL("http://"+siteName+"/drl_test/index.html#ref1"); + urlRef2 = new URL("http://"+siteName+"/drl_test/index.html#ref2"); + } catch (MalformedURLException ex) { + throw new Error(ex); + } catch (UnknownHostException ex) { + throw new Error(ex); + } finally { + init = true; + } } } protected void setUp() throws Exception { super.setUp(); + init(); chain = TestCertUtils.getCertChain(); } diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java index f13cc92..b6f0fe2 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java @@ -37,18 +37,6 @@ import junit.framework.TestCase; */ public class DigestExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for DigestExceptionTests. - * - * @param arg0 - */ - public DigestExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java index 44f697b..0eed898 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java @@ -70,14 +70,6 @@ public class DigestInputStreamTest extends TestCase { */ private static final int MY_MESSAGE_LEN = myMessage.length; - /** - * Constructor for DigestInputStreamTest. - * @param name - */ - public DigestInputStreamTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java index 794a10b..8309c87 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java @@ -75,14 +75,6 @@ public class DigestOutputStreamTest extends TestCase { */ private static final int MY_MESSAGE_LEN = myMessage.length; - /** - * Constructor for DigestInputStreamTest. - * @param name - */ - public DigestOutputStreamTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java index 7cc9d37..5bdd450 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class GeneralSecurityExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for GeneralSecurityExceptionTests. - * - * @param arg0 - */ - public GeneralSecurityExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java index 962a775..1c3e5d6 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java @@ -244,7 +244,8 @@ public class Identity2Test extends junit.framework.TestCase { args = {java.lang.String.class, java.security.IdentityScope.class} ) public void test_ConstructorLjava_lang_StringLjava_security_IdentityScope() { - String[] str = {"test", "", "!@#$%^&*()", "identity name", null}; + String nameNull = null; + String[] str = {"test", "", "!@#$%^&*()", "identity name"}; IdentityScopeSubclass iss = new IdentityScopeSubclass("name"); IdentitySubclass is; @@ -254,11 +255,19 @@ public class Identity2Test extends junit.framework.TestCase { assertNotNull(is); assertTrue(is instanceof Identity); } catch (Exception e) { + System.out.println(e); fail("Unexpected exception for parameter " + str[i]); } } try { + is = new IdentitySubclass(nameNull, new IdentityScopeSubclass()); + } catch (NullPointerException npe) { + } catch (Exception e) { + fail("Incorrect exception " + e + " was thrown"); + } + + try { is = new IdentitySubclass("test", iss); is = new IdentitySubclass("test", iss); fail("KeyManagementException was not thrown"); diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java index c97a7f3..3fca2fa 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java @@ -166,7 +166,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { args = {java.lang.String.class, java.security.IdentityScope.class} ) public void test_ConstructorLjava_lang_StringLjava_security_IdentityScope() { - String[] str = {"test", "", "!@#$%^&*()", "identity name", null}; + String nameNull = null; + String[] str = {"test", "", "!@#$%^&*()", "identity name"}; IdentityScope is; IdentityScope iss = new IdentityScopeSubclass("test scope"); @@ -181,6 +182,13 @@ public class IdentityScope2Test extends junit.framework.TestCase { } try { + is = new IdentityScopeSubclass(nameNull, new IdentityScopeSubclass()); + } catch (NullPointerException npe) { + } catch (Exception e) { + fail("Incorrect exception " + e + " was thrown"); + } + + try { is = new IdentityScopeSubclass("test", iss); is = new IdentityScopeSubclass("test", iss); fail("KeyManagementException was not thrown"); diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java index 109c776..5b1ea7f 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java @@ -58,14 +58,6 @@ public class IdentityScopeTest extends TestCase { IdentityScope is; /** - * Constructor for IdentityScopeTest. - * @param arg0 - */ - public IdentityScopeTest(String arg0) { - super(arg0); - } - - /** * Class under test for String toString() */ @TestTargetNew( diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java index a4848fd..849f29c 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class InvalidAlgorithmParameterExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for InvalidAlgorithmParameterExceptionTests. - * - * @param arg0 - */ - public InvalidAlgorithmParameterExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java index fb08d32..5f5f7da 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java @@ -37,18 +37,6 @@ import junit.framework.TestCase; */ public class InvalidKeyExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for InvalidKeyExceptionTests. - * - * @param arg0 - */ - public InvalidKeyExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java index c6442d8..c22b903 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class InvalidParameterExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for InvalidParameterExceptionTests. - * - * @param arg0 - */ - public InvalidParameterExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java index 8c64110..056d7eb 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java @@ -46,14 +46,6 @@ import junit.framework.TestCase; public class KSCallbackHandlerProtectionTest extends TestCase { /** - * Constructor for KSCallbackHandlerProtectionTest. - * @param arg0 - */ - public KSCallbackHandlerProtectionTest(String arg0) { - super(arg0); - } - - /** * Test for <code>KeyStore.CallbackHandlerProtection(CallbackHandler handler)</code> * constructor * Assertion: throws NullPointerException when handler is null diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java index 5bbe687..0c8ec0a 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java @@ -41,14 +41,6 @@ import junit.framework.TestCase; public class KSPasswordProtectionTest extends TestCase { /** - * Constructor for KSPasswordProtectionTest. - * @param arg0 - */ - public KSPasswordProtectionTest(String arg0) { - super(arg0); - } - - /** * Test for <code>KeyStore.PasswordProtection(char[] password)</code> constructor * and the following methods * <code>getPassword()<code> diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java index 4be5d18..dc7880f 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java @@ -46,13 +46,6 @@ import junit.framework.TestSuite; public class KSPrivateKeyEntryTest extends TestCase { - /** - * Constructor for KSPrivateKeyEntryTest. - * @param arg0 - */ - public KSPrivateKeyEntryTest(String arg0) { - super(arg0); - } private PrivateKey testPrivateKey; private Certificate [] testChain; diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java index 58d7d0a..f4c995d 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java @@ -41,13 +41,6 @@ import junit.framework.TestCase; public class KSSecretKeyEntryTest extends TestCase { /** - * Constructor for KSSecretKeyTest. - * @param arg0 - */ - public KSSecretKeyEntryTest(String arg0) { - super(arg0); - } - /** * Test for <code>SecretKeyEntry(SecretKey secretKey)</code> constructor * Assertion: throws NullPointerException when secretKey is null */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java index b75ee68..af46c54 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java @@ -37,18 +37,6 @@ import junit.framework.TestCase; */ public class KeyExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for KeyExceptionTests. - * - * @param arg0 - */ - public KeyExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java index b8e0c85..c0f548c 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java @@ -39,15 +39,6 @@ import junit.framework.TestCase; public class KeyFactorySpiTest extends TestCase { /** - * Constructor for KeyFactorySpiTest. - * - * @param name - */ - public KeyFactorySpiTest(String name) { - super(name); - } - - /** * Test for <code>KeyFactorySpi</code> constructor * Assertion: constructs KeyFactorySpi */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java index b0548e4..67c2284 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class KeyManagementExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for KeyManagementExceptionTests. - * - * @param arg0 - */ - public KeyManagementExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java index 4a61cb7..742cc13 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java @@ -51,15 +51,6 @@ import junit.framework.TestCase; public class KeyPairGenerator1Test extends TestCase { - /** - * Constructor for KayPairGeneratorTest. - * - * @param arg0 - */ - public KeyPairGenerator1Test(String arg0) { - super(arg0); - } - private static String[] invalidValues = SpiEngUtils.invalidValues; public static final String srvKeyPairGenerator = "KeyPairGenerator"; diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java index a3b1d54..9a8c5c5 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java @@ -91,15 +91,6 @@ public class KeyPairGenerator2Test extends TestCase { Security.insertProviderAt(mProv, 1); } - /** - * Constructor for SecurityManagerFactoryTest2. - * - * @param arg0 - */ - public KeyPairGenerator2Test(String arg0) { - super(arg0); - } - private void checkResult(KeyPairGenerator keyPairGen, int mode) throws InvalidAlgorithmParameterException { AlgorithmParameterSpec pp = null; diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java index a3aa4ee..69ec7a7 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java @@ -49,15 +49,6 @@ import junit.framework.TestCase; public class KeyPairGenerator3Test extends TestCase { - /** - * Constructor for KeyPairGenerator3Test. - * - * @param arg0 - */ - public KeyPairGenerator3Test(String arg0) { - super(arg0); - } - private static String validProviderName = null; public static Provider validProvider = null; diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java index fb67c6f..8d75921 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java @@ -46,15 +46,6 @@ import junit.framework.TestCase; public class KeyPairGeneratorSpiTest extends TestCase { /** - * Constructor for KeyPairGeneratorSpiTest. - * - * @param arg0 - */ - public KeyPairGeneratorSpiTest(String arg0) { - super(arg0); - } - - /** * Test for <code>KeyPairGeneratorSpi</code> constructor * Assertion: constructs KeyPairGeneratorSpi */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java index 1f54198..a428334 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java @@ -69,13 +69,6 @@ public class KeyPairTest extends TestCase { } } - /** - * Constructor for KeyPairTest. - * @param name - */ - public KeyPairTest(String name) { - super(name); - } /** * Test #1 for <code>KeyPair(PublicKey, PrivateKey)</code> constructor<br> diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java index 2889a7b..bf5b136 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java @@ -695,7 +695,7 @@ public class KeyStore4Test extends TestCase { ) public void testGetProvider() { assertNotNull(keyStore.getProvider()); - assertSame(provider, keyStore.getProvider()); + assertEquals("not equal", provider, keyStore.getProvider()); } } diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java index 27f6b60..ac62d58 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java @@ -37,18 +37,6 @@ import junit.framework.TestCase; */ public class KeyStoreExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for KeyStoreExceptionTests. - * - * @param arg0 - */ - public KeyStoreExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java index f0b2f3e..2ccca0e 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java @@ -161,15 +161,6 @@ import java.util.Date; public class KeyStoreSpiTest extends TestCase { - /** - * Constructor for KeyStoreSpi. - * - * @param arg0 - */ - public KeyStoreSpiTest(String arg0) { - super(arg0); - } - @SuppressWarnings("cast") @TestTargetNew( level = TestLevel.COMPLETE, diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java index e49611c..d7ae43f 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java @@ -22,7 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; @@ -267,7 +266,6 @@ public class KeyStoreTest extends TestCase { method = "getPassword", args = {} ) - @KnownFailure("the password char[] is not cloned in the constructor of PasswordProtection") public void testKeyStorePPGetPassword() { // Regression for HARMONY-1539 // no exception expected diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java index 2fa48ab..ddbddc4 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java @@ -39,15 +39,6 @@ import junit.framework.TestCase; public class KeyTest extends TestCase { /** - * Constructor for KeyTest. - * - * @param arg0 - */ - public KeyTest(String arg0) { - super(arg0); - } - - /** * Test for <code>serialVersionUID</code> field */ @TestTargetNew( diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java index 8074591..9a6b457 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class NoSuchAlgorithmExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for NoSuchAlgorithmExceptionTests. - * - * @param arg0 - */ - public NoSuchAlgorithmExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java index a67fdc0..7cb1558 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class NoSuchProviderExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for NoSuchProviderExceptionTests. - * - * @param arg0 - */ - public NoSuchProviderExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java index f1369b4..82815eb 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java @@ -27,7 +27,6 @@ import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; -import java.security.AllPermission; import java.security.Permission; import java.security.PermissionCollection; import java.util.*; @@ -41,32 +40,26 @@ import junit.framework.TestCase; public class PermissionCollectionTest extends TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(PermissionCollectionTest.class); - } - - /** - * Constructor for PermissionCollectionTest. - * @param arg0 - */ - public PermissionCollectionTest(String arg0) { - super(arg0); - } - // Bare extension to instantiate abstract PermissionCollection class private static final class RealPermissionCollection extends PermissionCollection { - final private Collection col; - public RealPermissionCollection(Collection col) + final private Set <Permission> setCol = new HashSet<Permission>(); + public RealPermissionCollection(Set <Permission> col) { - this.col = col; + if (col != null) { + setCol.addAll(col); + } + } + + public void add(Permission permission) { + if (!setCol.add(permission)) { + throw new IllegalArgumentException("permission is not added"); + } } - - public void add(Permission permission) {} public Enumeration elements() { - return col == null ? null : Collections.enumeration(col); + return setCol == null ? null : Collections.enumeration(setCol); } public boolean implies(Permission permission) @@ -107,12 +100,37 @@ public class PermissionCollectionTest extends TestCase { args = {} ) public void testToString() { - PermissionCollection pc = new RealPermissionCollection(null); + Set<Permission> perm = new HashSet<Permission>(); + Permission p = new RealPermission("TestPermission"); + perm.add(p); + PermissionCollection pc = new RealPermissionCollection(perm); try { String str = pc.toString(); assertNotNull("toString return null", str); } catch (Exception e) { - fail("Unexpected exception"); + fail("Unexpected exception " + e); } } } + +class RealPermission extends Permission { + + public RealPermission(String name) { + super(name); + } + + public boolean equals(Object obj) { + return false; + } + + public String getActions() { + return null; + } + public int hashCode() { + return 0; + } + + public boolean implies(Permission permission) { + return false; + } +} diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java index 5707ef2..85d4851 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java @@ -44,15 +44,6 @@ public class PermissionTest extends TestCase { junit.textui.TestRunner.run(PermissionTest.class); } - /** - * Constructor for PermissionTest. - * - * @param arg0 - */ - public PermissionTest(String arg0) { - super(arg0); - } - // Bare extension to instantiate abstract Permission class static final class RealPermission extends Permission { diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java index fbb4fea..b968a03 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java @@ -38,15 +38,6 @@ import junit.framework.TestCase; public class PrivateKeyTest extends TestCase { /** - * Constructor for PrivateKeyTest. - * - * @param arg0 - */ - public PrivateKeyTest(String arg0) { - super(arg0); - } - - /** * Test for <code>serialVersionUID</code> field */ @TestTargetNew( diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java index 0aba8e4..2350679 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java @@ -37,18 +37,6 @@ import junit.framework.TestCase; */ public class ProviderExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for ProviderExceptionTests. - * - * @param arg0 - */ - public ProviderExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java index 9e87833..fafd6e3 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java @@ -408,7 +408,6 @@ public class ProviderTest extends TestCase { method = "remove", args = {java.lang.Object.class} ) - @KnownFailure("AccessController/AccessControlContext grants Permissions by default") public final void testRemoveObject() { Object o = p.remove("MessageDigest.SHA-1"); if (!"SomeClassName".equals(o)) { diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java index 8697880..f9efe56 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java @@ -22,14 +22,12 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.PublicKey; import junit.framework.TestCase; +import dalvik.annotation.TestLevel; +import dalvik.annotation.TestTargetClass; +import dalvik.annotation.TestTargetNew; @TestTargetClass(PublicKey.class) /** * Tests for <code>PublicKey</code> class field @@ -38,16 +36,6 @@ import junit.framework.TestCase; public class PublicKeyTest extends TestCase { - - /** - * Constructor for PublicKeyTest. - * - * @param arg0 - */ - public PublicKeyTest(String arg0) { - super(arg0); - } - /** * Test for <code>serialVersionUID</code> field */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java index f569684..8ca84b9 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java @@ -35,15 +35,6 @@ import junit.framework.TestCase; public class SecureRandomSpiTest extends TestCase { /** - * Constructor for SecureRandomSpiTest. - * - * @param name - */ - public SecureRandomSpiTest(String name) { - super(name); - } - - /** * Test for <code>SecureRandomSpi</code> constructor * Assertion: constructs SecureRandomSpi */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java index 211f666..2531c81 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java @@ -42,14 +42,6 @@ public class SecurityPermissionTest extends TestCase { } /** - * Constructor for SecurityPermissionTest. - * @param arg0 - */ - public SecurityPermissionTest(String arg0) { - super(arg0); - } - - /** * Check all constructors: an object is created with the specified valid name. * If name equal null then NPE should be thrown. * If name is empty then IAE should be thrown. diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java index 959b452..5e2bfe3 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java @@ -37,18 +37,6 @@ import junit.framework.TestCase; */ public class SignatureExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for SignatureExceptionTests. - * - * @param arg0 - */ - public SignatureExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java index 0a08069..3bfc664 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java @@ -512,20 +512,27 @@ public class SignatureTest extends TestCase { assertTrue("update() failed", s.runEngineUpdate2); try { - s.update(b, 3, 0); - } catch (SignatureException e) { - fail("unexpected: " + e); + s.update(null, 0, 3); + fail("NullPointerException wasn't thrown"); + } catch (NullPointerException npe) { } try { - s.update(b, 2, 4); + s.update(b, 3, 0); fail("expected IllegalArgumentException"); } catch (IllegalArgumentException e) { // ok } try { - s.update(null, 0, 5); + s.update(b, 0, b.length + 1); + fail("expected IllegalArgumentException"); + } catch (IllegalArgumentException e) { + // ok + } + + try { + s.update(b, -1, b.length); fail("expected IllegalArgumentException"); } catch (IllegalArgumentException e) { // ok diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java index 7eda819..898ab17 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java @@ -63,14 +63,6 @@ public class SignerTest extends TestCase { } /** - * Constructor for SignerTest. - * @param arg0 - */ - public SignerTest(String arg0) { - super(arg0); - } - - /** * @tests java.security.Signer#toString() */ @TestTargetNew( @@ -86,7 +78,8 @@ public class SignerTest extends TestCase { Signer s2 = new SignerStub("testToString2", IdentityScope.getSystemScope()); s2.toString(); - KeyPair kp = new KeyPair(new PublicKeyStub("public", "SignerTest.testToString", null), new PrivateKeyStub("private", "SignerTest.testToString", null)); + KeyPair kp = new KeyPair(new PublicKeyStub("public", "SignerTest.testToString", null), + new PrivateKeyStub("private", "SignerTest.testToString", null)); s1.setKeyPair(kp); s1.toString(); @@ -198,15 +191,17 @@ public class SignerTest extends TestCase { System.setSecurityManager(sm); try { Signer s = new SignerStub("sss6"); - s.setKeyPair(new KeyPair(new PublicKeyStub("public", "fff", null), new PrivateKeyStub("private", "fff", null))); + s.setKeyPair(new KeyPair(new PublicKeyStub("public", "fff", null), new PrivateKeyStub( + "private", "fff", null))); try { s.getPrivateKey(); fail("SecurityException should be thrown"); - } catch (SecurityException ok) {} + } catch (SecurityException ok) { + } } finally { System.setSecurityManager(null); } - + } /** diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java index c985ef8..96b0847 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java @@ -38,15 +38,6 @@ import junit.framework.TestCase; public class UnrecoverableEntryExceptionTest extends TestCase { - /** - * Constructor for UnrecoverableEntryExceptionTest. - * - * @param arg0 - */ - public UnrecoverableEntryExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java index d1dd78b..dda3231 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java @@ -38,18 +38,6 @@ import junit.framework.TestCase; */ public class UnrecoverableKeyExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for UnrecoverableKeyExceptionTests. - * - * @param arg0 - */ - public UnrecoverableKeyExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/api/java/security/AccessControlContextTest.java b/security/src/test/java/tests/api/java/security/AccessControlContextTest.java index c77647c..9831472 100644 --- a/security/src/test/java/tests/api/java/security/AccessControlContextTest.java +++ b/security/src/test/java/tests/api/java/security/AccessControlContextTest.java @@ -17,7 +17,6 @@ package tests.api.java.security; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -251,7 +250,6 @@ public class AccessControlContextTest extends junit.framework.TestCase { method = "equals", args = {java.lang.Object.class} ) - @KnownFailure("AccessControlContext.equals() doesn't compare the DomainCombiner") public void test_equals() { final Permission perm1 = new PropertyPermission("java.class.path", "read"); diff --git a/security/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java b/security/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java index 27402f2..8e45657 100644 --- a/security/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java +++ b/security/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java @@ -239,7 +239,7 @@ public class PrivateCredentialPermissionTest extends TestCase { } - PrivateCredentialPermission p3 = new PrivateCredentialPermission(name2, "read"); + PrivateCredentialPermission p3 = new PrivateCredentialPermission(name4, "read"); assertFalse("hashCode() must not be the same for non-equal PrivateCredentialPermission objects", p1.hashCode() == p3.hashCode()); } diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java b/security/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java index a14a46c..1bec4ce 100644 --- a/security/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java @@ -38,18 +38,6 @@ import javax.security.cert.CertificateEncodingException; @TestTargetClass(CertificateEncodingException.class) public class CertificateEncodingExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateEncodingExceptionTests. - * - * @param arg0 - */ - public CertificateEncodingExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java b/security/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java index 896b6bd..6641097 100644 --- a/security/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java @@ -39,18 +39,6 @@ import javax.security.cert.CertificateException; @TestTargetClass(CertificateException.class) public class CertificateExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateExceptionTests. - * - * @param arg0 - */ - public CertificateExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java b/security/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java index 7578dee..83af35c 100644 --- a/security/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java @@ -39,18 +39,6 @@ import javax.security.cert.CertificateExpiredException; @TestTargetClass(CertificateExpiredException.class) public class CertificateExpiredExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateExpiredExceptionTests. - * - * @param arg0 - */ - public CertificateExpiredExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java b/security/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java index 8a212e6..09fb186 100644 --- a/security/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java @@ -39,18 +39,6 @@ import javax.security.cert.CertificateNotYetValidException; @TestTargetClass(CertificateNotYetValidException.class) public class CertificateNotYetValidExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateNotYetValidExceptionTests. - * - * @param arg0 - */ - public CertificateNotYetValidExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java b/security/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java index d8bef51..c00d0dd 100644 --- a/security/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java @@ -39,17 +39,6 @@ import javax.security.cert.CertificateParsingException; @TestTargetClass(CertificateParsingException.class) public class CertificateParsingExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateParsingExceptionTests. - * - * @param arg0 - */ - public CertificateParsingExceptionTest(String arg0) { - super(arg0); - } static String[] msgs = { "", diff --git a/security/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java b/security/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java index 8f521f9..dac0633 100644 --- a/security/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java @@ -764,9 +764,9 @@ public class X509CertificateTest extends TestCase { @TestTargetNew( level = TestLevel.SUFFICIENT, notes = " CertificateException not supported."+ - "NoSuchAlgorithmException, NoSuchProviderException can be "+ - "implemented only with working Cert. Verification fails (see failing) "+ - "precondition assertions", + "NoSuchAlgorithmException, NoSuchProviderException can be "+ + "implemented only with working Cert. Verification fails (see failing) "+ + "precondition assertions", method = "verify", args = {java.security.PublicKey.class} ) @@ -779,9 +779,9 @@ public class X509CertificateTest extends TestCase { assertNotNull(javaxCert.getPublicKey()); assertNotNull(javaxSSCert.getPublicKey()); //precondition for self signed certificates - assertEquals(((X509Certificate) javaxSSCert).getIssuerDN().getName(), - ((X509Certificate) javaxSSCert).getSubjectDN()); - + /*assertEquals(((X509Certificate) javaxSSCert).getIssuerDN().getName(), + ((X509Certificate) javaxSSCert).getSubjectDN());*/ + // must always evaluate true for self signed // here not self signed: try { diff --git a/security/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java b/security/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java index 590e0b5..976a9cb 100644 --- a/security/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java +++ b/security/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java @@ -45,15 +45,6 @@ import junit.framework.TestCase; public class AlgorithmParameterGeneratorSpiTest extends TestCase { /** - * Constructor for CertPathBuilderTests. - * - * @param name - */ - public AlgorithmParameterGeneratorSpiTest(String name) { - super(name); - } - - /** * Test for <code>AlgorithmParameterGeneratorSpi</code> constructor * Assertion: constructs AlgorithmParameterGeneratorSpi */ diff --git a/security/src/test/java/tests/java/security/AllPermissionTest.java b/security/src/test/java/tests/java/security/AllPermissionTest.java index fa1d24d..e9668ad 100644 --- a/security/src/test/java/tests/java/security/AllPermissionTest.java +++ b/security/src/test/java/tests/java/security/AllPermissionTest.java @@ -45,14 +45,6 @@ public class AllPermissionTest extends TestCase { } /** - * Constructor for AllPermissionsTest. - * @param arg0 - */ - public AllPermissionTest(String arg0) { - super(arg0); - } - - /** * Test all constructors: an object is created, name and actions are ignored */ @TestTargets({ diff --git a/security/src/test/java/tests/java/security/BasicPermissionTest.java b/security/src/test/java/tests/java/security/BasicPermissionTest.java index 735871b..4987ab4 100644 --- a/security/src/test/java/tests/java/security/BasicPermissionTest.java +++ b/security/src/test/java/tests/java/security/BasicPermissionTest.java @@ -44,14 +44,6 @@ public class BasicPermissionTest extends TestCase { } /** - * Constructor for BasicPermissionTest. - * @param arg0 - */ - public BasicPermissionTest(String arg0) { - super(arg0); - } - - /** * Check all constructors: an object is created with the specified valid name. * If name equal null then NPE should be thrown. * If name is empty then IAE should be thrown. diff --git a/security/src/test/java/tests/java/security/IdentityTest.java b/security/src/test/java/tests/java/security/IdentityTest.java index 24ad095..3566ecf 100644 --- a/security/src/test/java/tests/java/security/IdentityTest.java +++ b/security/src/test/java/tests/java/security/IdentityTest.java @@ -60,14 +60,6 @@ public class IdentityTest extends TestCase { junit.textui.TestRunner.run(IdentityTest.class); } - /** - * Constructor for IdentityTest. - * @param name - */ - public IdentityTest(String name) { - super(name); - } - @TestTargetNew( level = TestLevel.PARTIAL, notes = "Method's returned variable is not checked", diff --git a/security/src/test/java/tests/security/AllTests.java b/security/src/test/java/tests/security/AllTests.java index 19d87a1..2ce2db0 100644 --- a/security/src/test/java/tests/security/AllTests.java +++ b/security/src/test/java/tests/security/AllTests.java @@ -40,7 +40,7 @@ public class AllTests { suite.addTest(tests.security.interfaces.AllTests.suite()); suite.addTest(tests.security.spec.AllTests.suite()); - suite.addTestSuite(tests.security.SecurityPermissionsTest.class); + suite.addTest(tests.security.SecurityPermissionsTest.suite()); suite.addTest(tests.api.javax.security.cert.AllTests.suite()); diff --git a/security/src/test/java/tests/security/acl/IAclEntryTest.java b/security/src/test/java/tests/security/acl/IAclEntryTest.java index 98c0a87..94ddf14 100644 --- a/security/src/test/java/tests/security/acl/IAclEntryTest.java +++ b/security/src/test/java/tests/security/acl/IAclEntryTest.java @@ -35,16 +35,6 @@ import org.apache.harmony.security.tests.support.acl.*; @TestTargetClass(AclEntry.class) public class IAclEntryTest extends TestCase { - /** - * Constructor for IAclEntryTest. - * - * @param arg0 - */ - public IAclEntryTest(String arg0) { - super(arg0); - } - - class MyAclEntry extends AclEntryImpl { public MyAclEntry() { super(); diff --git a/security/src/test/java/tests/security/acl/IAclTest.java b/security/src/test/java/tests/security/acl/IAclTest.java index 3cebcfa..65cb971 100644 --- a/security/src/test/java/tests/security/acl/IAclTest.java +++ b/security/src/test/java/tests/security/acl/IAclTest.java @@ -37,15 +37,6 @@ import org.apache.harmony.security.tests.support.acl.*; @TestTargetClass(Acl.class) public class IAclTest extends TestCase { - /** - * Constructor for IAclEntryTest. - * - * @param arg0 - */ - public IAclTest(String arg0) { - super(arg0); - } - class MyAcl extends AclImpl { public MyAcl(Principal principal, String str) { super(principal, str); diff --git a/security/src/test/java/tests/security/acl/IGroupTest.java b/security/src/test/java/tests/security/acl/IGroupTest.java index 7efec28..47eac93 100644 --- a/security/src/test/java/tests/security/acl/IGroupTest.java +++ b/security/src/test/java/tests/security/acl/IGroupTest.java @@ -33,15 +33,6 @@ import org.apache.harmony.security.tests.support.acl.*; @TestTargetClass(Group.class) public class IGroupTest extends TestCase { - /** - * Constructor for IOwnerTest. - * - * @param arg0 - */ - public IGroupTest(String arg0) { - super(arg0); - } - class MyGroup extends GroupImpl { public MyGroup(String str) { super(str); diff --git a/security/src/test/java/tests/security/acl/IOwnerTest.java b/security/src/test/java/tests/security/acl/IOwnerTest.java index 5324d4d..3cb222d 100644 --- a/security/src/test/java/tests/security/acl/IOwnerTest.java +++ b/security/src/test/java/tests/security/acl/IOwnerTest.java @@ -34,15 +34,6 @@ import org.apache.harmony.security.tests.support.acl.*; @TestTargetClass(Owner.class) public class IOwnerTest extends TestCase { - /** - * Constructor for IOwnerTest. - * - * @param arg0 - */ - public IOwnerTest(String arg0) { - super(arg0); - } - class MyOwner extends OwnerImpl { public MyOwner(Principal pr) { super(pr); diff --git a/security/src/test/java/tests/security/acl/IPermissionTest.java b/security/src/test/java/tests/security/acl/IPermissionTest.java index 19f18ea..17cd7a9 100644 --- a/security/src/test/java/tests/security/acl/IPermissionTest.java +++ b/security/src/test/java/tests/security/acl/IPermissionTest.java @@ -31,15 +31,6 @@ import org.apache.harmony.security.tests.support.acl.*; @TestTargetClass(Permission.class) public class IPermissionTest extends TestCase { - /** - * Constructor for IPermissionTest. - * - * @param arg0 - */ - public IPermissionTest(String arg0) { - super(arg0); - } - class MyPermission extends PermissionImpl { public MyPermission(String str) { super(str); diff --git a/security/src/test/java/tests/security/cert/CRLExceptionTest.java b/security/src/test/java/tests/security/cert/CRLExceptionTest.java index c43ef36..3fc37c0 100644 --- a/security/src/test/java/tests/security/cert/CRLExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CRLExceptionTest.java @@ -38,18 +38,6 @@ import java.security.cert.CRLException; @TestTargetClass(CRLException.class) public class CRLExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CRLExceptionTests. - * - * @param arg0 - */ - public CRLExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CRLTest.java b/security/src/test/java/tests/security/cert/CRLTest.java index e46a033..8e5693e 100644 --- a/security/src/test/java/tests/security/cert/CRLTest.java +++ b/security/src/test/java/tests/security/cert/CRLTest.java @@ -45,14 +45,6 @@ public class CRLTest extends TestCase { private final static String[] invalidValues = SpiEngUtils.invalidValues; - /** - * Constructor for CRLTest. - * @param name - */ - public CRLTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java b/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java index 7f5674d..5af75c2 100644 --- a/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java +++ b/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java @@ -53,13 +53,6 @@ import java.security.cert.CertificateException; @TestTargetClass(CertPathBuilder.class) public class CertPathBuilder1Test extends TestCase { - /** - * Constructor for CertPathBuilderTests. - * @param name - */ - public CertPathBuilder1Test(String name) { - super(name); - } public static final String srvCertPathBuilder = "CertPathBuilder"; public static final String defaultType = "PKIX"; @@ -398,6 +391,7 @@ public class CertPathBuilder1Test extends TestCase { method="build", args={CertPathParameters.class} ) + // Test passed on RI public void testBuild() throws Exception { TestUtils.initCertPathSSCertChain(); CertPathParameters params = TestUtils.getCertPathParameters(); diff --git a/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java b/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java index 3d4f4cf..fcf235e 100644 --- a/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java +++ b/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java @@ -82,15 +82,6 @@ public class CertPathBuilder2Test extends TestCase { Security.removeProvider(mProv.getName()); } - /** - * Constructor for CertPathBuilder2Test. - * - * @param arg0 - */ - public CertPathBuilder2Test(String arg0) { - super(arg0); - } - private void checkResult(CertPathBuilder certBuild) throws InvalidAlgorithmParameterException, CertPathBuilderException { diff --git a/security/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java b/security/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java index f8aeb08..efd575a 100644 --- a/security/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java @@ -40,18 +40,6 @@ import java.security.cert.CertPathBuilderException; @TestTargetClass(CertPathBuilderException.class) public class CertPathBuilderExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertPathBuilderExceptionTests. - * - * @param arg0 - */ - public CertPathBuilderExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java b/security/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java index 338060d..751f0c6 100644 --- a/security/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java +++ b/security/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java @@ -45,15 +45,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertPathBuilderSpi; public class CertPathBuilderSpiTest extends TestCase { /** - * Constructor for CertPathBuilderSpiTest. - * - * @param arg0 - */ - public CertPathBuilderSpiTest(String arg0) { - super(arg0); - } - - /** * Test for <code>CertPathBuilderSpi</code> constructor Assertion: * constructs CertPathBuilderSpi */ diff --git a/security/src/test/java/tests/security/cert/CertPathCertPathRepTest.java b/security/src/test/java/tests/security/cert/CertPathCertPathRepTest.java index 0e607c5..6ca848e 100644 --- a/security/src/test/java/tests/security/cert/CertPathCertPathRepTest.java +++ b/security/src/test/java/tests/security/cert/CertPathCertPathRepTest.java @@ -51,8 +51,8 @@ public class CertPathCertPathRepTest extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "ObjectStreamException checking missed", + level = TestLevel.PARTIAL_COMPLETE, + notes = "Checks ObjectStreamException", method = "CertPath.CertPathRep.readResolve", args = {} ) @@ -62,9 +62,9 @@ public class CertPathCertPathRepTest extends TestCase { try { Object obj = rep.readResolve(); - assertTrue(obj instanceof CertPath); + fail("ObjectStreamException was not thrown."); } catch (ObjectStreamException e) { - fail("unexpected exception: " + e); + //expected } rep = cp.new MyCertPathRep("MyEncoding", new byte[] {(byte) 1, (byte) 2, (byte) 3 }); diff --git a/security/src/test/java/tests/security/cert/CertPathTest.java b/security/src/test/java/tests/security/cert/CertPathTest.java index 10095ec..5edb3f5 100644 --- a/security/src/test/java/tests/security/cert/CertPathTest.java +++ b/security/src/test/java/tests/security/cert/CertPathTest.java @@ -341,6 +341,7 @@ public class CertPathTest extends TestCase { args = {} ) }) + // Test passed on RI public void testSerializationSelf() throws Exception { TestUtils.initCertPathSSCertChain(); CertPath certPath = TestUtils.buildCertPathSSCertChain(); @@ -371,6 +372,7 @@ public class CertPathTest extends TestCase { args = {} ) }) + // Test passed on RI public void testSerializationCompatibility() throws Exception { TestUtils.initCertPathSSCertChain(); CertPath certPath = TestUtils.buildCertPathSSCertChain(); diff --git a/security/src/test/java/tests/security/cert/CertPathValidator1Test.java b/security/src/test/java/tests/security/cert/CertPathValidator1Test.java index 54e210a..a76af78 100644 --- a/security/src/test/java/tests/security/cert/CertPathValidator1Test.java +++ b/security/src/test/java/tests/security/cert/CertPathValidator1Test.java @@ -52,13 +52,6 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; @TestTargetClass(CertPathValidator.class) public class CertPathValidator1Test extends TestCase { - /** - * Constructor for CertPathValidatorTests. - * @param name - */ - public CertPathValidator1Test(String name) { - super(name); - } public static final String srvCertPathValidator = "CertPathValidator"; private static final String defaultType = "PKIX"; diff --git a/security/src/test/java/tests/security/cert/CertPathValidator2Test.java b/security/src/test/java/tests/security/cert/CertPathValidator2Test.java index a7e922d..3f513cc 100644 --- a/security/src/test/java/tests/security/cert/CertPathValidator2Test.java +++ b/security/src/test/java/tests/security/cert/CertPathValidator2Test.java @@ -16,9 +16,9 @@ */ /** -* @author Vera Y. Petrashkova -* @version $Revision$ -*/ + * @author Vera Y. Petrashkova + * @version $Revision$ + */ package tests.security.cert; @@ -42,14 +42,14 @@ import java.security.cert.CertPathParameters; import java.security.cert.CertPathValidator; import java.security.cert.CertPathValidatorException; import java.security.cert.PKIXParameters; + /** * Tests for CertPathValidator class constructors and methods - * */ @TestTargetClass(CertPathValidator.class) public class CertPathValidator2Test extends TestCase { private static final String defaultAlg = "CertPB"; - + public static final String CertPathValidatorProviderClass = "org.apache.harmony.security.tests.support.cert.MyCertPathValidatorSpi"; private static final String[] invalidValues = SpiEngUtils.invalidValues; @@ -69,9 +69,8 @@ public class CertPathValidator2Test extends TestCase { protected void setUp() throws Exception { super.setUp(); mProv = (new SpiEngUtils()).new MyProvider("MyCertPathValidatorProvider", - "Provider for testing", CertPathValidator1Test.srvCertPathValidator - .concat(".").concat(defaultAlg), - CertPathValidatorProviderClass); + "Provider for testing", CertPathValidator1Test.srvCertPathValidator.concat(".") + .concat(defaultAlg), CertPathValidatorProviderClass); Security.insertProviderAt(mProv, 1); } @@ -83,51 +82,37 @@ public class CertPathValidator2Test extends TestCase { Security.removeProvider(mProv.getName()); } - /** - * Constructor for CertPathValidator2Test. - * - * @param arg0 - */ - public CertPathValidator2Test(String arg0) { - super(arg0); - } - - private void checkResult(CertPathValidator certV) - throws CertPathValidatorException, + private void checkResult(CertPathValidator certV) throws CertPathValidatorException, InvalidAlgorithmParameterException { String dt = CertPathValidator.getDefaultType(); String propName = "certpathvalidator.type"; - for (int i = 0; i <invalidValues.length; i++) { + for (int i = 0; i < invalidValues.length; i++) { Security.setProperty(propName, invalidValues[i]); assertEquals("Incorrect default type", CertPathValidator.getDefaultType(), invalidValues[i]); } Security.setProperty(propName, dt); - assertEquals("Incorrect default type", CertPathValidator.getDefaultType(), - dt); certV.validate(null, null); - try { - certV.validate(null, null); - } catch (CertPathValidatorException e) { - } - try { - certV.validate(null, null); - } catch (InvalidAlgorithmParameterException e) { - } + assertEquals("Incorrect default type", CertPathValidator.getDefaultType(), dt); + certV.validate(null, null); + try { + certV.validate(null, null); + } catch (CertPathValidatorException e) { + } + try { + certV.validate(null, null); + } catch (InvalidAlgorithmParameterException e) { + } } /** - * Test for <code>getInstance(String algorithm)</code> method - * Assertions: - * throws NullPointerException when algorithm is null - * throws NoSuchAlgorithmException when algorithm is not available - * returns CertPathValidator object + * Test for <code>getInstance(String algorithm)</code> method Assertions: + * throws NullPointerException when algorithm is null throws + * NoSuchAlgorithmException when algorithm is not available returns + * CertPathValidator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) + @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "getInstance", args = { + java.lang.String.class + }) public void testGetInstance01() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, CertPathValidatorException { try { @@ -139,8 +124,8 @@ public class CertPathValidator2Test extends TestCase { for (int i = 0; i < invalidValues.length; i++) { try { CertPathValidator.getInstance(invalidValues[i]); - fail("NoSuchAlgorithmException must be thrown (type: ".concat( - invalidValues[i]).concat(")")); + fail("NoSuchAlgorithmException must be thrown (type: ".concat(invalidValues[i]) + .concat(")")); } catch (NoSuchAlgorithmException e) { } } @@ -154,23 +139,19 @@ public class CertPathValidator2Test extends TestCase { } /** - * Test for <code>getInstance(String algorithm, String provider)</code> method - * Assertions: - * throws NullPointerException when algorithm is null - * throws NoSuchAlgorithmException when algorithm is not available - * throws IllegalArgumentException when provider is null or empty; - * throws NoSuchProviderException when provider is available; - * returns CertPathValidator object + * Test for <code>getInstance(String algorithm, String provider)</code> + * method Assertions: throws NullPointerException when algorithm is null + * throws NoSuchAlgorithmException when algorithm is not available throws + * IllegalArgumentException when provider is null or empty; throws + * NoSuchProviderException when provider is available; returns + * CertPathValidator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) - public void testGetInstance02() throws NoSuchAlgorithmException, - NoSuchProviderException, IllegalArgumentException, - InvalidAlgorithmParameterException, CertPathValidatorException { + @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "getInstance", args = { + java.lang.String.class, java.lang.String.class + }) + public void testGetInstance02() throws NoSuchAlgorithmException, NoSuchProviderException, + IllegalArgumentException, InvalidAlgorithmParameterException, + CertPathValidatorException { try { CertPathValidator.getInstance(null, mProv.getName()); fail("NullPointerException or NoSuchAlgorithmException must be thrown when algorithm is null"); @@ -179,10 +160,9 @@ public class CertPathValidator2Test extends TestCase { } for (int i = 0; i < invalidValues.length; i++) { try { - CertPathValidator.getInstance(invalidValues[i], mProv - .getName()); - fail("NoSuchAlgorithmException must be thrown (type: ".concat( - invalidValues[i]).concat(")")); + CertPathValidator.getInstance(invalidValues[i], mProv.getName()); + fail("NoSuchAlgorithmException must be thrown (type: ".concat(invalidValues[i]) + .concat(")")); } catch (NoSuchAlgorithmException e) { } } @@ -204,43 +184,33 @@ public class CertPathValidator2Test extends TestCase { for (int i = 0; i < validValues.length; i++) { for (int j = 1; j < invalidValues.length; j++) { try { - CertPathValidator.getInstance(validValues[i], - invalidValues[j]); - fail("NoSuchProviderException must be thrown (type: " - .concat(validValues[i]).concat(" provider: ") - .concat(invalidValues[j]).concat(")")); + CertPathValidator.getInstance(validValues[i], invalidValues[j]); + fail("NoSuchProviderException must be thrown (type: ".concat(validValues[i]) + .concat(" provider: ").concat(invalidValues[j]).concat(")")); } catch (NoSuchProviderException e) { } } } CertPathValidator cerPV; for (int i = 0; i < validValues.length; i++) { - cerPV = CertPathValidator.getInstance(validValues[i], mProv - .getName()); + cerPV = CertPathValidator.getInstance(validValues[i], mProv.getName()); assertEquals("Incorrect type", cerPV.getAlgorithm(), validValues[i]); - assertEquals("Incorrect provider", cerPV.getProvider().getName(), - mProv.getName()); + assertEquals("Incorrect provider", cerPV.getProvider().getName(), mProv.getName()); checkResult(cerPV); } } /** * Test for <code>getInstance(String algorithm, Provider provider)</code> - * method - * Assertions: - * throws NullPointerException when algorithm is null - * throws NoSuchAlgorithmException when algorithm is not available - * throws IllegalArgumentException when provider is null; - * returns CertPathValidator object + * method Assertions: throws NullPointerException when algorithm is null + * throws NoSuchAlgorithmException when algorithm is not available throws + * IllegalArgumentException when provider is null; returns CertPathValidator + * object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) - public void testGetInstance03() throws NoSuchAlgorithmException, - IllegalArgumentException, + @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "getInstance", args = { + java.lang.String.class, java.security.Provider.class + }) + public void testGetInstance03() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException, CertPathValidatorException { try { CertPathValidator.getInstance(null, mProv); @@ -251,8 +221,8 @@ public class CertPathValidator2Test extends TestCase { for (int i = 0; i < invalidValues.length; i++) { try { CertPathValidator.getInstance(invalidValues[i], mProv); - fail("NoSuchAlgorithmException must be thrown (type: ".concat( - invalidValues[i]).concat(")")); + fail("NoSuchAlgorithmException must be thrown (type: ".concat(invalidValues[i]) + .concat(")")); } catch (NoSuchAlgorithmException e) { } } @@ -273,35 +243,33 @@ public class CertPathValidator2Test extends TestCase { checkResult(cerPV); } } - - @TestTargetNew( - level=TestLevel.PARTIAL_COMPLETE, - method="validate", - args={CertPath.class,CertPathParameters.class} - ) + + @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "validate", args = { + CertPath.class, CertPathParameters.class + }) public void testValidate() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { MyCertPath mCP = new MyCertPath(new byte[0]); - CertPathParameters params = new PKIXParameters(TestUtils.getTrustAnchorSet()); + CertPathParameters params = new PKIXParameters(TestUtils.getTrustAnchorSet()); CertPathValidator certPV = CertPathValidator.getInstance(defaultAlg); try { certPV.validate(mCP, params); } catch (InvalidAlgorithmParameterException e) { - fail("unexpected exception: " + e); + fail("unexpected exception: " + e); } catch (CertPathValidatorException e) { fail("unexpected exception: " + e); } try { certPV.validate(null, params); fail("NullPointerException must be thrown"); - } catch(InvalidAlgorithmParameterException e) { + } catch (InvalidAlgorithmParameterException e) { fail("unexpected exception: " + e); } catch (CertPathValidatorException e) { // ok - } + } try { certPV.validate(mCP, null); fail("InvalidAlgorithmParameterException must be thrown"); - } catch(InvalidAlgorithmParameterException e) { + } catch (InvalidAlgorithmParameterException e) { // ok } catch (CertPathValidatorException e) { fail("unexpected exception"); diff --git a/security/src/test/java/tests/security/cert/CertPathValidator3Test.java b/security/src/test/java/tests/security/cert/CertPathValidator3Test.java index a590635..b624b25 100644 --- a/security/src/test/java/tests/security/cert/CertPathValidator3Test.java +++ b/security/src/test/java/tests/security/cert/CertPathValidator3Test.java @@ -50,13 +50,6 @@ import java.security.cert.PKIXParameters; @TestTargetClass(CertPathValidator.class) public class CertPathValidator3Test extends TestCase { - /** - * Constructor for CertPathValidatorTests. - * @param name - */ - public CertPathValidator3Test(String name) { - super(name); - } private static final String defaultType = CertPathBuilder1Test.defaultType; private static boolean PKIXSupport = false; diff --git a/security/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java b/security/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java index 57f5e71..c28a761 100644 --- a/security/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java @@ -46,18 +46,6 @@ import java.util.Vector; @TestTargetClass(CertPathValidatorException.class) public class CertPathValidatorExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertPathValidatorExceptionTests. - * - * @param arg0 - */ - public CertPathValidatorExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java b/security/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java index dbb1466..080a112 100644 --- a/security/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java +++ b/security/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java @@ -45,15 +45,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertPathValidatorSpi; public class CertPathValidatorSpiTest extends TestCase { /** - * Constructor for CertPathValidatorSpiTest. - * - * @param arg0 - */ - public CertPathValidatorSpiTest(String arg0) { - super(arg0); - } - - /** * Test for <code>CertPathValidatorSpi</code> constructor Assertion: * constructs CertPathValidatorSpi */ diff --git a/security/src/test/java/tests/security/cert/CertStore1Test.java b/security/src/test/java/tests/security/cert/CertStore1Test.java index 6f67aeb..48c40c9 100644 --- a/security/src/test/java/tests/security/cert/CertStore1Test.java +++ b/security/src/test/java/tests/security/cert/CertStore1Test.java @@ -54,13 +54,6 @@ import java.util.Collection; @TestTargetClass(CertStore.class) public class CertStore1Test extends TestCase { - /** - * Constructor for CertStoreTests. - * @param arg0 - */ - public CertStore1Test(String arg0) { - super(arg0); - } public static final String srvCertStore = "CertStore"; private static final String defaultType = "LDAP"; diff --git a/security/src/test/java/tests/security/cert/CertStoreExceptionTest.java b/security/src/test/java/tests/security/cert/CertStoreExceptionTest.java index d18fb78..9eddf86 100644 --- a/security/src/test/java/tests/security/cert/CertStoreExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertStoreExceptionTest.java @@ -38,18 +38,6 @@ import java.security.cert.CertStoreException; @TestTargetClass(CertStoreException.class) public class CertStoreExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertStoreExceptionTests. - * - * @param arg0 - */ - public CertStoreExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertStoreSpiTest.java b/security/src/test/java/tests/security/cert/CertStoreSpiTest.java index 8223f4c..3cac01f 100644 --- a/security/src/test/java/tests/security/cert/CertStoreSpiTest.java +++ b/security/src/test/java/tests/security/cert/CertStoreSpiTest.java @@ -50,14 +50,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertStoreSpi; @TestTargetClass(CertStoreSpi.class) public class CertStoreSpiTest extends TestCase { - /** - * Constructor for CertStoreSpiTest. - * - * @param arg0 - */ - public CertStoreSpiTest(String arg0) { - super(arg0); - } /** * Test for <code>CertStoreSpi</code> constructor Assertion: constructs diff --git a/security/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java b/security/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java index 38a857f..1792abe 100644 --- a/security/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java @@ -40,18 +40,6 @@ import java.security.cert.CertificateEncodingException; @TestTargetClass(CertificateEncodingException.class) public class CertificateEncodingExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateEncodingExceptionTests. - * - * @param arg0 - */ - public CertificateEncodingExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertificateExceptionTest.java b/security/src/test/java/tests/security/cert/CertificateExceptionTest.java index e1d6645..fbd777c 100644 --- a/security/src/test/java/tests/security/cert/CertificateExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertificateExceptionTest.java @@ -39,18 +39,6 @@ import java.security.cert.CertificateException; @TestTargetClass(CertificateException.class) public class CertificateExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateExceptionTests. - * - * @param arg0 - */ - public CertificateExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java b/security/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java index 647345f..9a7ce5a 100644 --- a/security/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java @@ -39,18 +39,6 @@ import java.security.cert.CertificateExpiredException; @TestTargetClass(CertificateExpiredException.class) public class CertificateExpiredExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateExpiredExceptionTests. - * - * @param arg0 - */ - public CertificateExpiredExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertificateFactory1Test.java b/security/src/test/java/tests/security/cert/CertificateFactory1Test.java index 7237871..b64e501 100644 --- a/security/src/test/java/tests/security/cert/CertificateFactory1Test.java +++ b/security/src/test/java/tests/security/cert/CertificateFactory1Test.java @@ -59,15 +59,6 @@ import java.util.Vector; @TestTargetClass(CertificateFactory.class) public class CertificateFactory1Test extends TestCase { - /** - * Constructor for CertificateFactoryTests. - * - * @param arg0 - */ - public CertificateFactory1Test(String arg0) { - super(arg0); - } - public static final String srvCertificateFactory = "CertificateFactory"; private static String defaultProviderName = null; @@ -539,6 +530,7 @@ public class CertificateFactory1Test extends TestCase { args = {java.io.InputStream.class} ) }) + // Test passed on RI public void testCertificateFactory11() throws IOException { if (!X509Support) { fail(NotSupportMsg); @@ -675,6 +667,7 @@ public class CertificateFactory1Test extends TestCase { args = {java.io.InputStream.class, java.lang.String.class} ) }) + // Test passed on RI public void testCertificateFactory13() throws IOException { if (!X509Support) { fail(NotSupportMsg); diff --git a/security/src/test/java/tests/security/cert/CertificateFactory2Test.java b/security/src/test/java/tests/security/cert/CertificateFactory2Test.java index 12c7ec1..4350db0 100644 --- a/security/src/test/java/tests/security/cert/CertificateFactory2Test.java +++ b/security/src/test/java/tests/security/cert/CertificateFactory2Test.java @@ -86,15 +86,6 @@ public class CertificateFactory2Test extends TestCase { Security.removeProvider(mProv.getName()); } - /** - * Constructor for CertificateFactory2Test. - * - * @param arg0 - */ - public CertificateFactory2Test(String arg0) { - super(arg0); - } - private void checkResult(CertificateFactory certFactory, boolean mode) throws CertificateException, CRLException { MyCertificateFactorySpi.putMode(mode); diff --git a/security/src/test/java/tests/security/cert/CertificateFactorySpiTest.java b/security/src/test/java/tests/security/cert/CertificateFactorySpiTest.java index 09090f6..fbb2372 100644 --- a/security/src/test/java/tests/security/cert/CertificateFactorySpiTest.java +++ b/security/src/test/java/tests/security/cert/CertificateFactorySpiTest.java @@ -51,16 +51,8 @@ import java.util.List; */ @TestTargetClass(CertificateFactorySpi.class) public class CertificateFactorySpiTest extends TestCase { - /** - * Constructor for CertStoreSpiTest. - * - * @param arg0 - */ - public CertificateFactorySpiTest(String arg0) { - super(arg0); - } - /** + /** * Test for <code>CertificateFactorySpi</code> constructor * Assertion: constructs CertificateFactorySpi */ diff --git a/security/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java b/security/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java index 2ed6b05..b386387 100644 --- a/security/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java @@ -39,18 +39,6 @@ import java.security.cert.CertificateNotYetValidException; @TestTargetClass(CertificateNotYetValidException.class) public class CertificateNotYetValidExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateNotYetValidExceptionTests. - * - * @param arg0 - */ - public CertificateNotYetValidExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java b/security/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java index c079f6c..c690b5b 100644 --- a/security/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java +++ b/security/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java @@ -40,18 +40,6 @@ import java.security.cert.CertificateParsingException; @TestTargetClass(CertificateParsingException.class) public class CertificateParsingExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for CertificateParsingExceptionTests. - * - * @param arg0 - */ - public CertificateParsingExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/cert/CertificateTest.java b/security/src/test/java/tests/security/cert/CertificateTest.java index 28fab31..c56c0c0 100644 --- a/security/src/test/java/tests/security/cert/CertificateTest.java +++ b/security/src/test/java/tests/security/cert/CertificateTest.java @@ -24,6 +24,7 @@ package tests.security.cert; +import dalvik.annotation.AndroidOnly; import dalvik.annotation.BrokenTest; import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; @@ -55,7 +56,7 @@ import org.apache.harmony.security.tests.support.cert.MyFailingCertificate; import org.apache.harmony.security.tests.support.cert.TestUtils; import org.apache.harmony.testframework.serialization.SerializationTest; -import tests.api.javax.security.cert.X509CertificateTest.MyModifiablePublicKey; +//import tests.api.javax.security.cert.X509CertificateTest.MyModifiablePublicKey; /** @@ -70,14 +71,6 @@ public class CertificateTest extends TestCase { private static final byte[] testEncoding = new byte[] { (byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5 }; - /** - * Constructor for CertificateTest. - * @param name - */ - public CertificateTest(String name) { - super(name); - } - // // Tests // @@ -91,6 +84,8 @@ public class CertificateTest extends TestCase { method = "Certificate", args = {java.lang.String.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testCertificate() { try { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); @@ -117,6 +112,8 @@ public class CertificateTest extends TestCase { method = "hashCode", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testHashCode() throws CertificateEncodingException { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); Certificate c2 = new MyCertificate("TEST_TYPE", testEncoding); @@ -138,6 +135,8 @@ public class CertificateTest extends TestCase { method = "hashCode", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testHashCodeEqualsObject() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); Certificate c2 = new MyCertificate("TEST_TYPE", testEncoding); @@ -157,6 +156,8 @@ public class CertificateTest extends TestCase { method = "getType", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testGetType() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); assertEquals("TEST_TYPE", c1.getType()); @@ -172,6 +173,8 @@ public class CertificateTest extends TestCase { method = "equals", args = {java.lang.Object.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject01() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); assertTrue(c1.equals(c1)); @@ -188,6 +191,8 @@ public class CertificateTest extends TestCase { method = "equals", args = {java.lang.Object.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject02() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); Certificate c2 = new MyCertificate("TEST_TYPE", testEncoding); @@ -204,6 +209,8 @@ public class CertificateTest extends TestCase { method = "equals", args = {java.lang.Object.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject03() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); assertFalse(c1.equals(null)); @@ -220,6 +227,8 @@ public class CertificateTest extends TestCase { method = "equals", args = {java.lang.Object.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject04() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); assertFalse(c1.equals("TEST_TYPE")); @@ -241,6 +250,8 @@ public class CertificateTest extends TestCase { method = "getEncoded", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") @KnownFailure("Assertion does not evaluate to true... Works in javax.Certificate") public final void testGetEncoded() throws CertificateException { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); @@ -276,6 +287,8 @@ public class CertificateTest extends TestCase { method = "verify", args = {java.security.PublicKey.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testVerifyPublicKey() throws InvalidKeyException, CertificateException, @@ -301,6 +314,8 @@ public class CertificateTest extends TestCase { method = "verify", args = {java.security.PublicKey.class, java.lang.String.class} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testVerifyPublicKeyString() throws InvalidKeyException, CertificateException, @@ -320,6 +335,8 @@ public class CertificateTest extends TestCase { method = "toString", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testToString() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); c1.toString(); @@ -334,6 +351,8 @@ public class CertificateTest extends TestCase { method = "getPublicKey", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testGetPublicKey() { Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding); c1.getPublicKey(); @@ -348,6 +367,8 @@ public class CertificateTest extends TestCase { method = "writeReplace", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testWriteReplace() { MyCertificate c1 = new MyCertificate("TEST_TYPE", testEncoding); @@ -517,7 +538,11 @@ public class MyModifiablePublicKey implements PublicKey { method = "verify", args = {java.security.PublicKey.class, java.lang.String.class} ) - @BrokenTest("Test fails: ClassCastException when SignatureException is expected") + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") + @KnownFailure("ClassCastException is thrown by " + + "Certificate.verify(PublicKey pk) method instead of " + + "InvalidKeyException.") public final void testVerifyPublicKeyString2() throws InvalidKeyException, CertificateException, NoSuchAlgorithmException, NoSuchProviderException, SignatureException { @@ -577,7 +602,11 @@ public class MyModifiablePublicKey implements PublicKey { method = "verify", args = {java.security.PublicKey.class} ) - @BrokenTest("ClassCastException") + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") + @KnownFailure("ClassCastException is thrown by " + + "Certificate.verify(PublicKey pk) method instead of " + + "InvalidKeyException. ") public final void testVerifyPublicKey2() throws InvalidKeyException, CertificateException, NoSuchAlgorithmException, NoSuchProviderException, SignatureException { @@ -628,6 +657,8 @@ public class MyModifiablePublicKey implements PublicKey { method = "writeReplace", args = {} ) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testWriteReplace2() { MyCertificate c1 = new MyFailingCertificate("TEST_TYPE", testEncoding); @@ -661,6 +692,8 @@ public class MyModifiablePublicKey implements PublicKey { args = {} ) }) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public void testSerializationSelf() throws Exception { TestUtils.initCertPathSSCertChain(); @@ -690,6 +723,8 @@ public class MyModifiablePublicKey implements PublicKey { args = {} ) }) + @AndroidOnly("Gets security providers with specific signature algorithm: " + + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public void testSerializationCompatibility() throws Exception { //create test file (once) // SerializationTest.createGoldenFile("device/dalvik/libcore/security/src/test/resources/serialization", this, TestUtils.rootCertificateSS); diff --git a/security/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java b/security/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java index f4fb0ec..551fda6 100644 --- a/security/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java +++ b/security/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java @@ -43,14 +43,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertificate; @TestTargetClass(CollectionCertStoreParameters.class) public class CollectionCertStoreParametersTest extends TestCase { - /** - * Constructor for CollectionCertStoreParametersTest. - * @param name - */ - public CollectionCertStoreParametersTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java b/security/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java index e699f91..66d5ad4 100644 --- a/security/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java +++ b/security/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java @@ -40,14 +40,6 @@ import java.security.cert.LDAPCertStoreParameters; @TestTargetClass(LDAPCertStoreParameters.class) public class LDAPCertStoreParametersTest extends TestCase { - /** - * Constructor for LDAPCertStoreParametersTest. - * @param name - */ - public LDAPCertStoreParametersTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java b/security/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java index 789fb6b..b3ebcb6 100644 --- a/security/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java +++ b/security/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java @@ -84,14 +84,6 @@ public class PKIXBuilderParametersTest extends TestCase { + "-----END CERTIFICATE-----\n"; /** - * Constructor for PKIXBuilderParametersTest. - * @param name - */ - public PKIXBuilderParametersTest(String name) { - super(name); - } - - /** * Test #1 for <code>PKIXBuilderParameters(Set, CertSelector)</code> * constructor<br> * Assertion: creates an instance of <code>PKIXBuilderParameters</code> diff --git a/security/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java b/security/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java index a7a5e74..57f7882 100644 --- a/security/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java +++ b/security/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java @@ -70,14 +70,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { }; - /** - * Constructor for PKIXCertPathBuilderResultTest. - * @param name - */ - public PKIXCertPathBuilderResultTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java b/security/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java index 01db618..6153d5c 100644 --- a/security/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java +++ b/security/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java @@ -46,14 +46,6 @@ import org.apache.harmony.security.tests.support.cert.TestUtils; @TestTargetClass(PKIXCertPathChecker.class) public class PKIXCertPathCheckerTest extends TestCase { - /** - * Constructor for PKIXCertPathCheckerTest. - * @param name - */ - public PKIXCertPathCheckerTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java b/security/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java index 610bdc4..e3970ac 100644 --- a/security/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java +++ b/security/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java @@ -60,14 +60,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { } }; - /** - * Constructor for PKIXCertPathValidatorResultTest. - * @param name - */ - public PKIXCertPathValidatorResultTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/cert/PKIXParametersTest.java b/security/src/test/java/tests/security/cert/PKIXParametersTest.java index 79f489e..efe46ed 100644 --- a/security/src/test/java/tests/security/cert/PKIXParametersTest.java +++ b/security/src/test/java/tests/security/cert/PKIXParametersTest.java @@ -22,7 +22,6 @@ package tests.security.cert; -import dalvik.annotation.BrokenTest; import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; @@ -69,15 +68,6 @@ public class PKIXParametersTest extends TestCase { private final static String testIssuer = "CN=VM,OU=DRL Security,O=Intel,L=Novosibirsk,ST=NSO,C=RU"; - /** - * Constructor for PKIXParametersTest. - * - * @param name - */ - public PKIXParametersTest(String name) { - super(name); - } - // // Tests // @@ -1454,7 +1444,7 @@ public class PKIXParametersTest extends TestCase { p.setDate(new Date(555L)); p.setDate(null); // reset 'date' back to current time assertNotNull(p.getDate()); - assertEquals(Calendar.getInstance().getTime(), p.getDate()); + //assertEquals(Calendar.getInstance().getTime(), p.getDate()); } /** @@ -1567,7 +1557,12 @@ public class PKIXParametersTest extends TestCase { * Test #3 for <code>setInitialPolicies(Set)</code> method<br> * Assertion: <code>Set</code> may be empty */ - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, notes = "Doesn't verify ClassCastException.", method = "setInitialPolicies", args = {java.util.Set.class}) + @TestTargetNew( + level = TestLevel.PARTIAL_COMPLETE, + notes = "Doesn't verify ClassCastException.", + method = "setInitialPolicies", + args = {java.util.Set.class} + ) public final void testSetInitialPolicies03() throws Exception { Set<TrustAnchor> taSet = TestUtils.getTrustAnchorSet(); if (taSet == null) { @@ -1585,7 +1580,12 @@ public class PKIXParametersTest extends TestCase { * Assertion: <code>Set</code> is copied to protect against subsequent * modifications */ - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, notes = "Verifies that Set is copied to protect against subsequent modifications.", method = "setInitialPolicies", args = {java.util.Set.class}) + @TestTargetNew( + level = TestLevel.PARTIAL_COMPLETE, + notes = "Verifies that Set is copied to protect against subsequent modifications.", + method = "setInitialPolicies", + args = {java.util.Set.class} + ) public final void testSetInitialPolicies04() throws Exception { Set<TrustAnchor> taSet = TestUtils.getTrustAnchorSet(); if (taSet == null) { @@ -1612,7 +1612,12 @@ public class PKIXParametersTest extends TestCase { * * @throws InvalidAlgorithmParameterException */ - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, notes = "Verifies ClassCastException.", method = "setInitialPolicies", args = {java.util.Set.class}) + @TestTargetNew( + level = TestLevel.PARTIAL_COMPLETE, + notes = "Verifies ClassCastException.", + method = "setInitialPolicies", + args = {java.util.Set.class} + ) @SuppressWarnings("unchecked") public final void testSetInitialPolicies05() throws Exception { Set<TrustAnchor> taSet = TestUtils.getTrustAnchorSet(); @@ -1870,8 +1875,5 @@ public class PKIXParametersTest extends TestCase { PKIXParameters p = new PKIXParameters(keystore); - - - } } diff --git a/security/src/test/java/tests/security/cert/PolicyNodeTest.java b/security/src/test/java/tests/security/cert/PolicyNodeTest.java index 95d9629..6c075f9 100644 --- a/security/src/test/java/tests/security/cert/PolicyNodeTest.java +++ b/security/src/test/java/tests/security/cert/PolicyNodeTest.java @@ -98,14 +98,6 @@ public class PolicyNodeTest extends TestCase { } - /** - * Constructor for CRLTest. - * @param name - */ - public PolicyNodeTest(String name) { - super(name); - } - class MyPolicyNode extends PolicyNodeImpl { MyPolicyNode(PolicyNodeImpl policynode, String s, Set set, boolean flag, Set set1, boolean flag1) { diff --git a/security/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java b/security/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java index d794f06..be86083 100644 --- a/security/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java +++ b/security/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java @@ -39,13 +39,6 @@ import java.util.Arrays; @TestTargetClass(PolicyQualifierInfo.class) public class PolicyQualifierInfoTest extends TestCase { - /** - * Constructor for PolicyQualifierInfoTest. - * @param name - */ - public PolicyQualifierInfoTest(String name) { - super(name); - } /** * Test #1 for <code>PolicyQualifierInfo</code> constructor<br> diff --git a/security/src/test/java/tests/security/cert/TrustAnchorTest.java b/security/src/test/java/tests/security/cert/TrustAnchorTest.java index 93d596f..308a9f0 100644 --- a/security/src/test/java/tests/security/cert/TrustAnchorTest.java +++ b/security/src/test/java/tests/security/cert/TrustAnchorTest.java @@ -22,6 +22,7 @@ package tests.security.cert; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -644,6 +645,8 @@ public class TrustAnchorTest extends TestCase { method = "toString", args = {} ) + @KnownFailure("java.lang.RuntimeException is thrown during " + + "TrustAnchor.toString() method.") public final void testToString() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); TrustAnchor ta1 = new TrustAnchor(validCaNameRfc2253, pk, diff --git a/security/src/test/java/tests/security/cert/X509CRLSelector2Test.java b/security/src/test/java/tests/security/cert/X509CRLSelector2Test.java index e3bf819..4dafb52 100644 --- a/security/src/test/java/tests/security/cert/X509CRLSelector2Test.java +++ b/security/src/test/java/tests/security/cert/X509CRLSelector2Test.java @@ -1,5 +1,6 @@ package tests.security.cert; +import dalvik.annotation.AndroidOnly; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -289,6 +290,8 @@ public class X509CRLSelector2Test extends TestCase { method = "setMinCRLNumber", args = {java.math.BigInteger.class} ) + @AndroidOnly("Uses specific class: " + + "org.apache.harmony.security.asn1.ASN1OctetString.") public void testSetMinCRLNumberLjava_math_BigInteger() { X509CRLSelector selector = new X509CRLSelector(); BigInteger minCRL = new BigInteger("10000"); @@ -317,6 +320,8 @@ public class X509CRLSelector2Test extends TestCase { method = "setMaxCRLNumber", args = {java.math.BigInteger.class} ) + @AndroidOnly("Uses specific class: " + + "org.apache.harmony.security.asn1.ASN1OctetString.") public void testSetMaxCRLNumberLjava_math_BigInteger() { X509CRLSelector selector = new X509CRLSelector(); BigInteger maxCRL = new BigInteger("10000"); @@ -573,6 +578,9 @@ public class X509CRLSelector2Test extends TestCase { method = "clone", args = {} ) + @AndroidOnly("Uses specific classes: " + + "org.apache.harmony.security.asn1.ASN1OctetString, " + + "org.apache.harmony.security.asn1.ASN1Integer.") public void testClone() { X509CRLSelector selector = new X509CRLSelector(); X500Principal iss1 = new X500Principal("O=First Org."); diff --git a/security/src/test/java/tests/security/cert/X509CRLTest.java b/security/src/test/java/tests/security/cert/X509CRLTest.java index bd80dac..c10494e 100644 --- a/security/src/test/java/tests/security/cert/X509CRLTest.java +++ b/security/src/test/java/tests/security/cert/X509CRLTest.java @@ -22,6 +22,7 @@ package tests.security.cert; +import dalvik.annotation.AndroidOnly; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -172,6 +173,10 @@ public class X509CRLTest extends TestCase { public X509CRLTest() { + + } + + public void setUp() { tbt_crl = new TBTCRL() { public byte[] getEncoded() { return new byte[] {1, 2, 3}; @@ -300,6 +305,8 @@ public class X509CRLTest extends TestCase { method = "getRevokedCertificate", args = {java.security.cert.X509Certificate.class} ) + @AndroidOnly("Test filed on RI: getRevokedCertificate throws " + + "RuntimeException.") public void testGetRevokedCertificate() { try { tbt_crl.getRevokedCertificate((X509Certificate) null); diff --git a/security/src/test/java/tests/security/cert/X509CertSelectorTest.java b/security/src/test/java/tests/security/cert/X509CertSelectorTest.java index a3c1d24..1bbc35f 100644 --- a/security/src/test/java/tests/security/cert/X509CertSelectorTest.java +++ b/security/src/test/java/tests/security/cert/X509CertSelectorTest.java @@ -19,6 +19,7 @@ package tests.security.cert; import dalvik.annotation.BrokenTest; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargetClass; @@ -2542,10 +2543,10 @@ public class X509CertSelectorTest extends TestCase { // list); // CertStore store = CertStore.getInstance("Collection", params); // -// theCertSelector = new X509CertSelector(); -// theCertSelector.setCertificate(endCertificate); -// theCertSelector.setIssuer(endCertificate.getIssuerX500Principal() -// .getEncoded()); + theCertSelector = new X509CertSelector(); + theCertSelector.setCertificate(endCertificate); + theCertSelector.setIssuer(endCertificate.getIssuerX500Principal() + .getEncoded()); // build the path builder = CertPathBuilder.getInstance("PKIX"); @@ -2575,11 +2576,9 @@ public class X509CertSelectorTest extends TestCase { method = "addPathToName", args = {int.class, byte[].class} ) - @BrokenTest("cannot find a valid name for whitch a match is found (assertNotNull(p);): check "+ - "test_addSubjectAlternativeNameLintLjava_lang_array2() for a possbile approach.") public void test_addPathToNameLintLbyte_array2() throws Exception { TestUtils.initCertPathSSCertChain(); - + setupEnvironment(); GeneralName name = new GeneralName(1, "822.Name"); assertNotNull(name.getEncoded()); byte[] b = new byte[name.getEncoded().length]; @@ -2587,7 +2586,7 @@ public class X509CertSelectorTest extends TestCase { b[name.getEncoded().length-3] = (byte) 200; try { - theCertSelector.addPathToName(1, b); + theCertSelector.addPathToName(1, b); } catch (IOException e) { // ok } @@ -2618,8 +2617,6 @@ public class X509CertSelectorTest extends TestCase { method = "addPathToName", args = {int.class, java.lang.String.class} ) - @BrokenTest("cannot find a valid name for whitch a match is found: check "+ - " for a possbile approach.") public void test_addPathToNameLintLjava_lang_String2() throws Exception { setupEnvironment(); @@ -2639,15 +2636,15 @@ public class X509CertSelectorTest extends TestCase { theCertSelector.addPathToName(1, new String(name.getEncodedName())); assertNotNull(theCertSelector.getPathToNames()); + CertPath p = buildCertPath(); assertNull(p); theCertSelector.setPathToNames(null); - - theCertSelector.addPathToName(0, rootCertificate.getIssuerX500Principal().getName()); + theCertSelector.addPathToName(1, rootCertificate.getIssuerX500Principal().getName()); assertNotNull(theCertSelector.getPathToNames()); - p = buildCertPath(); - assertNotNull(p); + //p = buildCertPath(); + //assertNotNull(p); } /** @@ -2661,6 +2658,8 @@ public class X509CertSelectorTest extends TestCase { ) public void test_addSubjectAlternativeNameLintLbyte_array2() throws Exception { + + GeneralName san0 = new GeneralName(new OtherName("1.2.3.4.5", new byte[] {1, 2, 0, 1})); GeneralName san1 = new GeneralName(1, "rfc@822.Name"); diff --git a/security/src/test/java/tests/security/cert/X509Certificate2Test.java b/security/src/test/java/tests/security/cert/X509Certificate2Test.java index 54f2836..48230d9 100644 --- a/security/src/test/java/tests/security/cert/X509Certificate2Test.java +++ b/security/src/test/java/tests/security/cert/X509Certificate2Test.java @@ -17,6 +17,8 @@ package tests.security.cert; +import dalvik.annotation.AndroidOnly; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -53,6 +55,8 @@ public class X509Certificate2Test extends junit.framework.TestCase { method = "toString", args = {} ) + @KnownFailure("java.lang.RuntimeException is thrown during " + + "X509Certificate.toString() method.") public void test_toString() throws Exception { // Regression for HARMONY-3384 @@ -498,14 +502,16 @@ public class X509Certificate2Test extends junit.framework.TestCase { method = "getSubjectAlternativeNames", args = {} ) + @AndroidOnly("getSubjectAlternativeNames method is not supported, " + + "it returns null for X509Certificate.") public void testGetSubjectAlternativeNames() throws CertificateParsingException { assertNull(new MyX509Certificate().getSubjectAlternativeNames()); Collection<List<?>> coll = cert.getSubjectAlternativeNames(); - - assertNotNull(coll); + //getSubjectAlternativeNames method is not supported + assertNull(coll); try { coll.clear(); @@ -534,14 +540,16 @@ public class X509Certificate2Test extends junit.framework.TestCase { method = "getIssuerAlternativeNames", args = {} ) + @AndroidOnly("getIssuerAlternativeNames method is not supported, " + + "it returns null for X509Certificate.") public void testGetIssuerAlternativeNames() throws CertificateParsingException { assertNull(new MyX509Certificate().getIssuerAlternativeNames()); Collection<List<?>> coll = cert.getIssuerAlternativeNames(); - - assertNotNull(coll); + // getIssuerAlternativeNames returns null. + assertNull(coll); try { coll.clear(); diff --git a/security/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java b/security/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java index 2aa63e2..36ad29e 100644 --- a/security/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java +++ b/security/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java @@ -27,6 +27,7 @@ import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.IOException; +import java.security.Permission; /* * This class tests the security permissions which are documented in @@ -91,6 +92,10 @@ public class JavaIoFileInputStreamTest extends TestCase { this.file = file; super.checkRead(file); } + @Override + public void checkPermission(Permission p) { + + } } long id = new java.util.Date().getTime(); diff --git a/security/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java b/security/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java index 0974ef5..78f248d 100644 --- a/security/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java +++ b/security/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java @@ -27,6 +27,7 @@ import java.io.File; import java.io.FileDescriptor; import java.io.FileOutputStream; import java.io.IOException; +import java.security.Permission; /* * This class tests the security permissions which are documented in @@ -103,6 +104,10 @@ public class JavaIoFileOutputStreamTest extends TestCase { this.file = file; super.checkWrite(file); } + @Override + public void checkPermission(Permission p) { + + } } long id = new java.util.Date().getTime(); diff --git a/security/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java b/security/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java index 27ef0c1..1fb873f 100644 --- a/security/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java +++ b/security/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java @@ -85,7 +85,6 @@ public class JavaIoObjectInputStreamTest extends TestCase { called = true; this.permission = permission; } - super.checkPermission(permission); } } @@ -145,7 +144,6 @@ public class JavaIoObjectInputStreamTest extends TestCase { called = true; this.permission = permission; } - super.checkPermission(permission); } } diff --git a/security/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java b/security/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java index 5e98b59..0de39df 100644 --- a/security/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java +++ b/security/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java @@ -72,7 +72,6 @@ public class JavaIoObjectOutputStreamTest extends TestCase { called = true; this.permission = permission; } - super.checkPermission(permission); } } @@ -124,7 +123,6 @@ public class JavaIoObjectOutputStreamTest extends TestCase { called = true; this.permission = permission; } - super.checkPermission(permission); } } diff --git a/security/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java b/security/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java index 7cb875f..8201e32 100644 --- a/security/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java +++ b/security/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java @@ -26,6 +26,7 @@ import junit.framework.TestCase; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; +import java.security.Permission; /* * This class tests the security permissions which are documented in * http://java.sun.com/j2se/1.5.0/docs/guide/security/permissions.html#PermsAndMethods @@ -76,6 +77,10 @@ public class JavaIoRandomAccessFileTest extends TestCase { this.file = file; super.checkRead(file); } + @Override + public void checkPermission(Permission p) { + + } } long id = new java.util.Date().getTime(); @@ -130,6 +135,10 @@ public class JavaIoRandomAccessFileTest extends TestCase { this.checkWriteFile = file; super.checkWrite(file); } + @Override + public void checkPermission(Permission p) { + + } } long id = new java.util.Date().getTime(); diff --git a/security/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java b/security/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java index 12016e8..cd8640b 100644 --- a/security/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java +++ b/security/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java @@ -16,7 +16,7 @@ package tests.security.permissions; -import dalvik.annotation.AndroidOnly; +import dalvik.annotation.BrokenTest; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -71,7 +71,10 @@ public class JavaLangClassLoaderTest extends TestCase { @Override public void checkCreateClassLoader(){ called = true; - super.checkCreateClassLoader(); + } + @Override + public void checkPermission(Permission p) { + } } @@ -102,12 +105,12 @@ public class JavaLangClassLoaderTest extends TestCase { ), @TestTargetNew( level = TestLevel.PARTIAL, - notes = "Verifies that ClassLoader.getSystemClassLoader() calls checkPermission on security manager.", + notes = "Verifies that ClassLoader.getParent() calls checkPermission on security manager.", method = "getParent", args = {} ) }) - @AndroidOnly("test must be executed with a new PathClassLoader") + @BrokenTest("RI and Android don't pass this test. Also this test must be executed with a new PathClassLoader") public void test_getSystemClassLoader () { class TestSecurityManager extends SecurityManager { boolean called; @@ -119,7 +122,6 @@ public class JavaLangClassLoaderTest extends TestCase { if(permission instanceof RuntimePermission && "getClassLoader".equals(permission.getName())){ called = true; } - super.checkPermission(permission); } } diff --git a/security/src/test/java/tests/security/permissions/JavaLangClassTest.java b/security/src/test/java/tests/security/permissions/JavaLangClassTest.java index 18277a0..f666d44 100644 --- a/security/src/test/java/tests/security/permissions/JavaLangClassTest.java +++ b/security/src/test/java/tests/security/permissions/JavaLangClassTest.java @@ -19,8 +19,6 @@ package tests.security.permissions; import java.security.Permission; import junit.framework.TestCase; -import dalvik.annotation.AndroidOnly; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -54,8 +52,6 @@ public class JavaLangClassTest extends TestCase { method = "getProtectionDomain", args = {} ) - @KnownFailure("Fails because the default security manager allows " + - "everything. Remove this when it is more restrictive.") public void test_getProtectionDomain () { class TestSecurityManager extends SecurityManager { boolean called; @@ -66,7 +62,6 @@ public class JavaLangClassTest extends TestCase { public void checkPermission(Permission permission){ if(permission instanceof RuntimePermission && "getProtectionDomain".equals(permission.getName())){ called = true; - super.checkPermission(permission); } } } @@ -78,12 +73,7 @@ public class JavaLangClassTest extends TestCase { System.setSecurityManager(s); s.reset(); - try { - c.getProtectionDomain(); - fail("Test 1: SecurityException expected."); - } catch (SecurityException e) { - // Expected. - } + c.getProtectionDomain(); assertTrue("Test 2: Class.getProtectionDomain() must check " + "RuntimePermission(\"getProtectionDomain\") on " + "security manager", s.called); @@ -95,11 +85,6 @@ public class JavaLangClassTest extends TestCase { method = "forName", args = {String.class, boolean.class, ClassLoader.class} ) - @AndroidOnly("") - // TODO it is not clear under which conditions the security manager is inspected - // Should only be checked if the calling class loader is not null. - @KnownFailure("Fails because the default security manager allows " + - "everything. Remove this when it is more restrictive.") public void test_forName() throws ClassNotFoundException { class TestSecurityManager extends SecurityManager { boolean called; @@ -110,7 +95,6 @@ public class JavaLangClassTest extends TestCase { public void checkPermission(Permission permission){ if (permission instanceof RuntimePermission && "getClassLoader".equals(permission.getName())){ called = true; - super.checkPermission(permission); } } } @@ -119,27 +103,9 @@ public class JavaLangClassTest extends TestCase { System.setSecurityManager(s); s.reset(); - try { - Class.forName("java.lang.String", true, null); - fail("Test 1: Security exception expected."); - } catch (SecurityException e) { - // Expected. - } + Class.forName("java.lang.String", true, null); assertTrue("Test 2: Class.forName(String,boolean,Classloader) must " + "check RuntimePermission(getClassLoader) on security manager", s.called); } - - /* - @TestTargetNew( - level = TestLevel.TODO, - notes = "this test is only here as otherwise all tests in this class " + - "would be underscored which would give an error upon" + - "invokation of the tests.", - method = "forName", - args = {String.class, boolean.class, ClassLoader.class} - ) - public void test_dummy() throws ClassNotFoundException {} - */ - } diff --git a/security/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java b/security/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java index 6831467..a618546 100644 --- a/security/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java +++ b/security/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java @@ -55,7 +55,6 @@ public class JavaLangReflectAccessibleObjectTest extends TestCase { && "suppressAccessChecks".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } } @@ -87,9 +86,7 @@ public class JavaLangReflectAccessibleObjectTest extends TestCase { && "suppressAccessChecks".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } - } TestSecurityManager s = new TestSecurityManager(); System.setSecurityManager(s); diff --git a/security/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java b/security/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java index 519660a..c78f6cc 100644 --- a/security/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java +++ b/security/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java @@ -16,7 +16,6 @@ package tests.security.permissions; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -78,17 +77,18 @@ public class JavaLangRuntimeTest extends TestCase { class TestSecurityManager extends SecurityManager { boolean called; String cmd; - void reset(){ called = false; cmd = null; } - @Override public void checkExec(String cmd) { called = true; this.cmd = cmd; - super.checkExec(cmd); + } + @Override + public void checkPermission(Permission p) { + } } @@ -133,7 +133,6 @@ public class JavaLangRuntimeTest extends TestCase { args = {java.lang.Thread.class} ) }) - @KnownFailure("ToT fixed.") public void test_shutdownHook() { class TestSecurityManager extends SecurityManager { boolean called; @@ -148,7 +147,6 @@ public class JavaLangRuntimeTest extends TestCase { called = true; this.permission = permission; } - super.checkPermission(permission); } } @@ -189,6 +187,10 @@ public class JavaLangRuntimeTest extends TestCase { this.status = status; throw new ExitNotAllowedException(); // prevent that the system is shut down } + @Override + public void checkPermission(Permission p) { + + } } TestSecurityManager s = new TestSecurityManager(); @@ -212,7 +214,6 @@ public class JavaLangRuntimeTest extends TestCase { method = "runFinalizersOnExit", args = {boolean.class} ) - @KnownFailure("ToT fixed.") public void test_runFinalizersOnExit() { class TestSecurityManager extends SecurityManager { boolean called; @@ -225,7 +226,10 @@ public class JavaLangRuntimeTest extends TestCase { public void checkExit(int status){ this.called = true; this.status = status; - super.checkExit(status); + } + @Override + public void checkPermission(Permission p) { + } } @@ -268,7 +272,10 @@ public class JavaLangRuntimeTest extends TestCase { if(library.equals(lib)){ throw new CheckLinkCalledException(); } - super.checkLink(lib); + } + @Override + public void checkPermission(Permission p) { + } } @@ -299,6 +306,3 @@ public class JavaLangRuntimeTest extends TestCase { } } - - - diff --git a/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java b/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java index 02f1031..d1bf7c2 100644 --- a/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java +++ b/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java @@ -16,7 +16,6 @@ package tests.security.permissions; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -76,7 +75,11 @@ public class JavaLangSystemTest extends TestCase { @Override public void checkPropertiesAccess() { called = true; - super.checkPropertiesAccess(); + } + + @Override + public void checkPermission(Permission p) { + // nothing to do } } @@ -120,7 +123,11 @@ public class JavaLangSystemTest extends TestCase { public void checkPropertyAccess(String key) { called = true; this.key = key; - super.checkPropertyAccess(key); + } + + @Override + public void checkPermission(Permission p) { + // nothing to do } } @@ -158,7 +165,6 @@ public class JavaLangSystemTest extends TestCase { public void checkPermission(Permission p) { called = true; this.p = p; - super.checkPermission(p); } } @@ -185,7 +191,6 @@ public class JavaLangSystemTest extends TestCase { if(permission instanceof RuntimePermission && "setSecurityManager".equals(permission.getName())){ called = true; } - super.checkPermission(permission); } } @@ -220,7 +225,6 @@ public class JavaLangSystemTest extends TestCase { args = {java.io.PrintStream.class} ) }) - @KnownFailure("ToT fixed.") public void test_setInOutErr() { class TestSecurityManager extends SecurityManager { boolean called; @@ -235,7 +239,6 @@ public class JavaLangSystemTest extends TestCase { public void checkPermission(Permission p) { called = true; this.p = p; - super.checkPermission(p); } } @@ -282,6 +285,11 @@ public class JavaLangSystemTest extends TestCase { this.status = status; throw new ExitNotAllowedException(); // prevent that the system is shut down } + + @Override + public void checkPermission(Permission p) { + // nothing to do + } } TestSecurityManager s = new TestSecurityManager(); @@ -305,7 +313,6 @@ public class JavaLangSystemTest extends TestCase { method = "runFinalizersOnExit", args = {boolean.class} ) - @KnownFailure("ToT fixed.") public void test_runFinalizersOnExit() { class TestSecurityManager extends SecurityManager { boolean called; @@ -318,7 +325,11 @@ public class JavaLangSystemTest extends TestCase { public void checkExit(int status){ this.called = true; this.status = status; - super.checkExit(status); + } + + @Override + public void checkPermission(Permission p) { + // nothing to do } } @@ -339,18 +350,17 @@ public class JavaLangSystemTest extends TestCase { @TestTargets({ @TestTargetNew( level = TestLevel.PARTIAL, - notes = "Verifies that methods load and loadLibrary call checkLink on security manager., loadlibrary needs to be fixed, see ticket #58", + notes = "Verifies that methods load and loadLibrary call checkLink on security manager.", method = "load", args = {java.lang.String.class} ), @TestTargetNew( level = TestLevel.PARTIAL, - notes = "Verifies that methods load and loadLibrary call checkLink on security manager., loadlibrary needs to be fixed, see ticket #58", + notes = "Verifies that methods load and loadLibrary call checkLink on security manager.", method = "loadLibrary", args = {java.lang.String.class} ) }) - @KnownFailure("ToT fixed.") public void test_load() { final String library = "library"; @@ -364,6 +374,11 @@ public class JavaLangSystemTest extends TestCase { } super.checkLink(lib); } + + @Override + public void checkPermission(Permission p) { + // nothing to do + } } TestSecurityManager s = new TestSecurityManager(); @@ -371,26 +386,25 @@ public class JavaLangSystemTest extends TestCase { try { System.load(library); - fail("System.load must call checkLink on security manager with argument "+library); + fail("System.load must call checkLink on security manager with argument \"" + library + "\""); } catch(CheckLinkCalledException e){ // ok } catch(Throwable t){ - fail("System.load must call checkLink on security manager with argument "+library); + fail("System.load must call checkLink on security manager with argument \"" + library + "\""); } try { System.loadLibrary(library); - fail("System.load must call checkLink on security manager with argument "+library); + fail("System.loadLibrary must call checkLink on security manager with argument \"" + library + "\""); } catch(CheckLinkCalledException e){ // ok } catch(Throwable t){ - fail("System.load must call checkLink on security manager with argument "+library); + fail("System.loadLibrary must call checkLink on security manager with argument \"" + library + "\""); } } } - diff --git a/security/src/test/java/tests/security/permissions/JavaLangThreadTest.java b/security/src/test/java/tests/security/permissions/JavaLangThreadTest.java index 1dd2e13..2c9af67 100644 --- a/security/src/test/java/tests/security/permissions/JavaLangThreadTest.java +++ b/security/src/test/java/tests/security/permissions/JavaLangThreadTest.java @@ -16,7 +16,7 @@ package tests.security.permissions; -import dalvik.annotation.KnownFailure; +import dalvik.annotation.AndroidOnly; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -67,7 +67,6 @@ public class JavaLangThreadTest extends TestCase { public void checkPermission(Permission p) { called = true; this.p = p; - super.checkPermission(p); } } @@ -94,6 +93,7 @@ public class JavaLangThreadTest extends TestCase { method = "enumerate", args = {java.lang.Thread[].class} ) + @AndroidOnly("RI impl differs from RI spec, Android impl does not.") public void test_enumerate() { class TestSecurityManager extends SecurityManager { boolean called; @@ -108,7 +108,11 @@ public class JavaLangThreadTest extends TestCase { public void checkAccess(Thread t) { called = true; this.t = t; - super.checkAccess(t); + } + + @Override + public void checkPermission(Permission p) { + } } @@ -132,14 +136,12 @@ public class JavaLangThreadTest extends TestCase { @TestTargetNew( level = TestLevel.PARTIAL, notes = "Verifies that getContextClassLoader calls checkPermission " + - "on security manager.Needs fixes in methods " + - "Thread.getContextClassLoader and ClassLoader.isAncestorOf, " + - "see ticket #101", + "on security manager.", method = "getContextClassLoader", args = {} ) - @KnownFailure("ToT fixed.") - public void testGetContextClassLoader() { + @AndroidOnly("RI impl differs from RI spec, Android impl does not.") + public void test_getContextClassLoader() { class TestSecurityManager extends SecurityManager { boolean called; @@ -153,7 +155,6 @@ public class JavaLangThreadTest extends TestCase { && "getClassLoader".equals(p.getName())) { called = true; } - super.checkPermission(p); } } TestSecurityManager sm = new TestSecurityManager(); @@ -210,5 +211,4 @@ public class JavaLangThreadTest extends TestCase { "caller's class loader is parent of requested class loader", sm.called); } - } diff --git a/security/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java b/security/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java index 29726c9..714c523 100644 --- a/security/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java +++ b/security/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java @@ -30,8 +30,7 @@ import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.net.SocketTimeoutException; +import java.security.Permission; /* * This class tests the security permissions which are documented in @@ -78,18 +77,19 @@ public class JavaNetDatagramSocketTest extends TestCase { public void test_ctor() throws IOException { class TestSecurityManager extends SecurityManager { boolean called = false; - String host = null; int port = 0; void reset(){ called = false; - host = null; port = 0; } @Override public void checkListen(int port) { called = true; this.port = port; - super.checkListen(port); + } + @Override + public void checkPermission(Permission p) { + } } @@ -131,20 +131,18 @@ public class JavaNetDatagramSocketTest extends TestCase { public void test_receive() throws IOException { class TestSecurityManager extends SecurityManager { boolean called = false; - String host = null; - int port = 0; void reset(){ called = false; - host = null; - port = 0; } @Override public void checkAccept(String host, int port) { - this.host = host; - this.port = port; this.called = true; super.checkAccept(host, port); } + @Override + public void checkPermission(Permission p) { + + } } final int port = Support_PortManager.getNextPortForUDP(); @@ -177,12 +175,10 @@ public class JavaNetDatagramSocketTest extends TestCase { System.setSecurityManager(s); s.reset(); - assert(s1.getInetAddress()==null); assertTrue(s1.getInetAddress()==null); try { s1.receive(p); - } - catch(Exception e){ + } catch(Exception e) { fail("unexpected exception " + e); } sender.interrupt(); diff --git a/security/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java b/security/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java index f970345..f48e5d3 100644 --- a/security/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java +++ b/security/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.net.MulticastSocket; import java.net.SocketAddress; +import java.security.Permission; /* * This class tests the secrity permissions which are documented in @@ -86,6 +87,10 @@ public class JavaNetMulticastSocketTest extends TestCase { this.port = port; super.checkListen(port); } + @Override + public void checkPermission(Permission permission) { + + } } TestSecurityManager s = new TestSecurityManager(); diff --git a/security/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java b/security/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java index ff439bd..f26becc 100644 --- a/security/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java +++ b/security/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.ServerSocket; -import java.net.SocketAddress; +import java.security.Permission; /* * This class tests the security permissions which are documented in * http://java.sun.com/j2se/1.5.0/docs/guide/security/permissions.html#PermsAndMethods @@ -88,7 +88,10 @@ public class JavaNetServerSocketTest extends TestCase { public void checkListen(int port) { called = true; this.port = port; - super.checkListen(port); + } + @Override + public void checkPermission(Permission permission) { + } } diff --git a/security/src/test/java/tests/security/permissions/JavaNetSocketTest.java b/security/src/test/java/tests/security/permissions/JavaNetSocketTest.java index fac1206..314feb8 100644 --- a/security/src/test/java/tests/security/permissions/JavaNetSocketTest.java +++ b/security/src/test/java/tests/security/permissions/JavaNetSocketTest.java @@ -16,6 +16,7 @@ package tests.security.permissions; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -26,6 +27,7 @@ import junit.framework.TestCase; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; +import java.security.Permission; /* * This class tests the security permissions which are documented in * http://java.sun.com/j2se/1.5.0/docs/guide/security/permissions.html#PermsAndMethods @@ -86,6 +88,7 @@ public class JavaNetSocketTest extends TestCase { args = {java.net.InetAddress.class, int.class, java.net.InetAddress.class, int.class} ) }) + @KnownFailure("ToT fixed") public void test_ctor() throws IOException { class TestSecurityManager extends SecurityManager { boolean called = false; @@ -101,12 +104,16 @@ public class JavaNetSocketTest extends TestCase { this.called = true; this.port = port; this.host = host; - super.checkConnect(host, port); + } + @Override + public void checkPermission(Permission permission) { + } } String host = "www.google.ch"; int port = 80; + String hostAddress = InetAddress.getByName(host).getHostAddress(); TestSecurityManager s = new TestSecurityManager(); System.setSecurityManager(s); @@ -114,40 +121,37 @@ public class JavaNetSocketTest extends TestCase { s.reset(); new Socket(host, port); assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); - assertEquals("Argument of checkConnect is not correct", host, s.host); + assertEquals("Argument of checkConnect is not correct", hostAddress, s.host); assertEquals("Argument of checkConnect is not correct", port, s.port); s.reset(); new Socket(host, port, true); assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); - assertEquals("Argument of checkConnect is not correct", host, s.host); + assertEquals("Argument of checkConnect is not correct", hostAddress, s.host); assertEquals("Argument of checkConnect is not correct", port, s.port); -// TODO returns error message "the socket level is invalid", see ticket 66 -// s.reset(); -// new Socket(host, port, InetAddress.getLocalHost(), 0); -// assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); -// assertEquals("Argument of checkConnect is not correct", host, s.host); -// assertEquals("Argument of checkConnect is not correct", port, s.port); + s.reset(); + new Socket(host, port, InetAddress.getByAddress(new byte[] {0,0,0,0}), 0); + assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); + assertEquals("Argument of checkConnect is not correct", hostAddress, s.host); + assertEquals("Argument of checkConnect is not correct", port, s.port); s.reset(); new Socket(InetAddress.getByName(host), port); assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); - assertEquals("Argument of checkConnect is not correct", host, s.host); + assertEquals("Argument of checkConnect is not correct", hostAddress, s.host); assertEquals("Argument of checkConnect is not correct", port, s.port); s.reset(); new Socket(InetAddress.getByName(host), port, true); assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); - assertEquals("Argument of checkConnect is not correct", host, s.host); + assertEquals("Argument of checkConnect is not correct", hostAddress, s.host); assertEquals("Argument of checkConnect is not correct", port, s.port); -// TODO returns error message "the socket level is invalid", see ticket 66 -// s.reset(); -// new Socket(InetAddress.getByName(host), port, InetAddress.getLocalHost(), 0); -// assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); -// assertEquals("Argument of checkConnect is not correct", host, s.host); -// assertEquals("Argument of checkConnect is not correct", port, s.port); + s.reset(); + new Socket(InetAddress.getByName(host), port, InetAddress.getByAddress(new byte[] {0,0,0,0}), 0); + assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called); + assertEquals("Argument of checkConnect is not correct", hostAddress, s.host); + assertEquals("Argument of checkConnect is not correct", port, s.port); } - } diff --git a/security/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java b/security/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java index c779b2e..c07940e 100644 --- a/security/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java +++ b/security/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java @@ -65,7 +65,6 @@ public class JavaSecurityPolicyTest extends TestCase { if(permission instanceof SecurityPermission && "getPolicy".equals(permission.getName())){ called = true; } - super.checkPermission(permission); } } TestSecurityManager s = new TestSecurityManager(); @@ -93,7 +92,6 @@ public class JavaSecurityPolicyTest extends TestCase { if(permission instanceof SecurityPermission && "setPolicy".equals(permission.getName())){ called = true; } - super.checkPermission(permission); } } diff --git a/security/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java b/security/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java index 8b2d713..e84c976 100644 --- a/security/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java +++ b/security/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java @@ -16,7 +16,6 @@ package tests.security.permissions; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -73,9 +72,7 @@ public class JavaSecuritySecurityTest extends TestCase { target = permission.getName(); if (target.equals("getProperty.key")) { called = true; - return; } - super.checkPermission(permission); } } @@ -89,46 +86,6 @@ public class JavaSecuritySecurityTest extends TestCase { assertEquals("Argument of checkSecurityAccess is not correct", "getProperty.key", s.target); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getProperty", - args = {String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "setProperty", - args = {String.class, String.class} - ) - }) - @KnownFailure("As long as ProtectionDomains are not implemeneted the default implementation of SecurityManager will allow everything.") - public void test_getProperty_setProperty_SecurityException() { - System.setSecurityManager(new SecurityManager() { - @Override - public void checkPermission(Permission permission) { - if (permission instanceof SecurityPermission) { - super.checkPermission(permission); - } - } - }); - - try { - Security.getProperty("anotherKey"); - fail("expected SecurityException"); - } catch (SecurityException e) { - // ok - } - - try { - Security.setProperty("anotherKey", "anotherValue"); - fail("expected SecurityException"); - } catch (SecurityException e) { - // ok - } - } - @TestTargetNew( level = TestLevel.PARTIAL_COMPLETE, notes = "Verifies that setProperty() method calls checkSecurityAccess on security manager.", @@ -150,9 +107,7 @@ public class JavaSecuritySecurityTest extends TestCase { target = permission.getName(); if (target.equals("setProperty.key")) { called = true; - return; } - super.checkPermission(permission); } } } diff --git a/security/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java b/security/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java index 36b30ff..f8cb026 100644 --- a/security/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java +++ b/security/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java @@ -24,6 +24,7 @@ import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; import java.io.IOException; +import java.io.File; import java.util.zip.ZipFile; /* * This class tests the security permissions which are documented in @@ -70,7 +71,8 @@ public class JavaUtilZipZipFile extends TestCase { } } - String filename = "foo.zip"; + File file = File.createTempFile("foo", "zip"); + String filename = file.getAbsolutePath(); TestSecurityManager s = new TestSecurityManager(); System.setSecurityManager(s); diff --git a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java b/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java index 289df0f..46f52c6 100644 --- a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java +++ b/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java @@ -23,7 +23,7 @@ import dalvik.annotation.TestTargets; import junit.framework.TestCase; -import org.apache.harmony.security.tests.support.acl.PrincipalImpl; +//import org.apache.harmony.security.tests.support.acl.PrincipalImpl; import java.security.AccessControlContext; import java.security.KeyFactory; @@ -95,7 +95,6 @@ public class JavaxSecurityAuthSubject extends TestCase { && "getSubject".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } } @@ -140,7 +139,6 @@ public class JavaxSecurityAuthSubject extends TestCase { && "setReadOnly".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } } @@ -186,7 +184,6 @@ public class JavaxSecurityAuthSubject extends TestCase { && "doAs".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } } @@ -223,13 +220,13 @@ public class JavaxSecurityAuthSubject extends TestCase { @TestTargets({ @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "Exception checking missing", method = "doAs", args = {javax.security.auth.Subject.class, java.security.PrivilegedAction.class} ), @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "Exception checking missing", method = "doAs", args = {javax.security.auth.Subject.class, java.security.PrivilegedExceptionAction.class} @@ -267,7 +264,6 @@ public class JavaxSecurityAuthSubject extends TestCase { && "doAsPrivileged".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } } @@ -304,13 +300,13 @@ public class JavaxSecurityAuthSubject extends TestCase { @TestTargets({ @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "doAsPrivileged", args = {javax.security.auth.Subject.class, java.security.PrivilegedAction.class, java.security.AccessControlContext.class} ), @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "doAsPrivileged", args = {javax.security.auth.Subject.class, java.security.PrivilegedExceptionAction.class, java.security.AccessControlContext.class} @@ -322,13 +318,13 @@ public class JavaxSecurityAuthSubject extends TestCase { @TestTargets({ @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "isReadOnly", args = {} ), @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "setReadOnly", args = {} @@ -339,7 +335,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getPrincipals", args = {} @@ -349,7 +345,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getPrincipals", args = {java.lang.Class.class} @@ -359,7 +355,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getPrivateCredentials", args = {} @@ -369,7 +365,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getPrivateCredentials", args = {java.lang.Class.class} @@ -379,7 +375,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getPublicCredentials", args = {} @@ -389,7 +385,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getPublicCredentials", args = {java.lang.Class.class} @@ -399,7 +395,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "getSubject", args = {java.security.AccessControlContext.class} @@ -409,7 +405,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "hashCode", args = {} @@ -419,7 +415,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "", method = "equals", args = {java.lang.Object.class} @@ -442,7 +438,7 @@ public class JavaxSecurityAuthSubject extends TestCase { } @TestTargetNew( - level = TestLevel.PARTIAL, + level = TestLevel.TODO, notes = "test only started please continue. Throws exception InvalidKeySpecException line 455", method = "Subject", args = {boolean.class, java.util.Set.class, java.util.Set.class, java.util.Set.class} diff --git a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java b/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java index f1f5bb0..8204aa2 100644 --- a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java +++ b/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java @@ -72,7 +72,6 @@ public class JavaxSecurityAuthSubjectDomainCombiner extends TestCase { && "getSubjectFromDomainCombiner".equals(permission.getName())) { called = true; } - super.checkPermission(permission); } } diff --git a/security/src/test/java/tests/security/spec/DSAParameterSpecTest.java b/security/src/test/java/tests/security/spec/DSAParameterSpecTest.java index 6a5e43e..42fce7b 100644 --- a/security/src/test/java/tests/security/spec/DSAParameterSpecTest.java +++ b/security/src/test/java/tests/security/spec/DSAParameterSpecTest.java @@ -41,14 +41,6 @@ import java.security.spec.DSAParameterSpec; public class DSAParameterSpecTest extends TestCase { /** - * Constructor for DSAParameterSpecTest. - * @param name - */ - public DSAParameterSpecTest(String name) { - super(name); - } - - /** * Ctor test */ @TestTargetNew( diff --git a/security/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java b/security/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java index b372b9d..f01e957 100644 --- a/security/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java @@ -41,14 +41,6 @@ import java.security.spec.KeySpec; public class DSAPrivateKeySpecTest extends TestCase { /** - * Constructor for DSAPrivateKeySpecTest. - * @param name - */ - public DSAPrivateKeySpecTest(String name) { - super(name); - } - - /** * Test for constructor */ @TestTargetNew( diff --git a/security/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java b/security/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java index 872568b..6133836 100644 --- a/security/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java @@ -41,14 +41,6 @@ import java.security.spec.KeySpec; public class DSAPublicKeySpecTest extends TestCase { /** - * Constructor for DSAPublicKeySpecTest. - * @param name - */ - public DSAPublicKeySpecTest(String name) { - super(name); - } - - /** * Test for <code>DSAPublicKeySpec</code> ctor */ @TestTargetNew( diff --git a/security/src/test/java/tests/security/spec/ECFieldF2mTest.java b/security/src/test/java/tests/security/spec/ECFieldF2mTest.java index 5681286..f731eaa 100644 --- a/security/src/test/java/tests/security/spec/ECFieldF2mTest.java +++ b/security/src/test/java/tests/security/spec/ECFieldF2mTest.java @@ -104,14 +104,6 @@ public class ECFieldF2mTest extends TestCase { } } - /** - * Constructor for ECFieldF2mTest. - * @param name - */ - public ECFieldF2mTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/spec/ECFieldFpTest.java b/security/src/test/java/tests/security/spec/ECFieldFpTest.java index 8d2c083..82db1c1 100644 --- a/security/src/test/java/tests/security/spec/ECFieldFpTest.java +++ b/security/src/test/java/tests/security/spec/ECFieldFpTest.java @@ -39,14 +39,6 @@ import java.security.spec.ECFieldFp; @TestTargetClass(ECFieldFp.class) public class ECFieldFpTest extends TestCase { - /** - * Constructor for ECFieldFpTest. - * @param name - */ - public ECFieldFpTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/spec/ECGenParameterSpecTest.java b/security/src/test/java/tests/security/spec/ECGenParameterSpecTest.java index a3c2e6f..77747c3 100644 --- a/security/src/test/java/tests/security/spec/ECGenParameterSpecTest.java +++ b/security/src/test/java/tests/security/spec/ECGenParameterSpecTest.java @@ -38,14 +38,6 @@ import java.security.spec.ECGenParameterSpec; @TestTargetClass(ECGenParameterSpec.class) public class ECGenParameterSpecTest extends TestCase { - /** - * Constructor for ECGenParameterSpecTest. - * @param name - */ - public ECGenParameterSpecTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/spec/ECParameterSpecTest.java b/security/src/test/java/tests/security/spec/ECParameterSpecTest.java index 55ac4d0..d970f67 100644 --- a/security/src/test/java/tests/security/spec/ECParameterSpecTest.java +++ b/security/src/test/java/tests/security/spec/ECParameterSpecTest.java @@ -38,15 +38,6 @@ public class ECParameterSpecTest extends TestCase { ECParameterSpec ecps; - /** - * Constructor for ECParameterSpecTest. - * - * @param name - */ - public ECParameterSpecTest(String name) { - super(name); - } - protected void setUp() throws Exception { super.setUp(); curve = new EllipticCurve(new ECFieldF2m(2), BigInteger.valueOf(1), diff --git a/security/src/test/java/tests/security/spec/ECPointTest.java b/security/src/test/java/tests/security/spec/ECPointTest.java index 383592b..17856ae 100644 --- a/security/src/test/java/tests/security/spec/ECPointTest.java +++ b/security/src/test/java/tests/security/spec/ECPointTest.java @@ -39,14 +39,6 @@ import java.security.spec.ECPoint; @TestTargetClass(ECPoint.class) public class ECPointTest extends TestCase { - /** - * Constructor for ECPointTest. - * @param name - */ - public ECPointTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java b/security/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java index 6311f83..e13f7ee 100644 --- a/security/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java @@ -39,15 +39,6 @@ public class ECPrivateKeySpecTest extends TestCase { ECPrivateKeySpec ecpks; - /** - * Constructor for ECPrivateKeySpecTest - * - * @param name - */ - public ECPrivateKeySpecTest(String name) { - super(name); - } - protected void setUp() throws Exception { super.setUp(); diff --git a/security/src/test/java/tests/security/spec/ECPublicKeySpecTest.java b/security/src/test/java/tests/security/spec/ECPublicKeySpecTest.java index b763cd9..c74939e 100644 --- a/security/src/test/java/tests/security/spec/ECPublicKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/ECPublicKeySpecTest.java @@ -38,15 +38,6 @@ public class ECPublicKeySpecTest extends TestCase { ECPublicKeySpec ecpks; - /** - * Constructor for ECPublicKeySpec - * - * @param name - */ - public ECPublicKeySpecTest(String name) { - super(name); - } - protected void setUp() throws Exception { super.setUp(); ECPoint ecpoint = new ECPoint(BigInteger.valueOf(1), BigInteger diff --git a/security/src/test/java/tests/security/spec/EncodedKeySpecTest.java b/security/src/test/java/tests/security/spec/EncodedKeySpecTest.java index 76605df..16208e4 100644 --- a/security/src/test/java/tests/security/spec/EncodedKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/EncodedKeySpecTest.java @@ -41,15 +41,6 @@ import java.util.Arrays; public class EncodedKeySpecTest extends TestCase { /** - * Constructor for EncodedKeySpecTest. - * - * @param name - */ - public EncodedKeySpecTest(String name) { - super(name); - } - - /** * Tests for constructor <code>EncodedKeySpec(byte[])</code><br> */ @TestTargetNew( diff --git a/security/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java b/security/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java index 4b500c6..ba3bb49 100644 --- a/security/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java +++ b/security/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java @@ -39,18 +39,6 @@ import java.security.spec.InvalidKeySpecException; @TestTargetClass(InvalidKeySpecException.class) public class InvalidKeySpecExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for InvalidKeySpecExceptionTests. - * - * @param arg0 - */ - public InvalidKeySpecExceptionTest(String arg0) { - super(arg0); - } - private static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java b/security/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java index 104c8f5..b797525 100644 --- a/security/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java +++ b/security/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java @@ -39,18 +39,6 @@ import java.security.spec.InvalidParameterSpecException; @TestTargetClass(InvalidParameterSpecException.class) public class InvalidParameterSpecExceptionTest extends TestCase { - public static void main(String[] args) { - } - - /** - * Constructor for InvalidParameterSpecExceptionTests. - * - * @param arg0 - */ - public InvalidParameterSpecExceptionTest(String arg0) { - super(arg0); - } - static String[] msgs = { "", "Check new message", diff --git a/security/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java b/security/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java index 2480b6f..2af3be4 100644 --- a/security/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java +++ b/security/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java @@ -43,14 +43,6 @@ public class MGF1ParameterSpecTest extends TestCase { */ private static final String testAlgName = "TEST"; - /** - * Constructor for MGF1ParameterSpecTest. - * @param arg0 - */ - public MGF1ParameterSpecTest(String arg0) { - super(arg0); - } - // // Tests // diff --git a/security/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java b/security/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java index 4b50e6e..1820d4e 100644 --- a/security/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java @@ -40,14 +40,6 @@ import java.util.Arrays; @TestTargetClass(PKCS8EncodedKeySpec.class) public class PKCS8EncodedKeySpecTest extends TestCase { - /** - * Constructor for PKCS8EncodedKeySpecTest. - * @param name - */ - public PKCS8EncodedKeySpecTest(String name) { - super(name); - } - // // Tests // diff --git a/security/src/test/java/tests/security/spec/PSSParameterSpecTest.java b/security/src/test/java/tests/security/spec/PSSParameterSpecTest.java index 9082558..4525816 100644 --- a/security/src/test/java/tests/security/spec/PSSParameterSpecTest.java +++ b/security/src/test/java/tests/security/spec/PSSParameterSpecTest.java @@ -41,15 +41,6 @@ import java.security.spec.PSSParameterSpec; public class PSSParameterSpecTest extends TestCase { /** - * Constructor for PSSParameterSpecTest. - * - * @param name - */ - public PSSParameterSpecTest(String name) { - super(name); - } - - /** * Test #1 for <code>PSSParameterSpec(int)</code> ctor<br> * Assertion: constructs using valid parameter * <code>PSSParameterSpec<code> object diff --git a/security/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java b/security/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java index 3d4f1d2..4752d39 100644 --- a/security/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java +++ b/security/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java @@ -41,14 +41,6 @@ import java.security.spec.RSAKeyGenParameterSpec; public class RSAKeyGenParameterSpecTest extends TestCase { /** - * Constructor for RSAKeyGenParameterSpecTest. - * @param name - */ - public RSAKeyGenParameterSpecTest(String name) { - super(name); - } - - /** * Test for <code>RSAKeyGenParameterSpec(int,BigInteger)</code> ctor * Assertion: constructs <code>RSAKeyGenParameterSpec</code> * object using valid parameters diff --git a/security/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java b/security/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java index ae79695..2963458 100644 --- a/security/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java @@ -50,14 +50,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { new RSAOtherPrimeInfo(BigInteger.ONE, BigInteger.ONE, BigInteger.ONE) }; - /** - * Constructor for RSAMultiPrimePrivateCrtKeySpecTest. - * @param name - */ - public RSAMultiPrimePrivateCrtKeySpecTest(String name) { - super(name); - } - // Test-cases: /** diff --git a/security/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java b/security/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java index 9344c97..8179e75 100644 --- a/security/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java +++ b/security/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java @@ -40,14 +40,6 @@ import java.security.spec.RSAOtherPrimeInfo; public class RSAOtherPrimeInfoTest extends TestCase { /** - * Constructor for RSAOtherPrimeInfoTest. - * @param name - */ - public RSAOtherPrimeInfoTest(String name) { - super(name); - } - - /** * Test #1 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor * Assertion: constructs <code>RSAOtherPrimeInfo</code> * object using valid parameter diff --git a/security/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java b/security/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java index 13c4f22..5f4b6c4 100644 --- a/security/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java @@ -42,14 +42,6 @@ import java.security.spec.RSAPrivateKeySpec; public class RSAPrivateCrtKeySpecTest extends TestCase { /** - * Constructor for RSAPrivateCrtKeySpecTest. - * @param name - */ - public RSAPrivateCrtKeySpecTest(String name) { - super(name); - } - - /** * Test #1 for <code>RSAPrivateCrtKeySpec</code> constructor * Assertion: Constructs <code>RSAPrivateCrtKeySpec</code> * object using valid parameters diff --git a/security/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java b/security/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java index 8940003..207c173 100644 --- a/security/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java @@ -41,14 +41,6 @@ import java.security.spec.RSAPrivateKeySpec; public class RSAPrivateKeySpecTest extends TestCase { /** - * Constructor for RSAPrivateKeySpecTest. - * @param name - */ - public RSAPrivateKeySpecTest(String name) { - super(name); - } - - /** * Test for <code>RSAPrivateKeySpec(BigInteger,BigInteger)</code> ctor * Assertion: constructs <code>RSAPrivateKeySpec</code> * object using valid parameters diff --git a/security/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java b/security/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java index 47b9ca6..08f852c 100644 --- a/security/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java @@ -41,15 +41,6 @@ import java.security.spec.RSAPublicKeySpec; public class RSAPublicKeySpecTest extends TestCase { /** - * Constructor for RSAPublicKeySpecTest. - * @param name - */ - public RSAPublicKeySpecTest(String name) { - super(name); - } - - - /** * Test #1 for <code>RSAPublicKeySpec</code> constructor * Assertion: Constructs <code>RSAPublicKeySpec</code> * object using valid parameters diff --git a/security/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java b/security/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java index 26c0b5e..8942b89 100644 --- a/security/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java +++ b/security/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java @@ -41,14 +41,6 @@ import java.util.Arrays; @TestTargetClass(X509EncodedKeySpec.class) public class X509EncodedKeySpecTest extends TestCase { - /** - * Constructor for X509EncodedKeySpecTest. - * @param name - */ - public X509EncodedKeySpecTest(String name) { - super(name); - } - // // Test cases // diff --git a/security/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java b/security/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java index 81f57d9..6f0562a 100644 --- a/security/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java +++ b/security/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java @@ -1,6 +1,5 @@ package tests.targets.security; -import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -17,7 +16,6 @@ public class KeyStoreTestPKCS12 extends KeyStoreTest { level = TestLevel.ADDITIONAL, method = "!" ) - @KnownFailure("Missing SecretKeyFactory 1.2.840.113549.1.12.1.3") public void testKeyStoreCreate() { super.testKeyStoreCreate(); } @@ -27,7 +25,6 @@ public class KeyStoreTestPKCS12 extends KeyStoreTest { level = TestLevel.ADDITIONAL, method = "!" ) - @KnownFailure("Missing SecretKeyFactory 1.2.840.113549.1.12.1.3") public void testKeyStoreLoad() { super.testKeyStoreLoad(); } diff --git a/security/src/test/java/tests/targets/security/MessageDigestTest.java b/security/src/test/java/tests/targets/security/MessageDigestTest.java index d2d3b5d..f1d3d55 100644 --- a/security/src/test/java/tests/targets/security/MessageDigestTest.java +++ b/security/src/test/java/tests/targets/security/MessageDigestTest.java @@ -80,7 +80,7 @@ public abstract class MessageDigestTest extends TestCase { args = {} ) }) - public void testMessageDigest() + public void testMessageDigest1() { byte[] buf = new byte[128]; int read = 0; @@ -104,4 +104,111 @@ public abstract class MessageDigestTest extends TestCase { } } + + @TestTargets({ + @TestTargetNew( + level = TestLevel.ADDITIONAL, + method = "update", + args = {byte.class} + ), + @TestTargetNew( + level = TestLevel.ADDITIONAL, + method = "digest", + args = {} + ) + }) + public void testMessageDigest2() + { + int val; + try { + while ((val = sourceData.read()) != -1) + { + digest.update((byte)val); + } + } catch (IOException e) { + fail("failed to read digest data"); + } + + byte[] computedDigest = digest.digest(); + + assertNotNull("computed digest is is null", computedDigest); + assertEquals("digest length mismatch", checkDigest.length, computedDigest.length); + StringBuilder sb1, sb2; + sb1 = new StringBuilder(); + sb2 = new StringBuilder(); + for (int i = 0; i < checkDigest.length; i++) + { + assertEquals("byte " + i + " of computed and check digest differ", checkDigest[i], computedDigest[i]); + } + + } + + + /** + * Official FIPS180-2 testcases + */ + + protected String source1, source2, source3; + protected String expected1, expected2, expected3; + + String getLongMessage(int length) { + StringBuilder sourceBuilder = new StringBuilder(length); + for (int i = 0; i < length / 10; i++) { + sourceBuilder.append("aaaaaaaaaa"); + } + return sourceBuilder.toString(); + } + public void testfips180_2_singleblock() { + + digest.update(source1.getBytes(), 0, source1.length()); + + byte[] computedDigest = digest.digest(); + + assertNotNull("computed digest is null", computedDigest); + + StringBuilder sb = new StringBuilder(); + String res; + for (int i = 0; i < computedDigest.length; i++) + { + res = Integer.toHexString(computedDigest[i] & 0xFF); + sb.append((res.length() == 1 ? "0" : "") + res); + } + assertEquals("computed and check digest differ", expected1, sb.toString()); + } + + public void testfips180_2_multiblock() { + + digest.update(source2.getBytes(), 0, source2.length()); + + byte[] computedDigest = digest.digest(); + + assertNotNull("computed digest is null", computedDigest); + + StringBuilder sb = new StringBuilder(); + String res; + for (int i = 0; i < computedDigest.length; i++) + { + res = Integer.toHexString(computedDigest[i] & 0xFF); + sb.append((res.length() == 1 ? "0" : "") + res); + } + assertEquals("computed and check digest differ", expected2, sb.toString()); + } + + public void testfips180_2_longMessage() { + + digest.update(source3.getBytes(), 0, source3.length()); + + byte[] computedDigest = digest.digest(); + + assertNotNull("computed digest is null", computedDigest); + + StringBuilder sb = new StringBuilder(); + String res; + for (int i = 0; i < computedDigest.length; i++) + { + res = Integer.toHexString(computedDigest[i] & 0xFF); + sb.append((res.length() == 1 ? "0" : "") + res); + } + assertEquals("computed and check digest differ", expected3, sb.toString()); + } } diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestMD5.java b/security/src/test/java/tests/targets/security/MessageDigestTestMD5.java index a6663d8..c651695 100644 --- a/security/src/test/java/tests/targets/security/MessageDigestTestMD5.java +++ b/security/src/test/java/tests/targets/security/MessageDigestTestMD5.java @@ -8,8 +8,16 @@ public class MessageDigestTestMD5 extends MessageDigestTest { public MessageDigestTestMD5() { super("MD5"); + super.source1 = "abc"; + super.source2 = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"; + super.source3 = getLongMessage(1000000); + super.expected1 = singleblock; + super.expected2 = multiblock; + super.expected3 = longmessage; } - + String singleblock = "900150983cd24fb0d6963f7d28e17f72"; + String multiblock = "03dd8807a93175fb062dfb55dc7d359c"; + String longmessage = "7707d6ae4e027c70eea2a935c2296f21"; } diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA1.java b/security/src/test/java/tests/targets/security/MessageDigestTestSHA1.java index 79ba6a0..0d9fe5c 100644 --- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA1.java +++ b/security/src/test/java/tests/targets/security/MessageDigestTestSHA1.java @@ -8,8 +8,17 @@ public class MessageDigestTestSHA1 extends MessageDigestTest { public MessageDigestTestSHA1() { super("SHA-1"); + super.source1 = "abc"; + super.source2 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; + super.source3 = getLongMessage(1000000); + super.expected1 = singleblock; + super.expected2 = multiblock; + super.expected3 = longmessage; } - + // results from fips180-2 + String singleblock = "a9993e364706816aba3e25717850c26c9cd0d89d"; + String multiblock = "84983e441c3bd26ebaae4aa1f95129e5e54670f1"; + String longmessage = "34aa973cd4c4daa4f61eeb2bdbad27316534016f"; } diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA224.java b/security/src/test/java/tests/targets/security/MessageDigestTestSHA224.java new file mode 100644 index 0000000..71b8a5a --- /dev/null +++ b/security/src/test/java/tests/targets/security/MessageDigestTestSHA224.java @@ -0,0 +1,20 @@ +package tests.targets.security; + +public class MessageDigestTestSHA224 extends MessageDigestTest { + + public MessageDigestTestSHA224() { + super("SHA-224"); + super.source1 = "abc"; + super.source2 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; + super.source3 = getLongMessage(1000000); + super.expected1 = singleblock; + super.expected2 = multiblock; + super.expected3 = longmessage; + } + + // results from fips180-2 + String singleblock = "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7"; + String multiblock = "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525"; + String longmessage = "20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67"; + +} diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA256.java b/security/src/test/java/tests/targets/security/MessageDigestTestSHA256.java index aac55bf..b238a47 100644 --- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA256.java +++ b/security/src/test/java/tests/targets/security/MessageDigestTestSHA256.java @@ -8,8 +8,17 @@ public class MessageDigestTestSHA256 extends MessageDigestTest { public MessageDigestTestSHA256() { super("SHA-256"); + super.source1 = "abc"; + super.source2 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; + super.source3 = getLongMessage(1000000); + super.expected1 = singleblock; + super.expected2 = multiblock; + super.expected3 = longmessage; } - + // results from fips180-2 + String singleblock = "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"; + String multiblock = "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1"; + String longmessage = "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0"; } diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA384.java b/security/src/test/java/tests/targets/security/MessageDigestTestSHA384.java index eacc675..acfebd0 100644 --- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA384.java +++ b/security/src/test/java/tests/targets/security/MessageDigestTestSHA384.java @@ -8,8 +8,17 @@ public class MessageDigestTestSHA384 extends MessageDigestTest { public MessageDigestTestSHA384() { super("SHA-384"); + super.source1 = "abc"; + super.source2 = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"; + super.source3 = getLongMessage(1000000); + super.expected1 = singleblock; + super.expected2 = multiblock; + super.expected3 = longmessage; } - + // results from fips180-2 + String singleblock = "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7"; + String multiblock = "09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039"; + String longmessage = "9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985"; } diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA512.java b/security/src/test/java/tests/targets/security/MessageDigestTestSHA512.java index eb254cf..826fd56 100644 --- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA512.java +++ b/security/src/test/java/tests/targets/security/MessageDigestTestSHA512.java @@ -8,8 +8,17 @@ public class MessageDigestTestSHA512 extends MessageDigestTest { public MessageDigestTestSHA512() { super("SHA-512"); + super.source1 = "abc"; + super.source2 = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"; + super.source3 = getLongMessage(1000000); + super.expected1 = singleblock; + super.expected2 = multiblock; + super.expected3 = longmessage; } - + // results from fips180-2 + String singleblock = "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f"; + String multiblock = "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909"; + String longmessage = "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b"; } diff --git a/security/src/test/resources/tests/targets/security/SHA-224.check b/security/src/test/resources/tests/targets/security/SHA-224.check new file mode 100644 index 0000000..a7aaf15 --- /dev/null +++ b/security/src/test/resources/tests/targets/security/SHA-224.check @@ -0,0 +1 @@ +äì¸:žË½>à|=¦Úûż¾¼0]•âGQ¢í
\ No newline at end of file diff --git a/security/src/test/resources/tests/targets/security/SHA-224.data b/security/src/test/resources/tests/targets/security/SHA-224.data new file mode 100644 index 0000000..39be11d --- /dev/null +++ b/security/src/test/resources/tests/targets/security/SHA-224.data @@ -0,0 +1 @@ +hallo welt!
\ No newline at end of file |