harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r540266 [1/2] - in /harmony/enhanced/classlib/trunk/modules/x-net/src/test: api/java/org/apache/harmony/xnet/tests/javax/net/ssl/ impl/java.injected/org/apache/harmony/xnet/provider/jsse/ impl/java/org/apache/harmony/xnet/tests/provider/jss...
Date Mon, 21 May 2007 20:31:21 GMT
Author: hindessm
Date: Mon May 21 13:31:19 2007
New Revision: 540266

URL: http://svn.apache.org/viewvc?view=rev&rev=540266
Log:
Cleaning up junit usage.

Modified:
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/ProtocolVersionTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/TrustManagerFactoryImplTest.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java
    harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java Mon May 21 13:31:19 2007
@@ -76,8 +76,7 @@
     }
 
     private void checkResult(KeyManagerFactory keyMF)
-        throws NoSuchAlgorithmException, UnrecoverableKeyException,
-        KeyStoreException {
+        throws Exception {
         KeyStore kStore = null;
         ManagerFactoryParameters mfp = null;
         
@@ -107,15 +106,9 @@
         } catch (KeyStoreException e) {
             fail("default keystore is not supported");
             return;
-        } catch (Exception e) {
-            fail("Unexpected: "+e.toString());
-            return;            
-        }
-        try {
-            keyMF.init(kStore, pass);
-        } catch (KeyStoreException e) {
-            fail("Unexpected KeyStoreException was thrown");
         }
+        keyMF.init(kStore, pass);
+
         mfp = (ManagerFactoryParameters) new MyKeyManagerFactorySpi.Parameters(kStore, null);
         try {
             keyMF.init(mfp);
@@ -123,11 +116,7 @@
         } catch (InvalidAlgorithmParameterException e) {
         }
         mfp = (ManagerFactoryParameters) new MyKeyManagerFactorySpi.Parameters(kStore, pass);
-        try {
-            keyMF.init(mfp);
-        } catch (InvalidAlgorithmParameterException e) {
-            fail("Unexpected InvalidAlgorithmParameterException was thrown");
-        }
+        keyMF.init(mfp);
     }
     /**
      * Test for <code>getInstance(String algorithm)</code> method
@@ -136,8 +125,7 @@
      * throws NoSuchAlgorithmException when algorithm is not correct;
      * returns KeyManagerFactory object
      */
