You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2006/04/25 14:57:35 UTC
svn commit: r396872 -
/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/
Author: smishura
Date: Tue Apr 25 05:57:30 2006
New Revision: 396872
URL: http://svn.apache.org/viewcvs?rev=396872&view=rev
Log:
Apply patch for HARMONY-353 (improvements to junit test method usage) for nio_char module. All nio_char tests passed on Windows.
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.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/GBCharsetDecoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -35,8 +35,8 @@
// FIXME: give up this tests
// public void testDefaultCharsPerByte(){
- // // assertTrue(decoder.averageCharsPerByte() == 1);
- // // assertTrue(decoder.maxCharsPerByte() == 1);
+ // // assertEquals(1, decoder.averageCharsPerByte());
+ // // assertEquals(1, decoder.maxCharsPerByte());
// assertEquals(decoder.averageCharsPerByte(), 1, 0.001);
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
// }
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=396872&r1=396871&r2=396872&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 Tue Apr 25 05:57:30 2006
@@ -440,10 +440,10 @@
*/
public void testCompareTo_Normal() {
MockCharset c1 = new MockCharset("mock", null);
- assertTrue(c1.compareTo(c1) == 0);
+ assertEquals(0, c1.compareTo(c1));
MockCharset c2 = new MockCharset("Mock", null);
- assertTrue(c1.compareTo(c2) == 0);
+ assertEquals(0, c1.compareTo(c2));
c2 = new MockCharset("mock2", null);
assertTrue(c1.compareTo(c2) < 0);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -38,8 +38,8 @@
// // FIXME: give up this tests
// public void testDefaultCharsPerByte(){
- // //assertTrue(decoder.averageCharsPerByte() == 1);
- // //assertTrue(decoder.maxCharsPerByte() == 1);
+ // //assertEquals(1, decoder.averageCharsPerByte());
+ // //assertEquals(1, decoder.maxCharsPerByte());
// assertEquals(decoder.averageCharsPerByte(), 0.25, 0.001);
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
// }
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -38,7 +38,7 @@
// FIXME: give up this tests
// public void testDefaultCharsPerByte(){
- // assertTrue(decoder.averageCharsPerByte() == 1);
+ // assertEquals(1, decoder.averageCharsPerByte());
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
// }
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java Tue Apr 25 05:57:30 2006
@@ -68,8 +68,8 @@
}
public void testSpecificDefaultValue() {
- assertTrue(encoder.averageBytesPerChar() == 1);
- assertTrue(encoder.maxBytesPerChar() == 1);
+ assertEquals(1, encoder.averageBytesPerChar());
+ assertEquals(1, encoder.maxBytesPerChar());
}
CharBuffer getMalformedCharBuffer() {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -40,8 +40,8 @@
// FIXME: give up this tests
// public void testDefaultCharsPerByte() {
- // // assertTrue(decoder.averageCharsPerByte() == 1);
- // // assertTrue(decoder.maxCharsPerByte() == 1);
+ // // assertEquals(1, decoder.averageCharsPerByte());
+ // // assertEquals(1, decoder.maxCharsPerByte());
// assertEquals(decoder.averageCharsPerByte(), 0.5, 0.001);
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
// }
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java Tue Apr 25 05:57:30 2006
@@ -86,8 +86,8 @@
}
public void testSpecificDefaultValue() {
- assertTrue(encoder.averageBytesPerChar() == 2);
- assertTrue(encoder.maxBytesPerChar() == 2);
+ assertEquals(2, encoder.averageBytesPerChar());
+ assertEquals(2, encoder.maxBytesPerChar());
}
CharBuffer getMalformedCharBuffer() {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -122,8 +122,8 @@
// FIXME: give up this tests
// public void testDefaultCharsPerByte() {
- // // assertTrue(decoder.averageCharsPerByte() == 1);
- // // assertTrue(decoder.maxCharsPerByte() == 1);
+ // // assertEquals(1, decoder.averageCharsPerByte());
+ // // assertEquals(1, decoder.maxCharsPerByte());
// assertEquals(decoder.averageCharsPerByte(), 0.5, 0.001);
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
// }
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java Tue Apr 25 05:57:30 2006
@@ -91,7 +91,7 @@
public void testSpecificDefaultValue() {
assertEquals(encoder.averageBytesPerChar(), 2, 0.001);
- // assertTrue(encoder.maxBytesPerChar() == 4);
+ // assertEquals(4, encoder.maxBytesPerChar());
// FIXME: different here!
assertEquals(encoder.maxBytesPerChar(), 2, 0.001);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -40,8 +40,8 @@
// // FIXME: give up this tests
// public void testDefaultCharsPerByte(){
- // // assertTrue(decoder.averageCharsPerByte() == 1);
- // // assertTrue(decoder.maxCharsPerByte() == 1);
+ // // assertEquals(1, decoder.averageCharsPerByte());
+ // // assertEquals(1, decoder.maxCharsPerByte());
// assertEquals(decoder.averageCharsPerByte(), 0.5, 0.001);
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
// }
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java Tue Apr 25 05:57:30 2006
@@ -86,8 +86,8 @@
}
public void testSpecificDefaultValue() {
- assertTrue(encoder.averageBytesPerChar() == 2);
- assertTrue(encoder.maxBytesPerChar() == 2);
+ assertEquals(2, encoder.averageBytesPerChar());
+ assertEquals(2, encoder.maxBytesPerChar());
}
public void testIsLegalReplacementEmptyArray() {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java?rev=396872&r1=396871&r2=396872&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java Tue Apr 25 05:57:30 2006
@@ -40,8 +40,8 @@
// public void testDefaultCharsPerByte(){
// assertEquals(decoder.averageCharsPerByte(), 0.333, 0.001);
// assertEquals(decoder.maxCharsPerByte(), 2, 0.001);
- // // assertTrue(decoder.averageCharsPerByte() == 1);
- // // assertTrue(decoder.maxCharsPerByte() == 1);
+ // // assertEquals(1, decoder.averageCharsPerByte());
+ // // assertEquals(1, decoder.maxCharsPerByte());
// }
ByteBuffer getUnmappedByteBuffer() throws UnsupportedEncodingException {