Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 62484 invoked from network); 24 Jan 2007 10:40:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jan 2007 10:40:14 -0000 Received: (qmail 43837 invoked by uid 500); 24 Jan 2007 10:40:19 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 43822 invoked by uid 500); 24 Jan 2007 10:40:19 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 43812 invoked by uid 99); 24 Jan 2007 10:40:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jan 2007 02:40:19 -0800 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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jan 2007 02:40:13 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 652601A981A; Wed, 24 Jan 2007 02:39:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r499345 - in /harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security: DigestOutputStream2Test.java DigestOutputStreamTest.java Date: Wed, 24 Jan 2007 10:39:02 -0000 To: commits@harmony.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070124103903.652601A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smishura Date: Wed Jan 24 02:38:58 2007 New Revision: 499345 URL: http://svn.apache.org/viewvc?view=rev&rev=499345 Log: Merge tests for getMessageDigest() and setMessageDigest() Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStream2Test.java harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStream2Test.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStream2Test.java?view=diff&rev=499345&r1=499344&r2=499345 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStream2Test.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStream2Test.java Wed Jan 24 02:38:58 2007 @@ -29,20 +29,6 @@ MessageDigest digest; /** - * @tests java.security.DigestOutputStream#getMessageDigest() - */ - public void test_getMessageDigest() { - // Test for method java.security.MessageDigest - // java.security.DigestOutputStream.getMessageDigest() - DigestOutputStream dos = new DigestOutputStream(output1, digest); - assertEquals("getMessageDigest did not return expected result", - digest, dos.getMessageDigest()); - dos = new DigestOutputStream(output1, null); - assertNull("getMessageDigest should have returned null", dos - .getMessageDigest()); - } - - /** * @tests java.security.DigestOutputStream#on(boolean) */ public void test_onZ() { @@ -69,21 +55,6 @@ } catch (Exception e) { fail("Caught exception : " + e); } - } - - /** - * @tests java.security.DigestOutputStream#setMessageDigest(java.security.MessageDigest) - */ - public void test_setMessageDigestLjava_security_MessageDigest() { - // Test for method void - // java.security.DigestOutputStream.setMessageDigest(java.security.MessageDigest) - DigestOutputStream dos = new DigestOutputStream(output1, null); - dos.setMessageDigest(digest); - assertEquals("getMessageDigest did not return expected result", digest, - dos.getMessageDigest()); - dos.setMessageDigest(null); - assertNull("getMessageDigest should have returned null", dos - .getMessageDigest()); } /** Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java?view=diff&rev=499345&r1=499344&r2=499345 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java Wed Jan 24 02:38:58 2007 @@ -97,6 +97,45 @@ } /** + * @tests java.security.DigestOutputStream#getMessageDigest() + */ + public void test_getMessageDigest() { + + MessageDigest digest = new MyMessageDigest1(); + OutputStream out = new MyOutputStream(); + + // non-null parameter + DigestOutputStream dos = new DigestOutputStream(out, digest); + assertSame(digest, dos.getMessageDigest()); + + // null parameter + dos = new DigestOutputStream(out, null); + assertNull("getMessageDigest should have returned null", dos + .getMessageDigest()); + } + + /** + * @tests java.security.DigestOutputStream#setMessageDigest(MessageDigest) + */ + public void test_setMessageDigestLjava_security_MessageDigest() { + + MessageDigest digest = new MyMessageDigest1(); + OutputStream out = new MyOutputStream(); + + DigestOutputStream dos = new DigestOutputStream(out, null); + + // non-null parameter + dos.setMessageDigest(digest); + assertSame(digest, dos.getMessageDigest()); + + // null parameter + dos.setMessageDigest(null); + assertNull("getMessageDigest should have returned null", dos + .getMessageDigest()); + } + + + /** * Test #1 for write(int) method
* * Assertion: writes the byte to the output stream
@@ -378,48 +417,6 @@ // check that associated digest has not been updated assertTrue("update", Arrays.equals(dos.getMessageDigest().digest(), MDGoldenData.getDigest(algorithmName[k]+"_NU"))); - return; - } catch (NoSuchAlgorithmException e) { - // allowed failure - } - } - fail(getName() + ": no MessageDigest algorithms available - test not performed"); - } - - /** - * Test for getMessageDigest() method
- * - * Assertion: returns associated message digest
- */ - public final void testGetMessageDigest() { - for (int k=0; ksetMessageDigest() method
- * - * Assertion: set associated message digest
- */ - public final void testSetMessageDigest() { - for (int k=0; k