-    public void testGetInstance01() throws NoSuchAlgorithmException,
-            KeyStoreException, UnrecoverableKeyException {
+    public void testGetInstance01() throws Exception {
         try {
             KeyManagerFactory.getInstance(null);
             fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");
@@ -174,9 +162,7 @@
      * throws NoSuchProviderException when provider is available;
      * returns KeyManagerFactory object
      */
-    public void testGetInstance02() throws NoSuchAlgorithmException,
-            NoSuchProviderException, IllegalArgumentException,
-            KeyStoreException, UnrecoverableKeyException {
+    public void testGetInstance02() throws Exception {
         try {
             KeyManagerFactory.getInstance(null, mProv.getName());
             fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");
@@ -242,9 +228,7 @@
      * throws IllegalArgumentException when provider is null;
      * returns KeyManagerFactory object
      */
-    public void testGetInstance03() throws NoSuchAlgorithmException,
-            IllegalArgumentException, KeyStoreException,
-            UnrecoverableKeyException {
+    public void testGetInstance03() throws Exception {
         try {
             KeyManagerFactory.getInstance(null, mProv);
             fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java Mon May 21 13:31:19 2007
@@ -82,37 +82,37 @@
             sslC.getSocketFactory();
             fail("RuntimeException must be thrown");
         } catch (RuntimeException e) {
-            assertEquals("Incorrect message", e.getMessage(),"Not initialiazed");
+            assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
         }
         try {
             sslC.getServerSocketFactory();
             fail("RuntimeException must be thrown");
         } catch (RuntimeException e) {
-            assertEquals("Incorrect message", e.getMessage(),"Not initialiazed");
+            assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
         }
         try {
             sslC.getServerSessionContext();
             fail("RuntimeException must be thrown");
         } catch (RuntimeException e) {
-            assertEquals("Incorrect message", e.getMessage(),"Not initialiazed");
+            assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
         }
         try {
             sslC.getClientSessionContext();
             fail("RuntimeException must be thrown");
         } catch (RuntimeException e) {
-            assertEquals("Incorrect message", e.getMessage(),"Not initialiazed");
+            assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
         }      
         try {
             sslC.createSSLEngine();
             fail("RuntimeException must be thrown");
         } catch (RuntimeException e) {
-            assertEquals("Incorrect message", e.getMessage(),"Not initialiazed");
+            assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
         }
         try {
             sslC.createSSLEngine("host",1);
             fail("RuntimeException must be thrown");
         } catch (RuntimeException e) {
-            assertEquals("Incorrect message", e.getMessage(),"Not initialiazed");
+            assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
         }
         TrustManager [] tm = new TManager[10];
         KeyManager [] km = new KManager[5];
@@ -126,7 +126,7 @@
         SSLEngine sslE = sslC.createSSLEngine();
         assertTrue("Not null result",sslE instanceof SSLEngine);
         assertNull("Incorrect host", sslE.getPeerHost());
-        assertEquals("Incorrect port", sslE.getPeerPort(), 0);
+        assertEquals("Incorrect port", 0, sslE.getPeerPort());
         String host = "ZZZ";
         int port = 8080;
         sslE = sslC.createSSLEngine(host, port);

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java Mon May 21 13:31:19 2007
@@ -46,7 +46,7 @@
     public void test01() {
         SSLEngine e = new mySSLEngine();
         assertNull(e.getPeerHost());
-        assertEquals(e.getPeerPort(), -1);
+        assertEquals(-1, e.getPeerPort());
         String[] suites = { "a", "b", "c" };
         e.setEnabledCipherSuites(suites);
         assertEquals(e.getEnabledCipherSuites().length, suites.length);
@@ -165,8 +165,8 @@
         } catch (SSLException ex) {
         }
         SSLEngineResult res = e.wrap(bbd, bbs);
-        assertEquals(res.bytesConsumed(), 10);
-        assertEquals(res.bytesProduced(), 20);
+        assertEquals(10, res.bytesConsumed());
+        assertEquals(20, res.bytesProduced());
 
         try {
             e.wrap(new ByteBuffer[] { bbs }, bbd);
@@ -174,8 +174,8 @@
         } catch (SSLException ex) {
         }
         res = e.wrap(new ByteBuffer[] { bbd }, bbs);
-        assertEquals(res.bytesConsumed(), 10);
-        assertEquals(res.bytesProduced(), 20);
+        assertEquals(10, res.bytesConsumed());
+        assertEquals(20, res.bytesProduced());
     }
 
     /**
@@ -191,8 +191,8 @@
         SSLEngine e = new mySSLEngine(host, port);
         
         SSLEngineResult res = e.wrap(bb, ByteBuffer.allocate(10));
-        assertEquals(res.bytesConsumed(), 10);
-        assertEquals(res.bytesProduced(), 20);
+        assertEquals(10, res.bytesConsumed());
+        assertEquals(20, res.bytesProduced());
     }
     
     /**
@@ -210,8 +210,8 @@
         SSLEngine e = new mySSLEngine(host, port);
 
         SSLEngineResult res = e.wrap(bbA, bb);
-        assertEquals(res.bytesConsumed(), 10);
-        assertEquals(res.bytesProduced(), 20);
+        assertEquals(10, res.bytesConsumed());
+        assertEquals(20, res.bytesProduced());
     }
     
     /**
@@ -297,8 +297,8 @@
         } catch (SSLException ex) {
         }
         SSLEngineResult res = e.unwrap(bbd, bbs);
-        assertEquals(res.bytesConsumed(), 1);
-        assertEquals(res.bytesProduced(), 2);
+        assertEquals(1, res.bytesConsumed());
+        assertEquals(2, res.bytesProduced());
 
         try {
             e.unwrap(bbs, new ByteBuffer[] { bbd });
@@ -306,8 +306,8 @@
         } catch (SSLException ex) {
         }
         res = e.unwrap(bbd, new ByteBuffer[] { bbs });
-        assertEquals(res.bytesConsumed(), 1);
-        assertEquals(res.bytesProduced(), 2);
+        assertEquals(1, res.bytesConsumed());
+        assertEquals(2, res.bytesProduced());
     }
     
     /**
@@ -322,8 +322,8 @@
         SSLEngine e = new mySSLEngine(host, port);
         SSLEngineResult res = e.unwrap(bb, ByteBuffer.allocate(10));
         
-        assertEquals(res.bytesConsumed(), 1);
-        assertEquals(res.bytesProduced(), 2);
+        assertEquals(1, res.bytesConsumed());
+        assertEquals(2, res.bytesProduced());
     }
     
     /**
@@ -341,8 +341,8 @@
         SSLEngine e = new mySSLEngine(host, port);
 
         SSLEngineResult res = e.unwrap(bb, bbA);
-        assertEquals(res.bytesConsumed(), 1);
-        assertEquals(res.bytesProduced(), 2);
+        assertEquals(1, res.bytesConsumed());
+        assertEquals(2, res.bytesProduced());
     }
 }
 

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java Mon May 21 13:31:19 2007
@@ -72,7 +72,7 @@
         Security.removeProvider(mProv.getName());
     }
 
-    private void checkResult(TrustManagerFactory tmf) throws InvalidAlgorithmParameterException {
+    private void checkResult(TrustManagerFactory tmf) throws Exception {
         KeyStore kStore = null;
         ManagerFactoryParameters mfp = null;
         
@@ -95,15 +95,8 @@
         } catch (KeyStoreException e) {
             fail("default keystore is not supported");
             return;
-        } catch (Exception e) {
-            fail("Unexpected: "+e.toString());
-            return;            
-        }
-        try {
-            tmf.init(kStore);
-        } catch (KeyStoreException e) {
-            fail("Unexpected KeyStoreException was thrown");
         }
+        tmf.init(kStore);
         mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(null);
         try {
             tmf.init(mfp);
@@ -122,8 +115,7 @@
      * throws NoSuchAlgorithmException when algorithm is not correct;
      * returns TrustManagerFactory object
      */
-    public void testGetInstance01() throws NoSuchAlgorithmException,
-            InvalidAlgorithmParameterException {
+    public void testGetInstance01() throws Exception {
         try {
             TrustManagerFactory.getInstance(null);
             fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");
@@ -160,9 +152,7 @@
      * throws NoSuchProviderException when provider is available;
      * returns TrustManagerFactory object
      */
-    public void testGetInstance02() throws NoSuchAlgorithmException,
-            NoSuchProviderException, IllegalArgumentException,
-            InvalidAlgorithmParameterException {
+    public void testGetInstance02() throws Exception {
         try {
             TrustManagerFactory.getInstance(null, mProv.getName());
             fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");
@@ -228,9 +218,7 @@
      * throws IllegalArgumentException when provider is null;
      * returns TrustManagerFactory object
      */
-    public void testGetInstance03() throws NoSuchAlgorithmException,
-            IllegalArgumentException,
-            InvalidAlgorithmParameterException {
+    public void testGetInstance03() throws Exception {
         try {
             TrustManagerFactory.getInstance(null, mProv);
             fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java Mon May 21 13:31:19 2007
@@ -119,357 +119,437 @@
     }
 
     public void testGetBulkEncryptionAlgorithm() {       
-        assertEquals(CipherSuite.TLS_NULL_WITH_NULL_NULL
-                .getBulkEncryptionAlgorithm(), null);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_MD5
-                .getBulkEncryptionAlgorithm(), null);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_SHA
-                .getBulkEncryptionAlgorithm(), null);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
-                .getBulkEncryptionAlgorithm(), "RC4");
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
-                .getBulkEncryptionAlgorithm(), "RC4");
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
-                .getBulkEncryptionAlgorithm(), "RC4");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-                .getBulkEncryptionAlgorithm(), "RC2/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "IDEA/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DESede/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DESede/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DESede/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DESede/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DESede/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-                .getBulkEncryptionAlgorithm(), "RC4");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
-                .getBulkEncryptionAlgorithm(), "RC4");
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DES/CBC/NoPadding");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-                .getBulkEncryptionAlgorithm(), "DESede/CBC/NoPadding");
+        assertNull(CipherSuite.TLS_NULL_WITH_NULL_NULL
+                .getBulkEncryptionAlgorithm());
+        assertNull(CipherSuite.TLS_RSA_WITH_NULL_MD5
+                .getBulkEncryptionAlgorithm());
+        assertNull(CipherSuite.TLS_RSA_WITH_NULL_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("RC4",
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
+                .getBulkEncryptionAlgorithm());
+        assertEquals("RC4",
+                CipherSuite.TLS_RSA_WITH_RC4_128_MD5
+                .getBulkEncryptionAlgorithm());
+        assertEquals("RC4",
+                CipherSuite.TLS_RSA_WITH_RC4_128_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("RC2/CBC/NoPadding",
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
+                .getBulkEncryptionAlgorithm());
+        assertEquals("IDEA/CBC/NoPadding",
+                CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DESede/CBC/NoPadding",
+                CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DESede/CBC/NoPadding",
+                CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DESede/CBC/NoPadding",
+                CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DESede/CBC/NoPadding",
+                CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DESede/CBC/NoPadding",
+                CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("RC4",
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
+                .getBulkEncryptionAlgorithm());
+        assertEquals("RC4",
+                CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DES/CBC/NoPadding",
+                CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
+                .getBulkEncryptionAlgorithm());
+        assertEquals("DESede/CBC/NoPadding",
+                CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
+                .getBulkEncryptionAlgorithm());
     }
 
     public void testGetBlockSize() {
-        assertEquals(CipherSuite.TLS_NULL_WITH_NULL_NULL
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_MD5
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_SHA
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
-                .getBlockSize(), 0);
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
-                .getBlockSize(), 8);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-                .getBlockSize(), 8);
+        assertEquals(0,
+                CipherSuite.TLS_NULL_WITH_NULL_NULL
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_RSA_WITH_NULL_MD5
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_RSA_WITH_NULL_SHA
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_RSA_WITH_RC4_128_MD5
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_RSA_WITH_RC4_128_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
+                .getBlockSize());
+        assertEquals(0,
+                CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
+                .getBlockSize());
+        assertEquals(8,
+                CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
+                .getBlockSize());
     }
 
     public void testGetHmacName() {
-        assertEquals(CipherSuite.TLS_NULL_WITH_NULL_NULL
-                .getHmacName(), null);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_MD5
-                .getHmacName(), "HmacMD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
-                .getHmacName(), "HmacMD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
-                .getHmacName(), "HmacMD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-                .getHmacName(), "HmacMD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-                .getHmacName(), "HmacMD5");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
-                .getHmacName(), "HmacMD5");
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
-                .getHmacName(), "HmacSHA1");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-                .getHmacName(), "HmacSHA1");
+        assertNull(CipherSuite.TLS_NULL_WITH_NULL_NULL
+                .getHmacName());
+        assertEquals("HmacMD5",
+                CipherSuite.TLS_RSA_WITH_NULL_MD5
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_RSA_WITH_NULL_SHA
+                .getHmacName());
+        assertEquals("HmacMD5",
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
+                .getHmacName());
+        assertEquals("HmacMD5",
+                CipherSuite.TLS_RSA_WITH_RC4_128_MD5
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_RSA_WITH_RC4_128_SHA
+                .getHmacName());
+        assertEquals("HmacMD5",
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacMD5",
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
+                .getHmacName());
+        assertEquals("HmacMD5",
+                CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
+                .getHmacName());
+        assertEquals("HmacSHA1",
+                CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
+                .getHmacName());
     }
 
     public void testGetHashName() {
-        assertEquals(CipherSuite.TLS_NULL_WITH_NULL_NULL
-                .getHashName(), null);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_MD5
-                .getHashName(), "MD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
-                .getHashName(), "MD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
-                .getHashName(), "MD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-                .getHashName(), "MD5");
-        assertEquals(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-                .getHashName(), "MD5");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
-                .getHashName(), "MD5");
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
-                .getHashName(), "SHA-1");
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-                .getHashName(), "SHA-1");
+        assertNull(CipherSuite.TLS_NULL_WITH_NULL_NULL
+                .getHashName());
+        assertEquals("MD5",
+                CipherSuite.TLS_RSA_WITH_NULL_MD5
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_RSA_WITH_NULL_SHA
+                .getHashName());
+        assertEquals("MD5",
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
+                .getHashName());
+        assertEquals("MD5",
+                CipherSuite.TLS_RSA_WITH_RC4_128_MD5
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_RSA_WITH_RC4_128_SHA
+                .getHashName());
+        assertEquals("MD5",
+                CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+                .getHashName());
+        assertEquals("MD5",
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
+                .getHashName());
+        assertEquals("MD5",
+                CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
+                .getHashName());
+        assertEquals("SHA-1",
+                CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
+                .getHashName());
     }
 
     public void testGetMACLength() {
-        assertEquals(CipherSuite.TLS_NULL_WITH_NULL_NULL
-                .getMACLength(), 0);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_MD5
-                .getMACLength(), 16);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
-                .getMACLength(), 16);
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
-                .getMACLength(), 16);
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-                .getMACLength(), 16);
-        assertEquals(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-                .getMACLength(), 16);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
-                .getMACLength(), 16);
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
-                .getMACLength(), 20);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-                .getMACLength(), 20);
+        assertEquals(0,
+                CipherSuite.TLS_NULL_WITH_NULL_NULL.getMACLength());
+        assertEquals(16, CipherSuite.TLS_RSA_WITH_NULL_MD5.getMACLength());
+        assertEquals(20, CipherSuite.TLS_RSA_WITH_NULL_SHA.getMACLength());
+        assertEquals(16, CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5.getMACLength());
+        assertEquals(16, CipherSuite.TLS_RSA_WITH_RC4_128_MD5.getMACLength());
+        assertEquals(20, CipherSuite.TLS_RSA_WITH_RC4_128_SHA.getMACLength());
+        assertEquals(16, CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5.getMACLength());
+        assertEquals(20, CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_RSA_WITH_DES_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA.getMACLength());
+        assertEquals(16, CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5.getMACLength());
+        assertEquals(16, CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA.getMACLength());
+        assertEquals(20, CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA.getMACLength());
     }
 
     public void testIsExportable() {
-        assertEquals(CipherSuite.TLS_NULL_WITH_NULL_NULL
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_MD5
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_RSA_WITH_NULL_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-                .isExportable(), true);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
-                .isExportable(), false);
-        assertEquals(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-                .isExportable(), false);
+        assertTrue(CipherSuite.TLS_NULL_WITH_NULL_NULL
+                .isExportable());
+        assertTrue(CipherSuite.TLS_RSA_WITH_NULL_MD5
+                .isExportable());
+        assertTrue(CipherSuite.TLS_RSA_WITH_NULL_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5
+                .isExportable());
+        assertFalse(CipherSuite.TLS_RSA_WITH_RC4_128_MD5
+                .isExportable());
+        assertFalse(CipherSuite.TLS_RSA_WITH_RC4_128_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
+                .isExportable());
+        assertFalse(CipherSuite.TLS_RSA_WITH_IDEA_CBC_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_RSA_WITH_DES_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_RSA_WITH_DES_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+                .isExportable());
+        assertTrue(CipherSuite.TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5
+                .isExportable());
+        assertTrue(CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_anon_WITH_DES_CBC_SHA
+                .isExportable());
+        assertFalse(CipherSuite.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
+                .isExportable());
     }
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java Mon May 21 13:31:19 2007
@@ -82,7 +82,7 @@
                         new SSLSessionContextImpl(),
                         new SSLSessionContextImpl())));
 
