Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 50082 invoked from network); 25 Apr 2006 12:34:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Apr 2006 12:34:52 -0000 Received: (qmail 35699 invoked by uid 500); 25 Apr 2006 12:34:35 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 35664 invoked by uid 500); 25 Apr 2006 12:34:34 -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 35653 invoked by uid 99); 25 Apr 2006 12:34:34 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 05:34:34 -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; Tue, 25 Apr 2006 05:34:33 -0700 Received: (qmail 48713 invoked by uid 65534); 25 Apr 2006 12:32:01 -0000 Message-ID: <20060425123200.48482.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r396862 - in /incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java: javax/crypto/spec/ tests/api/javax/crypto/ Date: Tue, 25 Apr 2006 12:31:31 -0000 To: harmony-commits@incubator.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smishura Date: Tue Apr 25 05:31:26 2006 New Revision: 396862 URL: http://svn.apache.org/viewcvs?rev=396862&view=rev Log: Apply patch for HARMONY-353 (improvements to junit test method usage) for crypto module. All crypto tests passed on Windows. Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java (contents, props changed) incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PSourceTest.java (contents, props changed) incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java (contents, props changed) incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java (contents, props changed) incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java?rev=396862&r1=396861&r2=396862&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java Tue Apr 25 05:31:26 2006 @@ -253,8 +253,8 @@ + "should not cause the change of internal array.", result[0] == pbeks.getSalt()[0]); pbeks = new PBEKeySpec(password); - assertTrue("The getSalt() method should return null if the salt " - + "is not specified.", pbeks.getSalt() == null); + assertNull("The getSalt() method should return null if the salt " + + "is not specified.", pbeks.getSalt()); } /** Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PBEKeySpecTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PSourceTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PSourceTest.java?rev=396862&r1=396861&r2=396862&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PSourceTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PSourceTest.java Tue Apr 25 05:31:26 2006 @@ -47,8 +47,8 @@ } catch (NullPointerException e) { } - assertTrue("The PSource.PSpecified DEFAULT value should be byte[0]", - PSource.PSpecified.DEFAULT.getValue().length == 0); + assertEquals("The PSource.PSpecified DEFAULT value should be byte[0]", + 0, PSource.PSpecified.DEFAULT.getValue().length); byte[] p = new byte[] {1, 2, 3, 4, 5}; PSource.PSpecified ps = new PSource.PSpecified(p); Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/PSourceTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java?rev=396862&r1=396861&r2=396862&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java Tue Apr 25 05:31:26 2006 @@ -131,8 +131,8 @@ + "should not cause the change of internal array.", result[0] == ps.getIV()[0]); ps = new RC2ParameterSpec(effectiveKeyBits); - assertTrue("The getIV() method should return null if the parameter " - + "set does not contain iv.", ps.getIV() == null); + assertNull("The getIV() method should return null if the parameter " + + "set does not contain iv.", ps.getIV()); } /** Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC2ParameterSpecTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java?rev=396862&r1=396861&r2=396862&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java Tue Apr 25 05:31:26 2006 @@ -192,8 +192,8 @@ + "should not cause the change of internal array.", result[0] == ps.getIV()[0]); ps = new RC5ParameterSpec(version, rounds, wordSize); - assertTrue("The getIV() method should return null if the parameter " - + "set does not contain IV.", ps.getIV() == null); + assertNull("The getIV() method should return null if the parameter " + + "set does not contain IV.", ps.getIV()); } /** Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/spec/RC5ParameterSpecTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java?rev=396862&r1=396861&r2=396862&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/tests/api/javax/crypto/CipherTest.java Tue Apr 25 05:31:26 2006 @@ -157,7 +157,7 @@ final String algorithm = "DESede/CBC/PKCS5Padding"; try { Cipher cipher = Cipher.getInstance(algorithm); - assertTrue("Block size does not match", cipher.getBlockSize() == 8); + assertEquals("Block size does not match", 8, cipher.getBlockSize()); } catch (Exception e) { fail("Unexpected Exception"); }