harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r472004 - /incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertPathImplTest.java
Date Tue, 07 Nov 2006 06:33:57 GMT
Author: smishura
Date: Mon Nov  6 22:33:57 2006
New Revision: 472004

URL: http://svn.apache.org/viewvc?view=rev&rev=472004
Log:
Fix JUnit-style + minor updates

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertPathImplTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertPathImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertPathImplTest.java?view=diff&rev=472004&r1=472003&r2=472004
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertPathImplTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertPathImplTest.java
Mon Nov  6 22:33:57 2006
@@ -65,56 +65,36 @@
     }
     
     /**
-     * X509CertPathImpl(List certificates) method testing.
+     * @tests org.apache.harmony.security.provider.cert.X509CertPathImpl.X509CertPathImpl(List)
      */
-    public void testX509CertPathImpl1() throws Exception {
-        assertTrue("Certificate list size missmatch", 
-                certList.size() == certPath.getCertificates().size());
+    public void test_X509CertPathImpl_List() throws Exception {
+        assertEquals("Certificate list size missmatch", 
+                certList.size(), certPath.getCertificates().size());
     }
     
     /**
-     * getInstance(InputStream in) method testing.
+     * @tests org.apache.harmony.security.provider.cert.X509CertPathImpl.getInstance(InputStream)
      */
-    public void testX509CertPathImpl2() {
-        try {
-            byte[] encoding = certPath.getEncoded();
-            ByteArrayInputStream bais = new ByteArrayInputStream(encoding);
-            X509CertPathImpl cpath = X509CertPathImpl.getInstance(bais);
-            assertTrue("Certificate list size missmatch", 
-                    certList.size() == cpath.getCertificates().size());
-        } catch (CertificateEncodingException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateEncodingException was thrown:"
-                    + e.getMessage());
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException was thrown:"
-                    + e.getMessage());
-        }
+    public void test_getInstance_InputStream() throws Exception {
+        byte[] encoding = certPath.getEncoded();
+        ByteArrayInputStream bais = new ByteArrayInputStream(encoding);
+        X509CertPathImpl cpath = X509CertPathImpl.getInstance(bais);
+        assertEquals("Certificate list size missmatch", certList.size(), cpath
+                .getCertificates().size());
     }
     
     /**
-     * getInstance(byte[] in) method testing.
+     * @tests org.apache.harmony.security.provider.cert.X509CertPathImpl.getInstance(byte[])
      */
-    public void testX509CertPathImpl3() {
-        try {
-            byte[] encoding = certPath.getEncoded();
-            X509CertPathImpl cpath = X509CertPathImpl.getInstance(encoding);
-            assertTrue("Certificate list size missmatch", 
-                    certList.size() == cpath.getCertificates().size());
-        } catch (CertificateEncodingException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateEncodingException was thrown:"
-                    + e.getMessage());
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException was thrown:"
-                    + e.getMessage());
-        }
+    public void test_getInstance_$B() throws Exception {
+        byte[] encoding = certPath.getEncoded();
+        X509CertPathImpl cpath = X509CertPathImpl.getInstance(encoding);
+        assertEquals("Certificate list size missmatch", certList.size(), cpath
+                .getCertificates().size());
     }
 
     /**
-     * @tests org.apache.harmony.security.provider.cert.getInstance(byte[], java.lang.String)
+     * @tests org.apache.harmony.security.provider.cert.X509CertPathImpl.getInstance(byte[],
String)
      */
     public void test_getInstance$BLjava_lang_String() throws Exception {
 
@@ -143,26 +123,18 @@
     }
 
     /**
-     * getCertificates() method testing.
+     * @tests org.apache.harmony.security.provider.cert.X509CertPathImpl.getCertificates()
      */
-    public void testGetCertificates() {
+    public void test_getCertificates() throws Exception {
         try {
             byte[] encoding = certPath.getEncoded();
             X509CertPathImpl cpath = X509CertPathImpl.getInstance(encoding);
-            assertTrue("Certificate list size missmatch", 
-                    certList.size() == cpath.getCertificates().size());
+            assertEquals("Certificate list size missmatch", certList.size(),
+                    cpath.getCertificates().size());
             cpath.getCertificates().remove(0);
             fail("UnsupportedOperationException should be thrown");
         } catch (UnsupportedOperationException e) {
             //pass
-        } catch (CertificateEncodingException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateEncodingException was thrown:"
-                    + e.getMessage());
-        } catch (CertificateException e) {
-            e.printStackTrace();
-            fail("Unexpected CertificateException was thrown:"
-                    + e.getMessage());
         }
     }
     



Mime
View raw message