-        assertEquals(protocol.wrap(), null);
+        assertNull(protocol.wrap());
 
         protocol.delegatedTaskErr = new Exception();
         try {
@@ -91,7 +91,7 @@
         } catch (AlertException e) {
             assertEquals(e.getDescriptionCode(),
                     AlertProtocol.HANDSHAKE_FAILURE);
-            assertEquals(protocol.delegatedTaskErr, null);
+            assertNull(protocol.delegatedTaskErr);
         }
     }
 
@@ -118,8 +118,8 @@
 
         hs_protocol.preMasterSecret = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
         hs_protocol.computerMasterSecret();
-        assertEquals(hs_protocol.preMasterSecret, null);
-        assertEquals(hs_protocol.session.master_secret.length, 48);
+        assertNull(hs_protocol.preMasterSecret);
+        assertEquals(48, hs_protocol.session.master_secret.length);
 
         hs_protocol.send(hs_protocol.clientHello);
         hs_protocol.send(hs_protocol.serverHello);
@@ -162,8 +162,8 @@
 
         hs_protocol.preMasterSecret = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
         hs_protocol.computerMasterSecret();
-        assertEquals(hs_protocol.preMasterSecret, null);
-        assertEquals(hs_protocol.session.master_secret.length, 48);
+        assertNull(hs_protocol.preMasterSecret);
+        assertEquals(48, hs_protocol.session.master_secret.length);
 
         hs_protocol.send(hs_protocol.clientHello);
         hs_protocol.send(hs_protocol.serverHello);
