Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 49188 invoked from network); 28 Nov 2006 13:33:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Nov 2006 13:33:40 -0000 Received: (qmail 17474 invoked by uid 500); 28 Nov 2006 13:33:44 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 17449 invoked by uid 500); 28 Nov 2006 13:33:44 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 17365 invoked by uid 99); 28 Nov 2006 13:33:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Nov 2006 05:33:44 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Nov 2006 05:33:33 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 659121A9846; Tue, 28 Nov 2006 05:32:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r480036 - in /harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert: X509CRLImplTest.java X509CertImplTest.java Date: Tue, 28 Nov 2006 13:32:56 -0000 To: commits@harmony.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061128133256.659121A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smishura Date: Tue Nov 28 05:32:54 2006 New Revision: 480036 URL: http://svn.apache.org/viewvc?view=rev&rev=480036 Log: Fix imports and JUnit-style for couple of test cases Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CRLImplTest.java harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CRLImplTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CRLImplTest.java?view=diff&rev=480036&r1=480035&r2=480036 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CRLImplTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CRLImplTest.java Tue Nov 28 05:32:54 2006 @@ -42,23 +42,22 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.harmony.security.asn1.ASN1Integer; import org.apache.harmony.security.provider.cert.X509CRLImpl; import org.apache.harmony.security.provider.cert.X509CertImpl; import org.apache.harmony.security.x501.Name; import org.apache.harmony.security.x509.AlgorithmIdentifier; import org.apache.harmony.security.x509.AuthorityKeyIdentifier; +import org.apache.harmony.security.x509.CRLNumber; import org.apache.harmony.security.x509.Certificate; import org.apache.harmony.security.x509.CertificateIssuer; import org.apache.harmony.security.x509.CertificateList; -import org.apache.harmony.security.x509.CRLNumber; import org.apache.harmony.security.x509.DistributionPointName; import org.apache.harmony.security.x509.Extension; import org.apache.harmony.security.x509.Extensions; import org.apache.harmony.security.x509.GeneralName; import org.apache.harmony.security.x509.GeneralNames; -import org.apache.harmony.security.x509.IssuingDistributionPoint; import org.apache.harmony.security.x509.InvalidityDate; +import org.apache.harmony.security.x509.IssuingDistributionPoint; import org.apache.harmony.security.x509.ReasonCode; import org.apache.harmony.security.x509.ReasonFlags; import org.apache.harmony.security.x509.SubjectPublicKeyInfo; @@ -468,25 +467,16 @@ /** * verify(PublicKey key) method testing. */ - public void testVerify1() { - try { - crl.verify(publicKey); - } catch (Exception e) { - fail("Signature verifying process failed."); - } + public void testVerify1() throws Exception { + crl.verify(publicKey); } /** * verify(PublicKey key, String sigProvider) method testing. */ - public void testVerify2() { - try { - crl.verify(publicKey, - Signature.getInstance("SHA1withDSA") - .getProvider().getName()); - } catch (Exception e) { - fail("Signature verifying process failed."); - } + public void testVerify2() throws Exception { + crl.verify(publicKey, Signature.getInstance("SHA1withDSA") + .getProvider().getName()); } /** Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java?view=diff&rev=480036&r1=480035&r2=480036 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java Tue Nov 28 05:32:54 2006 @@ -21,39 +21,63 @@ package org.apache.harmony.security.tests.provider.cert; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.KeyPairGenerator; -import java.security.Signature; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.KeyPair; -import java.security.PublicKey; +import java.security.KeyPairGenerator; import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Signature; +import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; -import javax.security.auth.x500.X500Principal; - -import org.apache.harmony.security.asn1.ASN1Integer; -import org.apache.harmony.security.asn1.ASN1Sequence; -import org.apache.harmony.security.asn1.ASN1Type; -import org.apache.harmony.security.asn1.BitString; -import org.apache.harmony.security.asn1.ObjectIdentifier; - -import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateParsingException; import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Set; -import org.apache.harmony.security.asn1.ASN1BitString; -import org.apache.harmony.security.provider.cert.X509CertImpl; -import org.apache.harmony.security.tests.support.cert.TestUtils; -import org.apache.harmony.security.x501.Name; -import org.apache.harmony.security.x509.*; - -import java.security.cert.CertificateParsingException; +import javax.security.auth.x500.X500Principal; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.harmony.security.asn1.ObjectIdentifier; +import org.apache.harmony.security.provider.cert.X509CertImpl; +import org.apache.harmony.security.tests.support.cert.TestUtils; +import org.apache.harmony.security.x501.Name; +import org.apache.harmony.security.x509.AlgorithmIdentifier; +import org.apache.harmony.security.x509.AlternativeName; +import org.apache.harmony.security.x509.AuthorityKeyIdentifier; +import org.apache.harmony.security.x509.BasicConstraints; +import org.apache.harmony.security.x509.CRLDistributionPoints; +import org.apache.harmony.security.x509.Certificate; +import org.apache.harmony.security.x509.CertificatePolicies; +import org.apache.harmony.security.x509.DistributionPoint; +import org.apache.harmony.security.x509.DistributionPointName; +import org.apache.harmony.security.x509.ExtendedKeyUsage; +import org.apache.harmony.security.x509.Extension; +import org.apache.harmony.security.x509.Extensions; +import org.apache.harmony.security.x509.GeneralName; +import org.apache.harmony.security.x509.GeneralNames; +import org.apache.harmony.security.x509.GeneralSubtree; +import org.apache.harmony.security.x509.GeneralSubtrees; +import org.apache.harmony.security.x509.InhibitAnyPolicy; +import org.apache.harmony.security.x509.KeyUsage; +import org.apache.harmony.security.x509.NameConstraints; +import org.apache.harmony.security.x509.PolicyConstraints; +import org.apache.harmony.security.x509.PolicyInformation; +import org.apache.harmony.security.x509.ReasonFlags; +import org.apache.harmony.security.x509.SubjectKeyIdentifier; +import org.apache.harmony.security.x509.SubjectPublicKeyInfo; +import org.apache.harmony.security.x509.TBSCertificate; +import org.apache.harmony.security.x509.Validity; + /** * X509CertImplTest */ @@ -718,25 +742,16 @@ * verify(PublicKey key) method testing. */ public void testVerify1() throws Exception { - try { - certificate.verify(publicKey); - } catch (Exception e) { - fail("Signature verifying process failed."); - } + certificate.verify(publicKey); } /** * TODO * verify(PublicKey key, String sigProvider) method testing. */ - public void testVerify2() { - try { - certificate.verify(publicKey, - Signature.getInstance("SHA1withDSA") - .getProvider().getName()); - } catch (Exception e) { - fail("Signature verifying process failed."); - } + public void testVerify2() throws Exception { + certificate.verify(publicKey, Signature.getInstance("SHA1withDSA") + .getProvider().getName()); } /**