diff options
Diffstat (limited to 'security')
70 files changed, 84 insertions, 351 deletions
diff --git a/security/src/main/files/certimport.sh b/security/src/main/files/certimport.sh index f7bd8c8..f65aff9 100755 --- a/security/src/main/files/certimport.sh +++ b/security/src/main/files/certimport.sh @@ -1,6 +1,39 @@ #!/bin/bash +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# certimport.sh recreates the cacerts.bks file from the x509 CA +# certificates in the cacerts directory. +# +# By convention, the filenames in the cacerts directory are in the +# format of <hash>.<n> where "hash" is the subject hash produced by: +# +# openssl x509 -subject_hash -in filename +# +# and the "n" is the the depth of the certificate along a chain, i.e. +# .0 for roots, .1 for an intermediate one level deep, etc. +# +# The filename itself is not important, and is around just for convention sake. +# +# usage is simply running ./certimport.sh from the scripts directory +# # java version >= 1.6 is required for this script. +# # This script was tested to work with bouncycastle 1.32. +# set -x set -e diff --git a/security/src/main/java/java/security/MessageDigest.java b/security/src/main/java/java/security/MessageDigest.java index cb8fc08..6996054 100644 --- a/security/src/main/java/java/security/MessageDigest.java +++ b/security/src/main/java/java/security/MessageDigest.java @@ -170,7 +170,6 @@ public abstract class MessageDigest extends MessageDigestSpi { * @param arg0 * the {@code byte} to update this {@code MessageDigest} with * @see #reset() - * @since Android 1.0 */ public void update(byte arg0) { engineUpdate(arg0); @@ -222,7 +221,6 @@ public abstract class MessageDigest extends MessageDigestSpi { * * @return the computed one way hash value * @see #reset - * @since Android 1.0 */ public byte[] digest() { return engineDigest(); diff --git a/security/src/main/java/java/security/Security.java b/security/src/main/java/java/security/Security.java index 6ff38ad..1fea1bd 100644 --- a/security/src/main/java/java/security/Security.java +++ b/security/src/main/java/java/security/Security.java @@ -70,8 +70,7 @@ public final class Security { try { InputStream configStream = getClass().getResourceAsStream("security.properties"); //$NON-NLS-1$ - InputStream input = - new BufferedInputStream(configStream, 8192); + InputStream input = new BufferedInputStream(configStream); secprops.load(input); loaded = true; configStream.close(); diff --git a/security/src/main/java/java/security/acl/package.html b/security/src/main/java/java/security/acl/package.html index 3102fc2..b8ec061 100644 --- a/security/src/main/java/java/security/acl/package.html +++ b/security/src/main/java/java/security/acl/package.html @@ -10,6 +10,5 @@ Functionality for generating new entries in an ACL {@link java.security.acl.AclE for the creation of new owners {@link java.security.acl.Owner}, and for the registration of new permissions {@link java.security.acl.Permission} are provided. </p> -@since Android 1.0 </body> </html> diff --git a/security/src/main/java/java/security/cert/X509CertSelector.java b/security/src/main/java/java/security/cert/X509CertSelector.java index e2de95b..0460fd6 100644 --- a/security/src/main/java/java/security/cert/X509CertSelector.java +++ b/security/src/main/java/java/security/cert/X509CertSelector.java @@ -751,7 +751,6 @@ public class X509CertSelector implements CertSelector { ArrayList result = new ArrayList(); for (int tag=0; tag<9; tag++) { if (subjectAltNames[tag] != null) { - Integer teg = new Integer(tag); for (int name=0; name<subjectAltNames[tag].size(); name++) { Object neim = subjectAltNames[tag].get(name); if (neim instanceof byte[]) { @@ -760,7 +759,7 @@ public class X509CertSelector implements CertSelector { System.arraycopy(arr_neim, 0, neim, 0, arr_neim.length); } List list = new ArrayList(2); - list.add(teg); + list.add(Integer.valueOf(tag)); // android-changed list.add(neim); result.add(list); } @@ -1431,4 +1430,3 @@ public class X509CertSelector implements CertSelector { return result; } } - diff --git a/security/src/main/java/java/security/cert/package.html b/security/src/main/java/java/security/cert/package.html index e3cc92b..e39b38f 100644 --- a/security/src/main/java/java/security/cert/package.html +++ b/security/src/main/java/java/security/cert/package.html @@ -18,6 +18,5 @@ Exception are generated mainly for three reasons:<br> </p><p> The functionality to check the different entries and extension fields of X.509 certificates are also provided. </p> -@since Android 1.0 </body> </html> diff --git a/security/src/main/java/java/security/interfaces/package.html b/security/src/main/java/java/security/interfaces/package.html index 6f14de1..dd24196 100644 --- a/security/src/main/java/java/security/interfaces/package.html +++ b/security/src/main/java/java/security/interfaces/package.html @@ -10,6 +10,5 @@ This package provides the interfaces needed to generate: (2) Keys for the Digital Signature Algorithm (DSA) specified by FIPS-186; (3) Keys for a generic Elliptic Curve asymmetric encryption algorithm. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/security/src/main/java/java/security/package.html b/security/src/main/java/java/security/package.html index b4f450e..4c5e2b4 100644 --- a/security/src/main/java/java/security/package.html +++ b/security/src/main/java/java/security/package.html @@ -31,6 +31,5 @@ be divided into two parts: implemented. </ul> </p> -@since Android 1.0 </body> </html> diff --git a/security/src/main/java/java/security/spec/package.html b/security/src/main/java/java/security/spec/package.html index 1a1a8e0..d75aee6 100644 --- a/security/src/main/java/java/security/spec/package.html +++ b/security/src/main/java/java/security/spec/package.html @@ -14,6 +14,5 @@ Keys may be specified via algorithm or in a more abstract and general way with A The parameters for the Elliptic Curve (EC) encryption algorithm are only specified as input parameters to the relevant EC-generator. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/security/src/main/java/javax/security/cert/package.html b/security/src/main/java/javax/security/cert/package.html index a58f1de..792b446 100644 --- a/security/src/main/java/javax/security/cert/package.html +++ b/security/src/main/java/javax/security/cert/package.html @@ -10,6 +10,5 @@ version of the java.security.cert package that was previously used by JSSE (Java All applications that do not have to be compatible with older versions of JSSE (that is before Java SDK 1.5) should only use java.security.cert. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java b/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java index c809fe4..8edb0c5 100644 --- a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java +++ b/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java @@ -115,14 +115,11 @@ public class DefaultPolicyParser { throws Exception { boolean resolve = PolicyUtils.canExpandProperties(); - // BEGIN android-modified Reader r = new BufferedReader( new InputStreamReader( AccessController.doPrivileged( - new PolicyUtils.URLLoader(location))), - 8192); - // END android-modified + new PolicyUtils.URLLoader(location)))); Collection<GrantEntry> grantEntries = new HashSet<GrantEntry>(); List<KeystoreEntry> keystores = new ArrayList<KeystoreEntry>(); diff --git a/security/src/main/java/org/apache/harmony/security/x509/GeneralName.java b/security/src/main/java/org/apache/harmony/security/x509/GeneralName.java index 3b291a1..dcf4b94 100644 --- a/security/src/main/java/org/apache/harmony/security/x509/GeneralName.java +++ b/security/src/main/java/org/apache/harmony/security/x509/GeneralName.java @@ -463,7 +463,7 @@ public class GeneralName { */ public List getAsList() { ArrayList result = new ArrayList(); - result.add(new Integer(tag)); + result.add(Integer.valueOf(tag)); // android-changed switch (tag) { case OTHER_NAME: result.add(((OtherName) name).getEncoded()); diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/HMac.java b/security/src/main/java/org/bouncycastle/crypto/macs/HMac.java index 0bd4d39..7272f32 100644 --- a/security/src/main/java/org/bouncycastle/crypto/macs/HMac.java +++ b/security/src/main/java/org/bouncycastle/crypto/macs/HMac.java @@ -32,23 +32,23 @@ public class HMac { blockLengths = new Hashtable(); - blockLengths.put("GOST3411", new Integer(32)); + blockLengths.put("GOST3411", Integer.valueOf(32)); - blockLengths.put("MD2", new Integer(16)); - blockLengths.put("MD4", new Integer(64)); - blockLengths.put("MD5", new Integer(64)); + blockLengths.put("MD2", Integer.valueOf(16)); + blockLengths.put("MD4", Integer.valueOf(64)); + blockLengths.put("MD5", Integer.valueOf(64)); - blockLengths.put("RIPEMD128", new Integer(64)); - blockLengths.put("RIPEMD160", new Integer(64)); + blockLengths.put("RIPEMD128", Integer.valueOf(64)); + blockLengths.put("RIPEMD160", Integer.valueOf(64)); - blockLengths.put("SHA-1", new Integer(64)); - blockLengths.put("SHA-224", new Integer(64)); - blockLengths.put("SHA-256", new Integer(64)); - blockLengths.put("SHA-384", new Integer(128)); - blockLengths.put("SHA-512", new Integer(128)); + blockLengths.put("SHA-1", Integer.valueOf(64)); + blockLengths.put("SHA-224", Integer.valueOf(64)); + blockLengths.put("SHA-256", Integer.valueOf(64)); + blockLengths.put("SHA-384", Integer.valueOf(128)); + blockLengths.put("SHA-512", Integer.valueOf(128)); - blockLengths.put("Tiger", new Integer(64)); - blockLengths.put("Whirlpool", new Integer(64)); + blockLengths.put("Tiger", Integer.valueOf(64)); + blockLengths.put("Whirlpool", Integer.valueOf(64)); } private static int getByteLength( diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java b/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java index cb3b172..24233d6 100644 --- a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java +++ b/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java @@ -397,9 +397,9 @@ public abstract class JDKKeyPairGenerator // static { // ecParameters = new Hashtable(); // -// ecParameters.put(new Integer(192), new ECGenParameterSpec("prime192v1")); -// ecParameters.put(new Integer(239), new ECGenParameterSpec("prime239v1")); -// ecParameters.put(new Integer(256), new ECGenParameterSpec("prime256v1")); +// ecParameters.put(Integer.valueOf(192), new ECGenParameterSpec("prime192v1")); +// ecParameters.put(Integer.valueOf(239), new ECGenParameterSpec("prime239v1")); +// ecParameters.put(Integer.valueOf(256), new ECGenParameterSpec("prime256v1")); // } // // public EC() @@ -421,7 +421,7 @@ public abstract class JDKKeyPairGenerator // { // this.strength = strength; // this.random = random; -// this.ecParams = (ECGenParameterSpec)ecParameters.get(new Integer(strength)); +// this.ecParams = (ECGenParameterSpec)ecParameters.get(Integer.valueOf(strength)); // // if (ecParams != null) // { diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java b/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java index 7846530..3cf05b1 100644 --- a/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java +++ b/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java @@ -704,9 +704,7 @@ public class JDKPKCS12KeyStore throw new NullPointerException("No password supplied for PKCS#12 KeyStore."); } - // BEGIN android-modified - BufferedInputStream bufIn = new BufferedInputStream(stream, 8192); - // END android-modified + BufferedInputStream bufIn = new BufferedInputStream(stream); bufIn.mark(10); diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java b/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java index 899cdd0..31507c6 100644 --- a/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java +++ b/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java @@ -282,9 +282,7 @@ public class JDKX509CertificateFactory if (!in.markSupported()) { - // BEGIN android-modified - in = new BufferedInputStream(in, 8192); - // END android-modified + in = new BufferedInputStream(in); } in.mark(10); @@ -377,9 +375,7 @@ public class JDKX509CertificateFactory if (!inStream.markSupported()) { - // BEGIN android-modified - inStream = new BufferedInputStream(inStream, 8192); - // END android-modified + inStream = new BufferedInputStream(inStream); } inStream.mark(10); diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java b/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java index 25053c3..69585b8 100644 --- a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java +++ b/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java @@ -202,9 +202,7 @@ public class PKIXCertPath } else if (encoding.equalsIgnoreCase("PKCS7") || encoding.equalsIgnoreCase("PEM")) { - // BEGIN android-modified - inStream = new BufferedInputStream(inStream, 8192); - // END android-modified + inStream = new BufferedInputStream(inStream); certificates = new ArrayList(); CertificateFactory certFactory= CertificateFactory.getInstance("X.509", "BC"); Certificate cert; diff --git a/security/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java b/security/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java index 50037db..cc00697 100644 --- a/security/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java +++ b/security/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java @@ -662,7 +662,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities } ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.totalPathLength", - new Object[] {new Integer(totalPathLength)}); + new Object[] {Integer.valueOf(totalPathLength)}); addNotification(msg); } @@ -697,7 +697,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities // conflicting trust anchors ErrorBundle msg = new ErrorBundle(RESOURCE_NAME, "CertPathReviewer.conflictingTrustAnchors", - new Object[] {new Integer(trustColl.size()), + new Object[] {Integer.valueOf(trustColl.size()), new UntrustedInput(cert.getIssuerX500Principal())}); addError(msg); } @@ -706,7 +706,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities ErrorBundle msg = new ErrorBundle(RESOURCE_NAME, "CertPathReviewer.noTrustAnchorFound", new Object[] {new UntrustedInput(cert.getIssuerX500Principal()), - new Integer(pkixParams.getTrustAnchors().size())}); + Integer.valueOf(pkixParams.getTrustAnchors().size())}); addError(msg); } else @@ -1883,7 +1883,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities else { msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcLimitValueNum", - new Object[] {new Integer(limit.getCurrency().getNumeric()), + new Object[] {Integer.valueOf(limit.getCurrency().getNumeric()), new Double(value), limit}); } @@ -1978,7 +1978,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities "CertPathReviewer.noCrlInCertstore", new Object[] {new UntrustedInput(crlselect.getIssuers()), new UntrustedInput(nonMatchingCrlNames), - new Integer(numbOfCrls)}); + Integer.valueOf(numbOfCrls)}); addNotification(msg,index); } diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java index a2008de..9825291 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java @@ -41,14 +41,6 @@ import junit.framework.TestCase; public class AccessControlExceptionTest extends TestCase { /** - * Entry point for standalone run. - * @param args command line arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(AccessControlExceptionTest.class); - } - - /** * Tests AccessControlException(String) */ @TestTargetNew( 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 1ff236a..69c994d 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 @@ -478,10 +478,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { } catch (NullPointerException e) { } } - - public static void main(String args[]) { - junit.textui.TestRunner.run(AlgorithmParameterGenerator1Test.class); - } } /** * Additional class to verify AlgorithmParameterGenerator constructor 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 5ec3d96..f65cc80 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 @@ -126,9 +126,5 @@ public class AlgorithmParametersSpiTest extends TestCase { } } - public static void main(String args[]) { - junit.textui.TestRunner.run(AlgorithmParametersSpiTest.class); - } - class MyAlgorithmParameterSpec implements AlgorithmParameterSpec {} } diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java index 089a7db..c0d5640 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package org.apache.harmony.security.tests.java.security;"); + TestSuite suite = new TestSuite("All tests for package org.apache.harmony.security.tests.java.security;"); // $JUnit-BEGIN$ suite.addTestSuite(AccessControlException2Test.class); 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 e29d9ac..f94cb27 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 @@ -41,15 +41,6 @@ import junit.framework.TestCase; */ public class CodeSignerTest extends TestCase { - - /** - * Entry point for standalone runs. - * @param args command line arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(CodeSignerTest.class); - } - private CertPath cpath = TestCertUtils.genCertPath(3, 0); private Date now = new Date(); 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 276dfd7..eeef8ac 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 @@ -47,16 +47,6 @@ import junit.framework.TestCase; */ public class CodeSourceTest extends TestCase { - /** - * - * Entry point for standalone runs. - * - * @param args command line arguments - */ - public static void main(String[] args) throws Exception { - junit.textui.TestRunner.run(CodeSourceTest.class); - } - private java.security.cert.Certificate[] chain = null; /* Below are various URLs used during the testing */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java index a1b0365..e717747 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java @@ -39,10 +39,6 @@ import junit.framework.TestCase; public class GuardedObjectTest extends TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(GuardedObjectTest.class); - } - /** Null guard imposes no restriction. */ @TestTargets({ @TestTargetNew( 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 5b1ea7f..c11f90a 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 @@ -51,10 +51,6 @@ public class IdentityScopeTest extends TestCase { } } - public static void main(String[] args) { - junit.textui.TestRunner.run(IdentityScopeTest.class); - } - IdentityScope is; /** 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 dc7880f..0cb1400 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 @@ -231,10 +231,6 @@ public class KSPrivateKeyEntryTest extends TestCase { return new TestSuite(KSPrivateKeyEntryTest.class); } - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - private static class tmpPrivateKey implements PrivateKey { private String alg = "My algorithm"; 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 742cc13..efa9bf0 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 @@ -650,8 +650,4 @@ public class KeyPairGenerator1Test extends TestCase { fail("Unexpected InvalidAlgorithmParameterException was thrown"); } } - - public static void main(String args[]) { - junit.textui.TestRunner.run(KeyPairGenerator1Test.class); - } } 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 9a8c5c5..5fe110c 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 @@ -505,7 +505,4 @@ public class KeyPairGenerator2Test extends TestCase { setProv(); GetInstance03(4); } - public static void main(String args[]) { - junit.textui.TestRunner.run(KeyPairGenerator2Test.class); - } } 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 69ec7a7..24867e7 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 @@ -191,10 +191,6 @@ public class KeyPairGenerator3Test extends TestCase { } } - public static void main(String args[]) { - junit.textui.TestRunner.run(KeyPairGenerator3Test.class); - } - /** * Additional class to verify KeyPairGenerator constructor */ 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 8d75921..689e6ce 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 @@ -104,9 +104,6 @@ public class KeyPairGeneratorSpiTest extends TestCase { KeyPair kp = keyPairGen.generateKeyPair(); assertNull("Not null KeyPair", kp); } - public static void main(String args[]) { - junit.textui.TestRunner.run(KeyPairGeneratorSpiTest.class); - } class MyAlgorithmParameterSpec implements AlgorithmParameterSpec {} 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 2ccca0e..9f25a7b 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 @@ -424,12 +424,6 @@ public class KeyStoreSpiTest extends TestCase { } catch (UnsupportedOperationException e) { } } - - public static void main(String args[]) { - junit.textui.TestRunner.run(KeyStoreSpiTest.class); - } - - } /** @@ -487,4 +481,4 @@ class MyCertificate extends Certificate { } }; } -}
\ No newline at end of file +} 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 13d4d62..f1a3cf3 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 @@ -36,11 +36,6 @@ import dalvik.annotation.TestTargetNew; */ public class PermissionTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(PermissionTest.class); - } - // 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/PermissionsTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java index 5680e2e..99d39f3 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java @@ -49,11 +49,6 @@ import junit.framework.TestCase; */ public class PermissionsTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(PermissionsTest.class); - } - /** * Can add any type of permissions. Cannot add if collection is read-only. */ diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java index ce57328..1f64d34 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java @@ -57,10 +57,6 @@ public class PolicyTest extends TestCase { public static final String JAVA_SECURITY_POLICY = "java.security.policy"; - public static void main(String[] args) { - junit.textui.TestRunner.run(PolicyTest.class); - } - @Override protected void tearDown() throws Exception { TestEnvironment.reset(); super.tearDown(); diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java index 99fce26..f1e1b42 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java @@ -38,14 +38,6 @@ import junit.framework.TestCase; public class PrivilegedActionExceptionTest extends TestCase { /** - * Entry point for standalone runs. - * @param args command line arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(PrivilegedActionExceptionTest.class); - } - - /** * Tests PrivilegedActionException(Exception) */ @TestTargetNew( @@ -89,4 +81,4 @@ public class PrivilegedActionExceptionTest extends TestCase { assertNotNull(new PrivilegedActionException(new Exception()).toString()); } -}
\ No newline at end of file +} diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java index 451cad4..7397a08 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java @@ -48,14 +48,6 @@ import junit.framework.TestCase; public class ProtectionDomainTest extends TestCase { - /** - * Entry point for standalone runs. - * @param args command line arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(ProtectionDomainTest.class); - } - private final AllPermission allperm = new AllPermission(); private URL url = null; 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 3cc447f..885d0e5 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 @@ -706,7 +706,7 @@ public class ProviderTest extends TestCase { assertEquals("1.0", myProvider.get("Provider.id version")); try { - myProvider.load(null); + myProvider.load((InputStream) null); fail("NullPointerException expected"); } catch (NullPointerException e) { // expected 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 2531c81..fcda610 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 @@ -36,11 +36,6 @@ import junit.framework.TestCase; * */ public class SecurityPermissionTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(SecurityPermissionTest.class); - } - /** * Check all constructors: an object is created with the specified valid name. * If name equal null then NPE should be thrown. 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 898ab17..267221c 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 @@ -57,10 +57,6 @@ public class SignerTest extends TestCase { if (denied!=null && denied.implies(permission)) throw new SecurityException(); } } - - public static void main(String[] args) { - junit.textui.TestRunner.run(SignerTest.class); - } /** * @tests java.security.Signer#toString() diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java index 1015521..f965337 100644 --- a/security/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java +++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java @@ -41,11 +41,6 @@ import junit.framework.TestCase; */ public class TimestampTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(TimestampTest.class); - } - private Date now = new Date(); private static final byte[] encoding = { 1, 2, 3 }; diff --git a/security/src/test/java/org/bouncycastle/jce/provider/AllTests.java b/security/src/test/java/org/bouncycastle/jce/provider/AllTests.java index e9fbdb0..f9bf52f 100644 --- a/security/src/test/java/org/bouncycastle/jce/provider/AllTests.java +++ b/security/src/test/java/org/bouncycastle/jce/provider/AllTests.java @@ -20,14 +20,8 @@ import junit.framework.Test; import junit.framework.TestSuite; public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite( - "All tests for " + AllTests.class.getPackage()); + TestSuite suite = new TestSuite("All tests for " + AllTests.class.getPackage()); suite.addTestSuite(PKIXCertPathValidatorSpiTest.class); return suite; } diff --git a/security/src/test/java/tests/api/java/security/AllTests.java b/security/src/test/java/tests/api/java/security/AllTests.java index 679f860..7f83780 100644 --- a/security/src/test/java/tests/api/java/security/AllTests.java +++ b/security/src/test/java/tests/api/java/security/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.api.java.security;"); + TestSuite suite = new TestSuite("All tests for package tests.api.java.security;"); // $JUnit-BEGIN$ suite.addTestSuite(AccessControlContextTest.class); diff --git a/security/src/test/java/tests/api/javax/security/auth/AllTests.java b/security/src/test/java/tests/api/javax/security/auth/AllTests.java index b5b7f18..bd4ae74 100644 --- a/security/src/test/java/tests/api/javax/security/auth/AllTests.java +++ b/security/src/test/java/tests/api/javax/security/auth/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.api.javax.security.auth;"); + TestSuite suite = new TestSuite("All tests for package tests.api.javax.security.auth;"); // $JUnit-BEGIN$ suite.addTestSuite(AuthPermissionTest.class); diff --git a/security/src/test/java/tests/api/javax/security/cert/AllTests.java b/security/src/test/java/tests/api/javax/security/cert/AllTests.java index 4516bc1..30921bd 100644 --- a/security/src/test/java/tests/api/javax/security/cert/AllTests.java +++ b/security/src/test/java/tests/api/javax/security/cert/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.api.javax.security.cert;"); + TestSuite suite = new TestSuite("All tests for package tests.api.javax.security.cert;"); // $JUnit-BEGIN$ suite.addTestSuite(CertificateEncodingExceptionTest.class); diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateTest.java b/security/src/test/java/tests/api/javax/security/cert/CertificateTest.java index c4d10f6..38afce6 100644 --- a/security/src/test/java/tests/api/javax/security/cert/CertificateTest.java +++ b/security/src/test/java/tests/api/javax/security/cert/CertificateTest.java @@ -191,8 +191,4 @@ public class CertificateTest extends TestCase { public static Test suite() { return new TestSuite(CertificateTest.class); } - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } } 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 4af8dc8..79b7b00 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 @@ -904,8 +904,4 @@ public class X509CertificateTest extends TestCase { public static Test suite() { return new TestSuite(X509CertificateTest.class); } - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } } diff --git a/security/src/test/java/tests/java/security/AllPermissionTest.java b/security/src/test/java/tests/java/security/AllPermissionTest.java index e9668ad..2db54b0 100644 --- a/security/src/test/java/tests/java/security/AllPermissionTest.java +++ b/security/src/test/java/tests/java/security/AllPermissionTest.java @@ -40,10 +40,6 @@ import junit.framework.TestCase; */ public class AllPermissionTest extends TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(AllPermissionTest.class); - } - /** * Test all constructors: an object is created, name and actions are ignored */ diff --git a/security/src/test/java/tests/java/security/AllTests.java b/security/src/test/java/tests/java/security/AllTests.java index 61396df..6dadd07 100644 --- a/security/src/test/java/tests/java/security/AllTests.java +++ b/security/src/test/java/tests/java/security/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.java.security;"); + TestSuite suite = new TestSuite("All tests for package tests.java.security;"); // $JUnit-BEGIN$ suite.addTestSuite(AlgorithmParameterGeneratorSpiTest.class); diff --git a/security/src/test/java/tests/java/security/BasicPermissionTest.java b/security/src/test/java/tests/java/security/BasicPermissionTest.java index 4987ab4..75661ae 100644 --- a/security/src/test/java/tests/java/security/BasicPermissionTest.java +++ b/security/src/test/java/tests/java/security/BasicPermissionTest.java @@ -38,11 +38,6 @@ import junit.framework.TestCase; */ @TestTargetClass(BasicPermission.class) public class BasicPermissionTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(BasicPermissionTest.class); - } - /** * Check all constructors: an object is created with the specified valid name. * If name equal null then NPE 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 3566ecf..470936e 100644 --- a/security/src/test/java/tests/java/security/IdentityTest.java +++ b/security/src/test/java/tests/java/security/IdentityTest.java @@ -56,10 +56,6 @@ public class IdentityTest extends TestCase { } } - public static void main(String[] args) { - junit.textui.TestRunner.run(IdentityTest.class); - } - @TestTargetNew( level = TestLevel.PARTIAL, notes = "Method's returned variable is not checked", diff --git a/security/src/test/java/tests/java/security/SecureClassLoaderTest.java b/security/src/test/java/tests/java/security/SecureClassLoaderTest.java index 1dfaae6..6ce1659 100644 --- a/security/src/test/java/tests/java/security/SecureClassLoaderTest.java +++ b/security/src/test/java/tests/java/security/SecureClassLoaderTest.java @@ -64,16 +64,6 @@ import java.security.cert.Certificate; public class SecureClassLoaderTest extends TestCase { /** - * Entry point for stand alone runs. - * - * @param args - * command line parameters - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(SecureClassLoaderTest.class); - } - - /** * A class name for the class presented as {@link #klassData bytecode below} */ private static final String klassName = "HiWorld"; diff --git a/security/src/test/java/tests/security/AllTests.java b/security/src/test/java/tests/security/AllTests.java index a88cc0e..7a790c9 100644 --- a/security/src/test/java/tests/security/AllTests.java +++ b/security/src/test/java/tests/security/AllTests.java @@ -23,13 +23,8 @@ import junit.framework.TestSuite; * Test suite that includes all tests for the security project. */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All security test suites"); + TestSuite suite = new TestSuite("All security test suites"); // $JUnit-BEGIN$ suite.addTest(org.apache.harmony.security.tests.java.security.AllTests.suite()); suite.addTest(org.bouncycastle.jce.provider.AllTests.suite()); diff --git a/security/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java b/security/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java index cfd0bb0..cbee130 100644 --- a/security/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java +++ b/security/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java @@ -37,11 +37,6 @@ import java.security.acl.AclNotFoundException; */ @TestTargetClass(AclNotFoundException.class) public class AclNotFoundExceptionTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AclNotFoundExceptionTest.class); - } - /** * check default constructor */ diff --git a/security/src/test/java/tests/security/acl/AllTests.java b/security/src/test/java/tests/security/acl/AllTests.java index 4b93980..9a6f2b4 100644 --- a/security/src/test/java/tests/security/acl/AllTests.java +++ b/security/src/test/java/tests/security/acl/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.api.java.security.acl;"); + TestSuite suite = new TestSuite("All tests for package tests.api.java.security.acl;"); // $JUnit-BEGIN$ suite.addTestSuite(AclNotFoundException2Test.class); diff --git a/security/src/test/java/tests/security/acl/LastOwnerExceptionTest.java b/security/src/test/java/tests/security/acl/LastOwnerExceptionTest.java index b76f456..3cd14ff 100644 --- a/security/src/test/java/tests/security/acl/LastOwnerExceptionTest.java +++ b/security/src/test/java/tests/security/acl/LastOwnerExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.acl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.acl.LastOwnerException; @@ -35,18 +30,7 @@ import java.security.acl.LastOwnerException; * Unit test for LastOwnerException. * */ -@TestTargetClass(LastOwnerException.class) public class LastOwnerExceptionTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(LastOwnerExceptionTest.class); - } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LastOwnerException", - args = {} - ) public void testLastOwnerException() { assertNotNull(new LastOwnerException()); assertNull(new LastOwnerException().getMessage()); diff --git a/security/src/test/java/tests/security/acl/NotOwnerExceptionTest.java b/security/src/test/java/tests/security/acl/NotOwnerExceptionTest.java index c3dfe34..67ef38b 100644 --- a/security/src/test/java/tests/security/acl/NotOwnerExceptionTest.java +++ b/security/src/test/java/tests/security/acl/NotOwnerExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.acl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.acl.NotOwnerException; @@ -35,18 +30,7 @@ import java.security.acl.NotOwnerException; * Unit test for NotOwnerException. * */ -@TestTargetClass(NotOwnerException.class) public class NotOwnerExceptionTest extends TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run(NotOwnerExceptionTest.class); - } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NotOwnerException", - args = {} - ) public void testNotOwnerException() { assertNotNull(new NotOwnerException()); assertNull(new NotOwnerException().getMessage()); diff --git a/security/src/test/java/tests/security/cert/AllTests.java b/security/src/test/java/tests/security/cert/AllTests.java index 749a5ab..e5b9d47 100644 --- a/security/src/test/java/tests/security/cert/AllTests.java +++ b/security/src/test/java/tests/security/cert/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.api.java.security.cert;"); + TestSuite suite = new TestSuite("All tests for package tests.api.java.security.cert;"); // $JUnit-BEGIN$ suite.addTestSuite(CRLExceptionTest.class); diff --git a/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java b/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java index 1c45e57..d472bc4 100644 --- a/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java +++ b/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java @@ -522,11 +522,6 @@ public class CertPathBuilder1Test extends TestCase { } } - - public static void main(String args[]) { - junit.textui.TestRunner.run(CertPathBuilder1Test.class); - } - } /** * Additional class to verify CertPathBuilder constructor diff --git a/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java b/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java index fcf235e..af9de90 100644 --- a/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java +++ b/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java @@ -265,9 +265,4 @@ public class CertPathBuilder2Test extends TestCase { checkResult(cerPB); } } - public static void main(String args[]) { - junit.textui.TestRunner.run(CertPathBuilder2Test.class); - } - - } diff --git a/security/src/test/java/tests/security/cert/CertPathValidator1Test.java b/security/src/test/java/tests/security/cert/CertPathValidator1Test.java index a76af78..101644d 100644 --- a/security/src/test/java/tests/security/cert/CertPathValidator1Test.java +++ b/security/src/test/java/tests/security/cert/CertPathValidator1Test.java @@ -526,10 +526,6 @@ public class CertPathValidator1Test extends TestCase { defaultProvider); } } - - public static void main(String args[]) { - junit.textui.TestRunner.run(CertPathValidator1Test.class); - } } /** * Additional class to verify CertPathValidator constructor diff --git a/security/src/test/java/tests/security/cert/CertStoreSpiTest.java b/security/src/test/java/tests/security/cert/CertStoreSpiTest.java index 3cac01f..4760871 100644 --- a/security/src/test/java/tests/security/cert/CertStoreSpiTest.java +++ b/security/src/test/java/tests/security/cert/CertStoreSpiTest.java @@ -97,10 +97,6 @@ public class CertStoreSpiTest extends TestCase { return new TestSuite(CertStoreSpiTest.class); } - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - /** * Additional classes for verification CertStoreSpi class */ diff --git a/security/src/test/java/tests/security/cert/CertificateFactory1Test.java b/security/src/test/java/tests/security/cert/CertificateFactory1Test.java index 42677eb..04112a2 100644 --- a/security/src/test/java/tests/security/cert/CertificateFactory1Test.java +++ b/security/src/test/java/tests/security/cert/CertificateFactory1Test.java @@ -887,10 +887,6 @@ public class CertificateFactory1Test extends TestCase { fail("Unexpected exception" + e); } } - - public static void main(String[] args) { - junit.textui.TestRunner.run(CertificateFactory1Test.class); - } } /** * Additional class to verify CertificateFactory constructor diff --git a/security/src/test/java/tests/security/cert/X509CRLEntryTest.java b/security/src/test/java/tests/security/cert/X509CRLEntryTest.java index 1eec127..3f82f67 100644 --- a/security/src/test/java/tests/security/cert/X509CRLEntryTest.java +++ b/security/src/test/java/tests/security/cert/X509CRLEntryTest.java @@ -266,9 +266,5 @@ public class X509CRLEntryTest extends TestCase { public static Test suite() { return new TestSuite(X509CRLEntryTest.class); } - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } } diff --git a/security/src/test/java/tests/security/cert/X509CRLTest.java b/security/src/test/java/tests/security/cert/X509CRLTest.java index c10494e..4dd98cb 100644 --- a/security/src/test/java/tests/security/cert/X509CRLTest.java +++ b/security/src/test/java/tests/security/cert/X509CRLTest.java @@ -457,9 +457,5 @@ public class X509CRLTest extends TestCase { public static Test suite() { return new TestSuite(X509CRLTest.class); } - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } } diff --git a/security/src/test/java/tests/security/interfaces/AllTests.java b/security/src/test/java/tests/security/interfaces/AllTests.java index e665119..e180408 100644 --- a/security/src/test/java/tests/security/interfaces/AllTests.java +++ b/security/src/test/java/tests/security/interfaces/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.security.interfaces;"); + TestSuite suite = new TestSuite("All tests for package tests.security.interfaces;"); // $JUnit-BEGIN$ suite.addTestSuite(DSAKeyTest.class); diff --git a/security/src/test/java/tests/security/permissions/JavaIoFileTest.java b/security/src/test/java/tests/security/permissions/JavaIoFileTest.java index 207bfc0..7bc6933 100644 --- a/security/src/test/java/tests/security/permissions/JavaIoFileTest.java +++ b/security/src/test/java/tests/security/permissions/JavaIoFileTest.java @@ -22,7 +22,6 @@ import java.io.FilenameFilter; import java.io.IOException; import java.security.Permission; -import dalvik.annotation.KnownFailure; import junit.framework.TestCase; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; @@ -432,7 +431,6 @@ public class JavaIoFileTest extends TestCase { args = {} ) }) - @KnownFailure("We need to finish cleaning up java.io.File (bug 2281992)") public void test_File4() throws IOException { class TestSecurityManager extends SecurityManager { boolean checkPropertyAccessCalled; @@ -489,7 +487,6 @@ public class JavaIoFileTest extends TestCase { args = {} ) }) - @KnownFailure("We need to finish cleaning up java.io.File (bug 2281992)") public void test_File5() throws IOException { class TestSecurityManager extends SecurityManager { boolean checkPropertyAccessCalled; diff --git a/security/src/test/java/tests/security/spec/AllTests.java b/security/src/test/java/tests/security/spec/AllTests.java index f643618..151e0a7 100644 --- a/security/src/test/java/tests/security/spec/AllTests.java +++ b/security/src/test/java/tests/security/spec/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.security.spec;"); + TestSuite suite = new TestSuite("All tests for package tests.security.spec;"); // $JUnit-BEGIN$ suite.addTestSuite(DSAParameterSpecTest.class); diff --git a/security/src/test/java/tests/targets/security/AllTests.java b/security/src/test/java/tests/targets/security/AllTests.java index 6bd6d05..7d5802d 100644 --- a/security/src/test/java/tests/targets/security/AllTests.java +++ b/security/src/test/java/tests/targets/security/AllTests.java @@ -20,13 +20,8 @@ import junit.framework.Test; import junit.framework.TestSuite; public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.targets.security;"); + TestSuite suite = new TestSuite("All tests for package tests.targets.security;"); // $JUnit-BEGIN$ suite.addTestSuite(MessageDigestTestMD2.class); @@ -75,4 +70,4 @@ public class AllTests { // $JUnit-END$ return suite; } -}
\ No newline at end of file +} diff --git a/security/src/test/java/tests/targets/security/cert/AllTests.java b/security/src/test/java/tests/targets/security/cert/AllTests.java index 50292e2..c0c411d 100644 --- a/security/src/test/java/tests/targets/security/cert/AllTests.java +++ b/security/src/test/java/tests/targets/security/cert/AllTests.java @@ -19,13 +19,8 @@ import junit.framework.Test; import junit.framework.TestSuite; public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.targets.security.certs;"); + TestSuite suite = new TestSuite("All tests for package tests.targets.security.certs;"); // $JUnit-BEGIN$ suite.addTestSuite(CertificateTest.class); @@ -36,4 +31,4 @@ public class AllTests { // $JUnit-END$ return suite; } -}
\ No newline at end of file +} |