@@ -206,7 +206,7 @@
         DelegatedTask task = new DelegatedTask(null, null, null);
         protocol.delegatedTasks.add(task);
         assertSame(protocol.getTask(), task);
-        assertEquals(protocol.getTask(), null);
+        assertNull(protocol.getTask());
     }
 
     public void testGetRSAKeyLength() throws Exception {
@@ -214,7 +214,8 @@
         kpg.initialize(512);
         PublicKey key = kpg.genKeyPair().getPublic();
 
-        assertEquals(HandshakeProtocol.getRSAKeyLength(key), 512);
+        assertEquals(512, HandshakeProtocol.getRSAKeyLength(key));
+
     }
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java Mon May 21 13:31:19 2007
@@ -38,23 +38,23 @@
         KeyManagerImpl km = new KeyManagerImpl(ks, new char[0]);
         String[] keyType = {"RSA", "DSA"};
         String al = km.chooseClientAlias(keyType, null, new Socket());
-        assertEquals(al, null);
+        assertNull(al);
         
         al = km.chooseEngineClientAlias(keyType, null, new SSLEngineImpl(null));
-        assertEquals(al, null);
+        assertNull(al);
         
         al = km.chooseEngineServerAlias("RSA", null, new SSLEngineImpl(null));
-        assertEquals(al, null);
+        assertNull(al);
         
         al = km.chooseServerAlias("RSA", null, new Socket());
