harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r406809 - /incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java
Date Tue, 16 May 2006 02:58:08 GMT
Author: smishura
Date: Mon May 15 19:58:07 2006
New Revision: 406809

URL: http://svn.apache.org/viewcvs?rev=406809&view=rev
Log:
Utilizing JUnit's exception handling

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java?rev=406809&r1=406808&r2=406809&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java
Mon May 15 19:58:07 2006
@@ -45,7 +45,7 @@
     /**
      * engineGenerateCertificate(InputStream inStream) method testing.
      */
-    public void testEngineGenerateCertificate() {
+    public void testEngineGenerateCertificate() throws Exception {
         X509CertFactoryImpl certFactory = new X509CertFactoryImpl();
         Certificate cert;
         
@@ -53,15 +53,10 @@
         ByteArrayInputStream bais = 
             new ByteArrayInputStream(
                     CertFactoryTestData.getCertEncoding());
-        try {
-            cert = certFactory.engineGenerateCertificate(bais);
-            assertNotNull("First generated certificate is null", cert);
-            cert = certFactory.engineGenerateCertificate(bais);
-            assertNotNull("Second generated certificate is null", cert);
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException: " + e.getMessage());
-        }
+        cert = certFactory.engineGenerateCertificate(bais);
+        assertNotNull("First generated certificate is null", cert);
+        cert = certFactory.engineGenerateCertificate(bais);
+        assertNotNull("Second generated certificate is null", cert);
         
         try {
             certFactory.engineGenerateCertificate(bais);
@@ -72,15 +67,10 @@
         // Base64 testing
         bais = new ByteArrayInputStream(
                 CertFactoryTestData.getBase64CertEncoding());
-        try {
-            cert = certFactory.engineGenerateCertificate(bais);
-            assertNotNull("First generated certificate is null", cert);
-            cert = certFactory.engineGenerateCertificate(bais);
-            assertNotNull("Second generated certificate is null", cert);
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException: " + e.getMessage());
-        }
+        cert = certFactory.engineGenerateCertificate(bais);
+        assertNotNull("First generated certificate is null", cert);
+        cert = certFactory.engineGenerateCertificate(bais);
+        assertNotNull("Second generated certificate is null", cert);
         
         try {
             certFactory.engineGenerateCertificate(bais);
@@ -92,32 +82,21 @@
     /**
      * engineGenerateCertificates(InputStream inStream) method testing.
      */
-    public void testEngineGenerateCertificates() {
+    public void testEngineGenerateCertificates() throws Exception {
         X509CertFactoryImpl certFactory = new X509CertFactoryImpl();
         
         // DER encoded certificate generation testing
         ByteArrayInputStream bais = 
             new ByteArrayInputStream(
                     CertFactoryTestData.getCertEncoding());
-        try {
-            assertEquals("The size of collection is not correct",
-                    2, certFactory.engineGenerateCertificates(bais).size());
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException: " + e.getMessage());
-        }
+        assertEquals("The size of collection is not correct", 2, certFactory
+                .engineGenerateCertificates(bais).size());
         
         // Base64 testing
         bais = new ByteArrayInputStream(
                 CertFactoryTestData.getBase64CertEncoding());
-        try {
-            assertEquals("The size of collection is not correct",
-                    2, certFactory.engineGenerateCertificates(bais).size());
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException: " + e.getMessage());
-        }
-        
+        assertEquals("The size of collection is not correct", 2, certFactory
+                .engineGenerateCertificates(bais).size());
     }
     
     /**
@@ -131,15 +110,10 @@
         ByteArrayInputStream bais = 
             new ByteArrayInputStream(
                     CertFactoryTestData.getCRLEncoding());
-        try {
-            crl = certFactory.engineGenerateCRL(bais);
-            assertNotNull("First generated CRL is null", crl);
-            crl = certFactory.engineGenerateCRL(bais);
-            assertNotNull("Second generated CRL is null", crl);
-        } catch (CRLException e) {
-            e.printStackTrace();
-            fail("Unexpected CRLException: " + e.getMessage());
-        }
+        crl = certFactory.engineGenerateCRL(bais);
+        assertNotNull("First generated CRL is null", crl);
+        crl = certFactory.engineGenerateCRL(bais);
+        assertNotNull("Second generated CRL is null", crl);
         
         try {
             certFactory.engineGenerateCRL(bais);
@@ -173,13 +147,8 @@
         ByteArrayInputStream bais = 
             new ByteArrayInputStream(
                     CertFactoryTestData.getCRLEncoding());
-        try {
-            assertEquals("The size of collection is not correct",
-                    2, certFactory.engineGenerateCRLs(bais).size());
-        } catch (CRLException e) {
-            e.printStackTrace();
-            fail("Unexpected CRLException: " + e.getMessage());
-        }
+        assertEquals("The size of collection is not correct", 2, certFactory
+                .engineGenerateCRLs(bais).size());
 
         // Base64 testing
         bais = new ByteArrayInputStream(CertFactoryTestData
@@ -191,17 +160,12 @@
     /**
      * engineGenerateCertPath(InputStream inStream) method testing.
      */
-    public void testEngineGenerateCertPath() {
+    public void testEngineGenerateCertPath() throws Exception {
         X509CertFactoryImpl certFactory = new X509CertFactoryImpl();
         ByteArrayInputStream bais = 
                 new ByteArrayInputStream(
                         CertFactoryTestData.getCertPathPkiPathEncoding());
-        try {
-            certFactory.engineGenerateCertPath(bais);
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException was thrown");
-        }
+        certFactory.engineGenerateCertPath(bais);
 
         try {
             certFactory.engineGenerateCertPath(bais);
@@ -214,17 +178,12 @@
      * engineGenerateCertPath(InputStream inStream, String encoding) method
      * testing.
      */
-    public void testEngineGenerateCertPath1() {
+    public void testEngineGenerateCertPath1() throws Exception {
         X509CertFactoryImpl certFactory = new X509CertFactoryImpl();
         ByteArrayInputStream bais = 
                 new ByteArrayInputStream(
                         CertFactoryTestData.getCertPathPKCS7Encoding());
-        try {
-            certFactory.engineGenerateCertPath(bais, "PKCS7");
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException was thrown");
-        }
+        certFactory.engineGenerateCertPath(bais, "PKCS7");
 
         try {
             certFactory.engineGenerateCertPath(bais, "PKCS7");
@@ -236,28 +195,20 @@
     /**
      * engineGenerateCertPath(List certificates) method testing.
      */
-    public void testEngineGenerateCertPath2() {
-        X509Certificate certificate = null;
-        try {
-            X509CertImplTest test = new X509CertImplTest();
-            test.setUp();
-            certificate = test.certificate;
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Unexpected Exception was thrown: "+e.getMessage());
-        }
+    public void testEngineGenerateCertPath2() throws Exception {
+
+        X509CertImplTest test = new X509CertImplTest();
+        test.setUp();
+        X509Certificate certificate = test.certificate;
+
         ArrayList certList = new ArrayList();
         for (int i=0; i<2; i++) {
             certList.add(certificate);
         }
-        X509CertFactoryImpl certFactory = null;
-        try {
-            certFactory = new X509CertFactoryImpl();
-            certFactory.engineGenerateCertPath(certList);
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException was thrown: "+e.getMessage());
-        }
+
+        X509CertFactoryImpl certFactory = new X509CertFactoryImpl();
+        certFactory.engineGenerateCertPath(certList);
+
         certList.add(new Integer(5));
         try {
             certFactory.engineGenerateCertPath(certList);



Mime
View raw message