@@ -46,9 +46,9 @@ private void testWithSingleByteRead(String testString, String charsetName) throw
4646 InputStream in = new CharSequenceInputStream (testString , charsetName , 512 );
4747 for (byte b : bytes ) {
4848 int read = in .read ();
49- assertTrue (read >= 0 );
50- assertTrue (read <= 255 );
51- assertEquals (b , (byte )read );
49+ assertTrue ("read " + read + " >=0 " , read >= 0 );
50+ assertTrue ("read " + read + " <= 255" , read <= 255 );
51+ assertEquals ("Should agree with input" , b , (byte )read );
5252 }
5353 assertEquals (-1 , in .read ());
5454 }
@@ -63,13 +63,13 @@ private void testWithBufferedRead(String testString, String charsetName) throws
6363 int bufferLength = random .nextInt (64 );
6464 int read = in .read (buffer , bufferOffset , bufferLength );
6565 if (read == -1 ) {
66- assertEquals (offset , expected .length );
66+ assertEquals ("EOF: offset should equal length" , expected .length , offset );
6767 break ;
6868 } else {
69- assertTrue (read <= bufferLength );
69+ assertTrue ("Read " + read + " <= " + bufferLength , read <= bufferLength );
7070 while (read > 0 ) {
71- assertTrue (offset < expected .length );
72- assertEquals (expected [offset ], buffer [bufferOffset ]);
71+ assertTrue ("offset " + offset + " < " + expected . length , offset < expected .length );
72+ assertEquals ("bytes should agree" , expected [offset ], buffer [bufferOffset ]);
7373 offset ++;
7474 bufferOffset ++;
7575 read --;
0 commit comments