Index: modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -123,7 +123,7 @@ assertEquals("Byte not written after flush", 1, bais.available()); byte[] wbytes = new byte[1]; bais.read(wbytes, 0, 1); - assertTrue("Incorrect byte written", wbytes[0] == 't'); + assertEquals("Incorrect byte written", 't', wbytes[0]); } catch (java.io.IOException e) { fail("Write test failed"); } Index: modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -84,7 +84,7 @@ cr.mark(100); cr.read(); cr.reset(); - assertTrue("Failed to mark correct position", cr.read() == 'W'); + assertEquals("Failed to mark correct position", 'W', cr.read()); } catch (IOException e) { fail("Exception during mark test: " + e.getMessage()); } @@ -106,7 +106,7 @@ // Test for method int java.io.CharArrayReader.read() try { cr = new CharArrayReader(hw); - assertTrue("Read returned incorrect char", cr.read() == 'H'); + assertEquals("Read returned incorrect char", 'H', cr.read()); cr = new CharArrayReader(new char[] { '\u8765' }); assertTrue("Incorrect double byte char", cr.read() == '\u8765'); } catch (IOException e) { @@ -170,8 +170,8 @@ cr.mark(100); cr.read(); cr.reset(); - assertTrue("Reset failed to return to marker position", - cr.read() == 'W'); + assertEquals("Reset failed to return to marker position", + 'W', cr.read()); } catch (IOException e) { fail("Exception during reset test : " + e.getMessage()); } @@ -191,7 +191,7 @@ } assertEquals("Failed to skip correct number of chars", 5L, skipped); try { - assertTrue("Skip skipped wrong chars", cr.read() == 'W'); + assertEquals("Skip skipped wrong chars", 'W', cr.read()); } catch (IOException e) { fail("read exception during skip test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -143,7 +143,7 @@ cw.write('T'); cr = new CharArrayReader(cw.toCharArray()); try { - assertTrue("Writer failed to write char", cr.read() == 'T'); + assertEquals("Writer failed to write char", 'T', cr.read()); } catch (IOException e) { fail("Exception during write test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -128,7 +128,7 @@ os.writeChar('t'); os.close(); openDataInputStream(); - assertTrue("Incorrect char read", dis.readChar() == 't'); + assertEquals("Incorrect char read", 't', dis.readChar()); } catch (IOException e) { fail("IOException during readChar test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -179,7 +179,7 @@ openDataInputStream(); char c = dis.readChar(); dis.close(); - assertTrue("Incorrect char written", c == 'T'); + assertEquals("Incorrect char written", 'T', c); } catch (IOException e) { fail("Exception during writeChar test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java.orig 2006-04-16 09:44:43.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -195,7 +195,7 @@ fos = new java.io.FileOutputStream(f.getPath()); fos.write('t'); fis = new java.io.FileInputStream(f.getPath()); - assertTrue("Incorrect char written", fis.read() == 't'); + assertEquals("Incorrect char written", 't', fis.read()); } catch (java.io.IOException e) { fail("Exception during write test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -134,7 +134,7 @@ assertEquals("Byte not written after flush", 1, bis.available()); byte[] wbytes = new byte[1]; bis.read(wbytes, 0, 1); - assertTrue("Incorrect byte written", wbytes[0] == 't'); + assertEquals("Incorrect byte written", 't', wbytes[0]); } catch (java.io.IOException e) { fail("Write test failed : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -80,7 +80,7 @@ lnis.skip(4); lnis.reset(); assertEquals("Failed to mark", 0, lnis.getLineNumber()); - assertTrue("Failed to mark", lnis.read() == '0'); + assertEquals("Failed to mark", '0', lnis.read()); } catch (IOException e) { fail("Exception during mark test : " + e.getMessage()); } @@ -92,17 +92,17 @@ public void test_read() { // Test for method int java.io.LineNumberInputStream.read() try { - assertTrue("Failed to read correct byte", lnis.read() == '0'); - assertTrue("Failed to read correct byte on dos text", - lnis2.read() == '0'); + assertEquals("Failed to read correct byte", '0', lnis.read()); + assertEquals("Failed to read correct byte on dos text", + '0', lnis2.read()); assertTrue("Failed to read correct byte on dos text", lnis2.read() == '\n'); - assertTrue("Failed to read correct byte on dos text", - lnis2.read() == '1'); + assertEquals("Failed to read correct byte on dos text", + '1', lnis2.read()); assertTrue("Failed to read correct byte on dos text", lnis2.read() == '\n'); - assertTrue("Failed to read correct byte on dos text", - lnis2.read() == '2'); + assertEquals("Failed to read correct byte on dos text", + '2', lnis2.read()); } catch (IOException e) { fail("Exception during read test : " + e.getMessage()); } @@ -135,7 +135,7 @@ lnis.skip(4); lnis.reset(); assertEquals("Failed to reset", 0, lnis.getLineNumber()); - assertTrue("Failed to reset", lnis.read() == '0'); + assertEquals("Failed to reset", '0', lnis.read()); lnis.reset(); } catch (IOException e) { fail("Exception during mark test : " + e.getMessage()); Index: modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -91,7 +91,7 @@ try { int c = lnr.read(); - assertTrue("Read returned incorrect character", c == '0'); + assertEquals("Read returned incorrect character", '0', c); } catch (IOException e) { fail("Exception during read test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -285,7 +285,7 @@ oos.close(); ois = new ObjectInputStream(new ByteArrayInputStream(bao .toByteArray())); - assertTrue("Read incorrect byte value", ois.read() == 'T'); + assertEquals("Read incorrect byte value", 'T', ois.read()); ois.close(); } catch (IOException e) { fail("Exception serializing data : " + e.getMessage()); @@ -356,7 +356,7 @@ oos.close(); ois = new ObjectInputStream(new ByteArrayInputStream(bao .toByteArray())); - assertTrue("Read incorrect char value", ois.readChar() == 'T'); + assertEquals("Read incorrect char value", 'T', ois.readChar()); ois.close(); } catch (IOException e) { fail("Exception serializing data : " + e.getMessage()); Index: modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -766,7 +766,7 @@ oos.close(); ois = new ObjectInputStream(new ByteArrayInputStream(bao .toByteArray())); - assertTrue("Read incorrect byte", ois.read() == 'T'); + assertEquals("Read incorrect byte", 'T', ois.read()); ois.close(); } catch (IOException e) { fail("Exception serializing data : " + e.getMessage()); @@ -836,7 +836,7 @@ oos.close(); ois = new ObjectInputStream(new ByteArrayInputStream(bao .toByteArray())); - assertTrue("Wrote incorrect char value", ois.readChar() == 'T'); + assertEquals("Wrote incorrect char value", 'T', ois.readChar()); } catch (IOException e) { fail("Exception serializing data : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java.orig 2006-04-16 16:06:35.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -52,8 +52,8 @@ // Test for method java.io.ObjectStreamField // java.io.ObjectStreamClass.getField(java.lang.String) ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class); - assertTrue("getField did not return correct field", osc.getField("bam") - .getTypeCode() == 'J'); + assertEquals("getField did not return correct field", 'J', osc.getField("bam") + .getTypeCode()); assertNull("getField did not null for non-existent field", osc .getField("wham")); } Index: modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -111,10 +111,10 @@ */ public void test_getTypeCode() { // Test for method char java.io.ObjectStreamField.getTypeCode() - assertTrue("getTypeCode on an Object field did not answer 'L'", - holaField.getTypeCode() == 'L'); - assertTrue("getTypeCode on a long field did not answer 'J'", bamField - .getTypeCode() == 'J'); + assertEquals("getTypeCode on an Object field did not answer 'L'", + 'L', holaField.getTypeCode()); + assertEquals("getTypeCode on a long field did not answer 'J'", 'J', bamField + .getTypeCode()); } /** Index: modules/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java.orig 2006-04-16 16:06:35.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -596,7 +596,7 @@ osw.close(); openInputStream(); int c = isr.read(); - assertTrue("Incorrect char returned", (char) c == 'T'); + assertEquals("Incorrect char returned", 'T', (char) c); } catch (Exception e) { fail("Exception during write test : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/PrintStreamTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/PrintStreamTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/PrintStreamTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -170,7 +170,7 @@ os = new java.io.PrintStream(bos, true); os.print('t'); bis = new java.io.ByteArrayInputStream(bos.toByteArray()); - assertTrue("Incorrect char written", bis.read() == 't'); + assertEquals("Incorrect char written", 't', bis.read()); } /** @@ -358,7 +358,7 @@ os = new java.io.PrintStream(bos, true); os.println('t'); bis = new java.io.ByteArrayInputStream(bos.toByteArray()); - assertTrue("Incorrect char written", bis.read() == 't'); + assertEquals("Incorrect char written", 't', bis.read()); assertTrue("Newline not written", (c = bis.read()) == '\r' || c == '\n'); } @@ -498,7 +498,7 @@ os = new java.io.PrintStream(bos, true); os.write('t'); bis = new java.io.ByteArrayInputStream(bos.toByteArray()); - assertTrue("Incorrect char written", bis.read() == 't'); + assertEquals("Incorrect char written", 't', bis.read()); } /** Index: modules/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -232,7 +232,7 @@ raf = new java.io.RandomAccessFile(fileName, "rw"); raf.writeChar('T'); raf.seek(0); - assertTrue("Incorrect char read/written", raf.readChar() == 'T'); + assertEquals("Incorrect char read/written", 'T', raf.readChar()); raf.close(); } catch (java.io.IOException e) { fail("readChar test threw an IOException : " + e.getMessage()); @@ -596,7 +596,7 @@ raf = new java.io.RandomAccessFile(fileName, "rw"); raf.writeChar('T'); raf.seek(0); - assertTrue("Incorrect char read/written", raf.readChar() == 'T'); + assertEquals("Incorrect char read/written", 'T', raf.readChar()); raf.close(); } catch (java.io.IOException e) { fail("writeChar test threw an IOException : " + e.getMessage()); Index: modules/luni/src/test/java/tests/api/java/io/SerializationStressTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/SerializationStressTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/SerializationStressTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -398,7 +398,7 @@ oos.write('T'); oos.close(); ois = new ObjectInputStream(loadStream()); - assertTrue("Read incorrect byte", ois.read() == 'T'); + assertEquals("Read incorrect byte", 'T', ois.read()); ois.close(); } catch (IOException e) { fail("IOException serializing data : " + e.getMessage()); @@ -468,7 +468,7 @@ oos.writeChar('T'); oos.close(); ois = new ObjectInputStream(loadStream()); - assertTrue("Wrote incorrect char value", ois.readChar() == 'T'); + assertEquals("Wrote incorrect char value", 'T', ois.readChar()); } catch (IOException e) { fail("IOException serializing data : " + e.getMessage()); } Index: modules/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java.orig 2006-04-16 16:06:36.000000000 +0100 +++ modules/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java 2006-04-16 16:16:04.000000000 +0100 @@ -224,7 +224,7 @@ tokenizer.eolIsSignificant(true); assertTrue("Wrong token 2,1", tokenizer.nextToken() == '\n'); assertTrue("Wrong token 2,2", tokenizer.nextToken() == '\n'); - assertTrue("Wrong token 2,3", tokenizer.nextToken() == '#'); + assertEquals("Wrong token 2,3", '#', tokenizer.nextToken()); } catch (IOException e) { fail("IOException during test 2 : " + e.getMessage()); } @@ -254,8 +254,8 @@ setTest("azbc iof z 893"); st.ordinaryChars('a', 'z'); try { - assertTrue("OrdinaryChars failed.", st.nextToken() == 'a'); - assertTrue("OrdinaryChars failed.", st.nextToken() == 'z'); + assertEquals("OrdinaryChars failed.", 'a', st.nextToken()); + assertEquals("OrdinaryChars failed.", 'z', st.nextToken()); } catch (Exception e) { fail("Exception during test : " + e.getMessage()); } @@ -271,7 +271,7 @@ assertTrue("Base behavior failed.", st.nextToken() == StreamTokenizer.TT_NUMBER); st.ordinaryChars('0', '9'); - assertTrue("setOrdinary failed.", st.nextToken() == '6'); + assertEquals("setOrdinary failed.", '6', st.nextToken()); st.parseNumbers(); assertTrue("parseNumbers failed.", st.nextToken() == StreamTokenizer.TT_NUMBER); @@ -304,7 +304,7 @@ setTest(" 0) c = is.read(); c = is.read(); @@ -402,8 +401,8 @@ connector.close(); c = is.read(); - TestCase.assertTrue("Incorrect data returned on redirect to relative URI.", - c == 'A'); + TestCase.assertEquals("Incorrect data returned on redirect to relative URI.", + 'A', c); while (c > 0) c = is.read(); c = is.read();