Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 77391 invoked from network); 21 Apr 2006 13:05:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Apr 2006 13:05:00 -0000 Received: (qmail 28807 invoked by uid 500); 21 Apr 2006 13:04:47 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 28729 invoked by uid 500); 21 Apr 2006 13:04:47 -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 28718 invoked by uid 99); 21 Apr 2006 13:04:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Apr 2006 06:04:47 -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; Fri, 21 Apr 2006 06:04:46 -0700 Received: (qmail 77123 invoked by uid 65534); 21 Apr 2006 13:04:25 -0000 Message-ID: <20060421130425.77105.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r395873 - in /incubator/harmony/enhanced/classlib/trunk/modules: archive/make/common/ archive/src/test/java/tests/api/java/util/jar/ nio_char/make/common/ nio_char/src/test/java/tests/api/java/nio/charset/ sql/make/common/ text/make/common/ Date: Fri, 21 Apr 2006 13:03:43 -0000 To: harmony-commits@incubator.apache.org From: tellison@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: tellison Date: Fri Apr 21 06:03:40 2006 New Revision: 395873 URL: http://svn.apache.org/viewcvs?rev=395873&view=rev Log: Apply patch HARMONY-357 (Enabling a few more tests) Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Fri Apr 21 06:03:40 2006 @@ -96,7 +96,6 @@ - Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java Fri Apr 21 06:03:40 2006 @@ -112,9 +112,6 @@ fail("Exception during test: " + e.toString()); } - System.out.println("start"); - System.out.flush(); - try { Support_Resources.copyFile(resources, null, jarName); JarFile jarFile = new JarFile(new File(resources, jarName)); @@ -141,9 +138,6 @@ } catch (Exception e) { fail("Exception during entries test: " + e.toString()); } - System.out.println("finish"); - System.out.flush(); - } /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Fri Apr 21 06:03:40 2006 @@ -88,6 +88,7 @@ + @@ -95,30 +96,20 @@ - - - - + - - - - - - - Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java Fri Apr 21 06:03:40 2006 @@ -66,8 +66,8 @@ } public void testSpecificDefaultValue() { - assertTrue(encoder.averageBytesPerChar() == 1); - assertTrue(encoder.maxBytesPerChar() == 1); + assertEquals(1.0, encoder.averageBytesPerChar(), 0.0); + assertEquals(1.0, encoder.maxBytesPerChar(), 0.0); } CharBuffer getMalformedCharBuffer() { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java Fri Apr 21 06:03:40 2006 @@ -98,7 +98,7 @@ // normal case CharsetDecoder ec = new MockCharsetDecoder(cs, 1, MAX_BYTES); assertSame(ec.charset(), cs); - assertTrue(ec.averageCharsPerByte() == 1); + assertEquals(1.0, ec.averageCharsPerByte(), 0.0); assertTrue(ec.maxCharsPerByte() == MAX_BYTES); /* @@ -107,16 +107,17 @@ // Normal case: null charset ec = new MockCharsetDecoder(null, 1, MAX_BYTES); assertNull(ec.charset()); - assertTrue(ec.averageCharsPerByte() == 1); + assertEquals(1.0, ec.averageCharsPerByte(), 0.0); assertTrue(ec.maxCharsPerByte() == MAX_BYTES); ec = new MockCharsetDecoder(new CharsetEncoderTest.MockCharset("mock", new String[0]), 1, MAX_BYTES); - // OK: average length less than max length - ec = new MockCharsetDecoder(cs, MAX_BYTES, 1); - assertTrue(ec.averageCharsPerByte() == MAX_BYTES); - assertTrue(ec.maxCharsPerByte() == 1); + // Commented out since the comment is wrong since MAX_BYTES > 1 + // // OK: average length less than max length + // ec = new MockCharsetDecoder(cs, MAX_BYTES, 1); + // assertTrue(ec.averageCharsPerByte() == MAX_BYTES); + // assertTrue(ec.maxCharsPerByte() == 1); // Illegal Argument: zero length try { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java Fri Apr 21 06:03:40 2006 @@ -122,7 +122,7 @@ // normal case CharsetEncoder ec = new MockCharsetEncoder(cs, 1, MAX_BYTES); assertSame(ec.charset(), cs); - assertTrue(ec.averageBytesPerChar() == 1); + assertEquals(1.0, ec.averageBytesPerChar(), 0); assertTrue(ec.maxBytesPerChar() == MAX_BYTES); /* @@ -138,10 +138,11 @@ ec = new MockCharsetEncoder(new MockCharset("mock", new String[0]), 1, MAX_BYTES); - // OK: average length less than max length - ec = new MockCharsetEncoder(cs, MAX_BYTES, 1); - assertTrue(ec.averageBytesPerChar() == MAX_BYTES); - assertTrue(ec.maxBytesPerChar() == 1); + // Commented out since the comment is wrong since MAX_BYTES > 1 + // // OK: average length less than max length + // ec = new MockCharsetEncoder(cs, MAX_BYTES, 1); + // assertTrue(ec.averageBytesPerChar() == MAX_BYTES); + // assertTrue(ec.maxBytesPerChar() == 1); // Illegal Argument: zero length try { @@ -177,7 +178,7 @@ // normal case CharsetEncoder ec = new MockCharsetEncoder(cs, 1, MAX_BYTES, ba); assertSame(ec.charset(), cs); - assertTrue(ec.averageBytesPerChar() == 1); + assertEquals(1.0, ec.averageBytesPerChar(), 0.0); assertTrue(ec.maxBytesPerChar() == MAX_BYTES); assertSame(ba, ec.replacement()); @@ -211,10 +212,12 @@ } catch (IllegalArgumentException e) { } - // OK: average length less than max length - ec = new MockCharsetEncoder(cs, MAX_BYTES, ba.length, ba); - assertTrue(ec.averageBytesPerChar() == MAX_BYTES); - assertTrue(ec.maxBytesPerChar() == ba.length); + // Commented out since the comment is wrong since MAX_BYTES > 1 + // This test throws IllegalArgumentException on Harmony and RI + // // OK: average length less than max length + // ec = new MockCharsetEncoder(cs, MAX_BYTES, ba.length, ba); + // assertTrue(ec.averageBytesPerChar() == MAX_BYTES); + // assertTrue(ec.maxBytesPerChar() == ba.length); // Illegal Argument: zero length try { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java Fri Apr 21 06:03:40 2006 @@ -113,7 +113,8 @@ try { Charset.isSupported(""); } catch (IllegalArgumentException e) { - fail("Should not throw IllegalArgumentException!"); + // FIXME: Commented out since RI does throw IAE + // fail("Should not throw IllegalArgumentException!"); } } @@ -229,7 +230,8 @@ try { new MockCharset("", new String[0]); } catch (IllegalCharsetNameException e) { - fail("Should not throw IllegalArgumentException!"); + // FIXME: Commented out since RI does throw IAE + // fail("Should not throw IllegalArgumentException!"); } } @@ -319,7 +321,8 @@ try { new MockCharset("mockChar", new String[] { "" }); } catch (IllegalCharsetNameException e) { - fail("Should not throw IllegalArgumentException!"); + // FIXME: Commented out since RI does throw IAE + // fail("Should not throw IllegalArgumentException!"); } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java Fri Apr 21 06:03:40 2006 @@ -67,8 +67,8 @@ public void testSpecificDefaultValue() { // FIXME: different here! - assertTrue(encoder.maxBytesPerChar() == 4); - assertTrue(encoder.averageBytesPerChar() == 2.5); + assertEquals(4.0, encoder.maxBytesPerChar(), 0.0); + assertEquals(2.5, encoder.averageBytesPerChar(), 0.0); // assertTrue(encoder.averageBytesPerChar() == 3); // assertTrue(encoder.maxBytesPerChar() == 2); Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Fri Apr 21 06:03:40 2006 @@ -96,8 +96,9 @@ + + - Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=395873&r1=395872&r2=395873&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Fri Apr 21 06:03:40 2006 @@ -103,7 +103,6 @@ -