Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 74899 invoked from network); 7 Apr 2006 06:56:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Apr 2006 06:56:37 -0000 Received: (qmail 72388 invoked by uid 500); 7 Apr 2006 06:56:37 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 72306 invoked by uid 500); 7 Apr 2006 06:56:36 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 72295 invoked by uid 99); 7 Apr 2006 06:56:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Apr 2006 23:56:36 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 06 Apr 2006 23:56:34 -0700 Received: (qmail 74732 invoked by uid 65534); 7 Apr 2006 06:56:14 -0000 Message-ID: <20060407065614.74731.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r392202 [5/5] - in /incubator/harmony/enhanced/classlib/trunk/modules: crypto/src/main/java/javax/crypto/spec/ security/src/main/java/common/java/security/ security/src/main/java/common/java/security/cert/ security/src/main/java/common/java... Date: Fri, 07 Apr 2006 06:53:12 -0000 To: harmony-commits@incubator.apache.org From: mloenko@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java Thu Apr 6 23:52:51 2006 @@ -219,7 +219,6 @@ } } } -*/ private boolean findEl(Object[] arr, Object el) { boolean ok = false; @@ -231,4 +230,5 @@ } return ok; } +*/ } Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java Thu Apr 6 23:52:51 2006 @@ -43,7 +43,6 @@ */ public void test01() { SSLEngine e = new mySSLEngine(); - assertTrue(e instanceof SSLEngine); assertNull(e.getPeerHost()); assertEquals(e.getPeerPort(), -1); String[] suites = { "a", "b", "c" }; @@ -57,7 +56,6 @@ public void test02() throws SSLException { int port = 1010; SSLEngine e = new mySSLEngine(null, port); - assertTrue(e instanceof SSLEngine); assertNull(e.getPeerHost()); assertEquals(e.getPeerPort(), port); try { @@ -73,7 +71,6 @@ String host = "new host"; int port = 8080; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); assertEquals(e.getPeerHost(), host); assertEquals(e.getPeerPort(), port); String[] suites = { "a", "b", "c" }; @@ -99,7 +96,6 @@ ByteBuffer bbN = null; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.wrap(bbN, bb); fail("IllegalArgumentException must be thrown for null src byte buffer"); @@ -141,7 +137,6 @@ ByteBuffer bb = ByteBuffer.allocate(10); ByteBuffer bbN = null; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.wrap(bbNA, bb); fail("IllegalArgumentException must be thrown for null srcs byte buffer array"); @@ -182,14 +177,12 @@ ByteBuffer bbs = ByteBuffer.allocate(100); ByteBuffer bbd = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine1(host, port); - assertTrue(e instanceof SSLEngine); try { e.wrap(bbs, bbd); fail("SSLException must be thrown"); } catch (SSLException ex) { } SSLEngineResult res = e.wrap(bbd, bbs); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); @@ -199,7 +192,6 @@ } catch (SSLException ex) { } res = e.wrap(new ByteBuffer[] { bbd }, bbs); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); } @@ -215,10 +207,8 @@ int port = 8080; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.wrap(bb, ByteBuffer.allocate(10)); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); } @@ -236,10 +226,8 @@ ByteBuffer[] bbA = { ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5) }; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.wrap(bbA, bb); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 10); assertEquals(res.bytesProduced(), 20); } @@ -261,7 +249,6 @@ ByteBuffer bbN = null; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.unwrap(bbN, bb); fail("IllegalArgumentException must be thrown for null src byte buffer"); @@ -303,7 +290,6 @@ ByteBuffer bb = ByteBuffer.allocate(10); ByteBuffer bbN = null; SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); try { e.unwrap(bb, bbNA); fail("IllegalArgumentException must be thrown for null dsts byte buffer array"); @@ -344,14 +330,12 @@ ByteBuffer bbs = ByteBuffer.allocate(100); ByteBuffer bbd = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine1(); - assertTrue(e instanceof SSLEngine); try { e.unwrap(bbs, bbd); fail("SSLException must be thrown"); } catch (SSLException ex) { } SSLEngineResult res = e.unwrap(bbd, bbs); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); @@ -361,7 +345,6 @@ } catch (SSLException ex) { } res = e.unwrap(bbd, new ByteBuffer[] { bbs }); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); } @@ -376,10 +359,8 @@ int port = 8080; ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.unwrap(bb, ByteBuffer.allocate(10)); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); } @@ -397,10 +378,8 @@ ByteBuffer bb = ByteBuffer.allocate(10); SSLEngine e = new mySSLEngine(host, port); - assertTrue(e instanceof SSLEngine); SSLEngineResult res = e.unwrap(bb, bbA); - assertTrue(res instanceof SSLEngineResult); assertEquals(res.bytesConsumed(), 1); assertEquals(res.bytesProduced(), 2); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java Thu Apr 6 23:52:51 2006 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLException"; - static String createErr(Exception tE, Exception eE) { return "SSLException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java Thu Apr 6 23:52:51 2006 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLHandshakeException"; - static String createErr(Exception tE, Exception eE) { return "SSLHandshakeException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java Thu Apr 6 23:52:51 2006 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLKeyException"; - static String createErr(Exception tE, Exception eE) { return "SSLKeyException ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java Thu Apr 6 23:52:51 2006 @@ -66,8 +66,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLPeerUnverifiedException"; - static String createErr(Exception tE, Exception eE) { return "SSLPeerUnverifiedException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java Thu Apr 6 23:52:51 2006 @@ -65,8 +65,6 @@ static Throwable tCause = new Throwable("Throwable for exception"); - private static String errNotExc = "Exception is not SSLProtocolException"; - static String createErr(Exception tE, Exception eE) { return "SSLProtocolException: ".concat(tE.toString()).concat( " is not equal to caught exception: ").concat(eE.toString()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java Thu Apr 6 23:52:51 2006 @@ -37,7 +37,7 @@ */ public void testSSLServerSocket() { try { - SSLServerSocket soc = new MySSLServerSocket(); + new MySSLServerSocket(); } catch (IOException e) { fail(e.toString()); } @@ -48,7 +48,7 @@ */ public void testSSLServerSocketint() { try { - SSLServerSocket soc = new MySSLServerSocket(0); + new MySSLServerSocket(0); } catch (IOException e) { fail(e.toString()); } @@ -59,7 +59,7 @@ */ public void testSSLServerSocketintint() { try { - SSLServerSocket soc = new MySSLServerSocket(0, 10); + new MySSLServerSocket(0, 10); } catch (IOException e) { fail(e.toString()); } @@ -70,8 +70,7 @@ */ public void testSSLServerSocketintintInetAddress() { try { - SSLServerSocket soc = new MySSLServerSocket(0, 10, InetAddress - .getLocalHost()); + new MySSLServerSocket(0, 10, InetAddress.getLocalHost()); } catch (IOException e) { fail(e.toString()); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java?rev=392202&r1=392201&r2=392202&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java Thu Apr 6 23:52:51 2006 @@ -50,9 +50,7 @@ * Assertion: constructs TrustManagerFactorySpi */ public void testTrustManagerFactorySpi01() throws InvalidAlgorithmParameterException { - TrustManagerFactorySpi kmfSpi = (TrustManagerFactorySpi) new MyTrustManagerFactorySpi(); - assertTrue("Not TrustManagerFactorySpi", - kmfSpi instanceof TrustManagerFactorySpi); + TrustManagerFactorySpi kmfSpi = new MyTrustManagerFactorySpi(); assertNull("Not null results", kmfSpi.engineGetTrustManagers()); KeyStore kStore = null; ManagerFactoryParameters mfp = null; @@ -85,7 +83,7 @@ } catch (KeyStoreException e) { fail("Unexpected KeyStoreException was thrown"); } - mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(null); + mfp = new MyTrustManagerFactorySpi.Parameters(null); try { kmfSpi.engineInit(mfp); fail("RuntimeException must be thrown"); @@ -94,7 +92,7 @@ } catch (InvalidAlgorithmParameterException e) { fail("Unexpected: ".concat(e.toString())); } - mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(kStore); + mfp = new MyTrustManagerFactorySpi.Parameters(kStore); kmfSpi.engineInit(mfp); } }