Index: modules/archive/make/common/build.xml =================================================================== --- modules/archive/make/common/build.xml.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/archive/make/common/build.xml 2006-04-16 20:35:51.000000000 +0100 @@ -94,7 +94,6 @@ - Index: modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java =================================================================== --- modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/archive/src/test/java/tests/api/java/util/jar/JarFileTest.java 2006-04-16 20:35:51.000000000 +0100 @@ -112,8 +112,8 @@ fail("Exception during test: " + e.toString()); } - System.out.println("start"); - System.out.flush(); + //System.out.println("start"); + //System.out.flush(); try { Support_Resources.copyFile(resources, null, jarName); @@ -141,8 +141,8 @@ } catch (Exception e) { fail("Exception during entries test: " + e.toString()); } - System.out.println("finish"); - System.out.flush(); + //System.out.println("finish"); + //System.out.flush(); } Index: modules/nio_char/make/common/build.xml =================================================================== --- modules/nio_char/make/common/build.xml.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/nio_char/make/common/build.xml 2006-04-16 20:51:42.000000000 +0100 @@ -86,6 +86,7 @@ + @@ -93,30 +94,20 @@ - - - - + - - - - - - - Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetEncoderTest.java 2006-04-16 20:35:51.000000000 +0100 @@ -66,8 +66,8 @@ } public void testSpecificDefaultValue() { - assertEquals(1, encoder.averageBytesPerChar()); - assertEquals(1, encoder.maxBytesPerChar()); + assertEquals(encoder.averageBytesPerChar(), 1.0, 0); + assertEquals(encoder.maxBytesPerChar(), 1.0, 0); } CharBuffer getMalformedCharBuffer() { Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java 2006-04-16 20:35:51.000000000 +0100 @@ -98,7 +98,7 @@ // normal case CharsetDecoder ec = new MockCharsetDecoder(cs, 1, MAX_BYTES); assertSame(ec.charset(), cs); - assertEquals(1, ec.averageCharsPerByte()); + assertEquals(1.0, ec.averageCharsPerByte(), 0.0); assertTrue(ec.maxCharsPerByte() == MAX_BYTES); /* @@ -107,16 +107,18 @@ // Normal case: null charset ec = new MockCharsetDecoder(null, 1, MAX_BYTES); assertNull(ec.charset()); - assertEquals(1, ec.averageCharsPerByte()); + 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); - assertEquals(1, ec.maxCharsPerByte()); + // 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 MockCharsetDecoder(cs, MAX_BYTES, 1); + // assertTrue(ec.averageCharsPerByte() == MAX_BYTES); + // assertEquals(1, ec.maxCharsPerByte()); // Illegal Argument: zero length try { Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java 2006-04-16 20:53:34.000000000 +0100 @@ -122,7 +122,7 @@ // normal case CharsetEncoder ec = new MockCharsetEncoder(cs, 1, MAX_BYTES); assertSame(ec.charset(), cs); - assertEquals(1, ec.averageBytesPerChar()); + assertEquals(1.0, ec.averageBytesPerChar(), 0.0); assertTrue(ec.maxBytesPerChar() == MAX_BYTES); /* @@ -138,10 +138,12 @@ 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); - assertEquals(1, ec.maxBytesPerChar()); + // 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, 1); + // assertTrue(ec.averageBytesPerChar() == MAX_BYTES); + // assertEquals(ec.maxBytesPerChar(), 1.0, 0); // Illegal Argument: zero length try { @@ -177,7 +179,7 @@ // normal case CharsetEncoder ec = new MockCharsetEncoder(cs, 1, MAX_BYTES, ba); assertSame(ec.charset(), cs); - assertEquals(1, ec.averageBytesPerChar()); + assertEquals(1.0, ec.averageBytesPerChar(), 0.0); assertTrue(ec.maxBytesPerChar() == MAX_BYTES); assertSame(ba, ec.replacement()); @@ -211,10 +213,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 { Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java 2006-04-16 20:35:51.000000000 +0100 @@ -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!"); } } Index: modules/sql/make/common/build.xml =================================================================== --- modules/sql/make/common/build.xml.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/sql/make/common/build.xml 2006-04-16 20:35:51.000000000 +0100 @@ -94,8 +94,9 @@ + + - Index: modules/text/make/common/build.xml =================================================================== --- modules/text/make/common/build.xml.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/text/make/common/build.xml 2006-04-16 20:35:51.000000000 +0100 @@ -101,7 +101,6 @@ - Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java.orig 2006-04-16 20:35:06.000000000 +0100 +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java 2006-04-16 20:38:33.000000000 +0100 @@ -67,8 +67,8 @@ public void testSpecificDefaultValue() { // FIXME: different here! - assertEquals(4, encoder.maxBytesPerChar()); - assertEquals(2.5, encoder.averageBytesPerChar()); + assertEquals(4, encoder.maxBytesPerChar(), 0.0); + assertEquals(2.5, encoder.averageBytesPerChar(), 0.0); // assertEquals(3, encoder.averageBytesPerChar()); // assertEquals(2, encoder.maxBytesPerChar());