-        assertEquals(al, null);
+        assertNull(al);
         
-        assertEquals(km.getClientAliases("RSA", null), null);
+        assertNull(km.getClientAliases("RSA", null));
         
-        assertEquals(km.getServerAliases("RSA", null), null);
+        assertNull(km.getServerAliases("RSA", null));
         
-        assertEquals(km.getCertificateChain("alias"), null);
-        assertEquals(km.getPrivateKey("alias"), null);
+        assertNull(km.getCertificateChain("alias"));
+        assertNull(km.getPrivateKey("alias"));
     }
     
     public void testKeyManagerImpl2() throws Exception {
@@ -65,16 +65,16 @@
         KeyManagerImpl km = new KeyManagerImpl(ks, pwd);
         String[] keyType = { "RSA", "DSA" };
         String al = km.chooseClientAlias(keyType, null, new Socket());
-        assertEquals(al, "ssl_test_store");
+        assertEquals("ssl_test_store", al);
 
         al = km.chooseEngineClientAlias(keyType, null, new SSLEngineImpl(null));
-        assertEquals(al, "ssl_test_store");
+        assertEquals("ssl_test_store", al);
 
         al = km.chooseEngineServerAlias("RSA", null, new SSLEngineImpl(null));
-        assertEquals(al, "ssl_test_store");
+        assertEquals("ssl_test_store", al);
 
         al = km.chooseServerAlias("RSA", null, new Socket());
-        assertEquals(al, "ssl_test_store");
+        assertEquals("ssl_test_store", al);
 
         assertTrue(km.getCertificateChain("ssl_test_store") != null);
         assertTrue(km.getPrivateKey("ssl_test_store") != null);

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java Mon May 21 13:31:19 2007
@@ -531,9 +531,9 @@
             assertEquals("Unexpected status of operation:",
                     SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                     result.getHandshakeStatus());
-            assertTrue(
+            assertEquals(
                 "The length of the consumed data differs from expected",
-                0 == result.bytesConsumed());
+                0, result.bytesConsumed());
             assertTrue(
                 "The length of the produced data differs from expected",
                 result.bytesProduced() > 0);
@@ -625,12 +625,12 @@
             assertEquals("Unexpected status of operation:",
                     SSLEngineResult.HandshakeStatus.NEED_WRAP,
                     result.getHandshakeStatus());
-            assertTrue(
+            assertEquals(
                 "The length of the consumed data differs from expected",
-                0 == result.bytesConsumed());
-            assertTrue(
+                0, result.bytesConsumed());
+            assertEquals(
                 "The length of the produced data differs from expected",
-                0 == result.bytesProduced());
+                0, result.bytesProduced());
 
             if (doLog) {
                 System.out.println("\nServer wraps the fatal alert");
@@ -642,9 +642,9 @@
             assertEquals("Unexpected status of operation:",
                     SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                     result.getHandshakeStatus());
-            assertTrue(
+            assertEquals(
                 "The length of the consumed data differs from expected",
-                0 == result.bytesConsumed());
+                0, result.bytesConsumed());
             assertTrue(
                 "The length of the produced data differs from expected",
                 result.bytesProduced() > 0);
@@ -1066,9 +1066,9 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.Status.OK,
                 result.getStatus());
-        assertTrue(
+        assertEquals(
             "The length of the received data differs from expected",
-            "data to be sent".length() == result.bytesProduced());
+            "data to be sent".length(), result.bytesProduced());
 
         // take the data from the buffer
         byte[] resulting_data = new byte[result.bytesProduced()];
@@ -1096,9 +1096,9 @@
             assertEquals("Unexpected status of operation:",
                     SSLEngineResult.Status.OK,
                     result.getStatus());
-            assertTrue(
+            assertEquals(
                 "The length of the received data differs from expected",
-                i == result.bytesProduced());
+                i, result.bytesProduced());
             resulting_data = new byte[i];
             si.rewind();
             si.get(resulting_data);
@@ -1171,12 +1171,12 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NEED_UNWRAP,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the consumed data differs from expected",
-            0 == result.bytesConsumed());
-        assertTrue(
+            0, result.bytesConsumed());
+        assertEquals(
             "The length of the produced data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
 
         // prepare the buffer for reading
         buffer.flip();
@@ -1192,9 +1192,9 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the produced data differs from expected",
-            1 == result.bytesProduced());
+            1, result.bytesProduced());
 
         app_data_buffer.clear();
 
@@ -1211,9 +1211,9 @@
         assertTrue(
             "The length of the consumed data differs from expected",
             result.bytesConsumed() > 0);
-        assertTrue(
+        assertEquals(
             "The length of the received data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
 
         // prepare the buffer for writing
         app_data_buffer.clear();
@@ -1233,12 +1233,12 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NEED_WRAP,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the consumed data differs from expected",
-            0 == result.bytesConsumed());
-        assertTrue(
+            0, result.bytesConsumed());
+        assertEquals(
             "The length of the received data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
 
         // prepare the buffer for writing
         buffer.clear();
@@ -1253,9 +1253,9 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the consumed data differs from expected",
-            0 == result.bytesConsumed());
+            0, result.bytesConsumed());
         assertTrue(
             "The length of the produced data differs from expected",
             result.bytesProduced() > 0);
@@ -1271,12 +1271,12 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the consumed data differs from expected",
-            0 == result.bytesConsumed());
-        assertTrue(
+            0, result.bytesConsumed());
+        assertEquals(
             "The length of the produced data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
 
         // prepare the buffers for reading
         app_data_buffer.clear();
@@ -1295,9 +1295,9 @@
         assertTrue(
             "The length of the consumed data differs from expected",
             result.bytesConsumed() > 0);
-        assertTrue(
+        assertEquals(
             "The length of the produced data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
 
         if (doLog) {
             System.out.println("\nServer tries to read after closure");
@@ -1310,12 +1310,12 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the consumed data differs from expected",
-            0 == result.bytesConsumed());
-        assertTrue(
+            0, result.bytesConsumed());
+        assertEquals(
             "The length of the produced data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
 
         // it's needless, but should work:
         client.closeInbound();
@@ -1332,12 +1332,12 @@
         assertEquals("Unexpected status of operation:",
                 SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING,
                 result.getHandshakeStatus());
-        assertTrue(
+        assertEquals(
             "The length of the consumed data differs from expected",
-            0 == result.bytesConsumed());
-        assertTrue(
+            0, result.bytesConsumed());
+        assertEquals(
             "The length of the produced data differs from expected",
-            0 == result.bytesProduced());
+            0, result.bytesProduced());
     }
 
     private static void print(SSLEngineResult result) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java Mon May 21 13:31:19 2007
@@ -58,10 +58,10 @@
 
     public void testGetSessionCacheSize() {
         SSLSessionContextImpl context = new SSLSessionContextImpl();
-        assertEquals(context.getSessionCacheSize(), 0);
+        assertEquals(0, context.getSessionCacheSize());
 
         context.setSessionCacheSize(100);
-        assertEquals(context.getSessionCacheSize(), 100);
+        assertEquals(100, context.getSessionCacheSize());
         
         try {
             context.setSessionCacheSize(-1);
@@ -72,10 +72,10 @@
 
     public void testGetSessionTimeout() {
         SSLSessionContextImpl context = new SSLSessionContextImpl();
-        assertEquals(context.getSessionTimeout(), 0);
+        assertEquals(0, context.getSessionTimeout());
 
         context.setSessionTimeout(1000);
-        assertEquals(context.getSessionTimeout(), 1000);
+        assertEquals(1000, context.getSessionTimeout());
         
         try {
             context.setSessionTimeout(-1);

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java Mon May 21 13:31:19 2007
@@ -41,20 +41,20 @@
         session = new SSLSessionImpl(CipherSuite.TLS_RSA_WITH_NULL_MD5,
                 new SecureRandom());
         session.protocol = ProtocolVersion.TLSv1;
-        assertEquals("Incorrect protocol", session.getProtocol(), "TLSv1");
+        assertEquals("Incorrect protocol", "TLSv1", session.getProtocol());
         assertEquals("Incorrect cipher suite", session.getCipherSuite(),
                 CipherSuite.TLS_RSA_WITH_NULL_MD5.getName());
-        assertEquals("Incorrect id", session.getId().length, 32);
+        assertEquals("Incorrect id", 32, session.getId().length);
         assertTrue("Incorrect isValid", session.isValid());
         assertTrue("Incorrect isServer", session.isServer);
         long time = session.getCreationTime();
         assertTrue("Incorrect CreationTime", time <= System.currentTimeMillis());
         assertEquals("Incorrect LastAccessedTime", time, session.getLastAccessedTime());
-        assertEquals("Incorrect LocalCertificates", session.getLocalCertificates(), null);
-        assertEquals("Incorrect LocalPrincipal", session.getLocalPrincipal(), null);
-        assertEquals(session.getPeerHost(), null);
-        assertEquals(session.getPeerPort(), -1);
-        assertEquals(session.getSessionContext(), null);
+        assertNull("Incorrect LocalCertificates", session.getLocalCertificates());
+        assertNull("Incorrect LocalPrincipal", session.getLocalPrincipal());
+        assertNull(session.getPeerHost());
+        assertEquals(-1, session.getPeerPort());
+        assertNull(session.getSessionContext());
         
         try {
             session.getPeerCertificateChain();
@@ -96,22 +96,22 @@
     public void testSetPeer() {
         SSLSessionImpl session = new SSLSessionImpl(null);
         session.setPeer("someHost", 8080);
-        assertEquals(session.getPeerHost(), "someHost");
-        assertEquals(session.getPeerPort(), 8080);
+        assertEquals("someHost", session.getPeerHost());
+        assertEquals(8080, session.getPeerPort());
     }
 
 
     public void testGetValue() {
         SSLSessionImpl session = new SSLSessionImpl(null);
         
-        assertEquals(session.getValueNames().length, 0);
+        assertEquals(0, session.getValueNames().length);
         
         try {
             session.getValue(null);
             fail("No expected IllegalArgumentException");
         } catch (IllegalArgumentException e) {            
         }
-        assertEquals(session.getValue("abc"), null);
+        assertNull(session.getValue("abc"));
         
         try {
             session.removeValue(null);
@@ -135,10 +135,10 @@
         Object o = new Object();
         session.putValue("abc", o);
         assertSame(session.getValue("abc"), o);
-        assertEquals(session.getValueNames()[0], "abc");
+        assertEquals("abc", session.getValueNames()[0]);
         
         session.removeValue("abc");
-        assertEquals(session.getValue("abc"), null);    
+        assertNull(session.getValue("abc"));    
     }
     
     public void testClone() {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java Mon May 21 13:31:19 2007
@@ -316,22 +316,22 @@
                         assertTrue("Read message does not equal to expected",
                                 Arrays.equals(client_message.getBytes(), buff));
                         os.write(-1);
-                        assertTrue("Read data differs from expected",
-                                is.read() == 255);
+                        assertEquals("Read data differs from expected",
+                                255, is.read());
                         if (doLog) {
                             System.out.println("Server is closed: "
                                     +s.isClosed());
                         }
-                        assertTrue("Returned value should be -1",
+                        assertEquals("Returned value should be -1",
                         // initiate an exchange of closure alerts
-                                is.read() == -1);
+                                -1, is.read());
                         if (doLog) {
                             System.out.println("Server is closed: "
                                     +s.isClosed());
                         }
-                        assertTrue("Returned value should be -1",
+                        assertEquals("Returned value should be -1",
                         // initiate an exchange of closure alerts
-                                is.read() == -1);
+                                -1, is.read());
                     } catch (Throwable e) {
                         synchronized (throwed) {
                             if (doLog) {
@@ -388,8 +388,8 @@
                         // send the response
                         buff = (" "+client_message+" ").getBytes();
                         os.write(buff, 1, buff.length-2);
-                        assertTrue("Read data differs from expected",
-                                is.read() == 255);
+                        assertEquals("Read data differs from expected",
+                                255, is.read());
                         os.write(-1);
                         if (doLog) {
                             System.out.println("Client is closed: "

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java Mon May 21 13:31:19 2007
@@ -210,22 +210,22 @@
                         assertTrue("Read message does not equal to expected",
                                 Arrays.equals(client_message.getBytes(), buff));
                         os.write(-1);
-                        assertTrue("Read data differs from expected",
-                                is.read() == 255);
+                        assertEquals("Read data differs from expected",
+                                255, is.read());
                         if (doLog) {
                             System.out.println("Server is closed: "
                                     +s.isClosed());
                         }
-                        assertTrue("Returned value should be -1",
+                        assertEquals("Returned value should be -1",
                         // initiate an exchange of closure alerts
-                                is.read() == -1);
+                                -1, is.read());
                         if (doLog) {
                             System.out.println("Server is closed: "
                                     +s.isClosed());
                         }
-                        assertTrue("Returned value should be -1",
+                        assertEquals("Returned value should be -1",
                         // initiate an exchange of closure alerts
-                                is.read() == -1);
+                                -1, is.read());
                     } catch (Throwable e) {
                         synchronized (throwed) {
                             if (doLog) {
@@ -282,8 +282,8 @@
                         // send the response
                         buff = (" "+client_message+" ").getBytes();
                         os.write(buff, 1, buff.length-2);
-                        assertTrue("Read data differs from expected",
-                                is.read() == 255);
+                        assertEquals("Read data differs from expected",
+                                255, is.read());
                         os.write(-1);
                         if (doLog) {
                             System.out.println("\n======== Closing ========");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java Mon May 21 13:31:19 2007
@@ -783,17 +783,12 @@
             }
 
             server.close(); // makes error during the handshake
-            try {
-                thread.join();
-                if ((session[0] == null) ||
-                        (!session[0].getCipherSuite()
-                         .endsWith("_NULL_WITH_NULL_NULL"))) {
-                    fail("Returned session is null "
-                            + "or not TLS_NULL_WITH_NULL_NULL");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                fail("Unexpected exception: "+e.getMessage());
+            thread.join();
+            if ((session[0] == null) ||
+                (!session[0].getCipherSuite()
+                 .endsWith("_NULL_WITH_NULL_NULL"))) {
+                fail("Returned session is null "
+                     + "or not TLS_NULL_WITH_NULL_NULL");
             }
         } finally {
             if (server != null) {
@@ -886,14 +881,9 @@
             }
 
             server.close(); // makes error during the handshake
-            try {
-                thread.join();
-                if (exception[0] == null) {
-                    fail("Expected IOException was not thrown");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                fail("Unexpected exception: "+e.getMessage());
+            thread.join();
+            if (exception[0] == null) {
+                fail("Expected IOException was not thrown");
             }
         } finally {
             if (server != null) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java Mon May 21 13:31:19 2007
@@ -35,11 +35,11 @@
         byte[] data = {1, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0, 0, 0, 0, 0, 5};
         ByteArrayInputStream bis = new ByteArrayInputStream(data);
         SSLStreamedInput sslsi = new SSLStreamedInput(bis);
-        assertTrue(sslsi.available() == bis.available());
-        assertTrue(sslsi.read() == 1);
-        assertTrue(sslsi.readUint32() == 1);
+        assertEquals(bis.available(), sslsi.available());
+        assertEquals(1, sslsi.read());
+        assertEquals(1, sslsi.readUint32());
         sslsi.skip(3);
-        assertTrue(sslsi.readUint64() == 5);
+        assertEquals(5, sslsi.readUint64());
         try {
             sslsi.read();
             fail("Expected EndOfSourceException was not thrown");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java Mon May 21 13:31:19 2007
@@ -75,7 +75,7 @@
         ks.load(null, null);
 
         TrustManagerImpl tm = new TrustManagerImpl(ks);
-        assertEquals(tm.getAcceptedIssuers().length, 0);
+        assertEquals(0, tm.getAcceptedIssuers().length);
         checkTrustManager(tm);
     }
 
@@ -83,7 +83,7 @@
         KeyStore ks = JSSETestData.getKeyStore();
 
         TrustManagerImpl tm = new TrustManagerImpl(ks);
-        assertEquals(tm.getAcceptedIssuers().length, 1);
+        assertEquals(1, tm.getAcceptedIssuers().length);
         checkTrustManager(tm);
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java?view=diff&rev=540266&r1=540265&r2=540266
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java Mon May 21 13:31:19 2007
@@ -84,7 +84,7 @@
         kmf.engineInit(ks, null);
 
         KeyManager[] kma = kmf.engineGetKeyManagers();
-        assertTrue("Incorrect array length", kma.length == 1);
+        assertEquals("Incorrect array length", 1, kma.length);
         assertTrue("Incorrect KeyManager type",
                 kma[0] instanceof KeyManagerImpl);
     }



Mime
View raw message