Simplify assertions, and provide details if the strings are not equal

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1301967 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-03-17 17:36:38 +00:00
parent 16278171d2
commit a019caec3f
1 changed files with 10 additions and 10 deletions

View File

@ -113,16 +113,16 @@ public class ExtendedBufferedReaderTest {
assertTrue(br.readLine() == null); assertTrue(br.readLine() == null);
br = getBufferedReader("\n"); br = getBufferedReader("\n");
assertTrue(br.readLine().equals("")); assertEquals("",br.readLine());
assertTrue(br.readLine() == null); assertTrue(br.readLine() == null);
br = getBufferedReader("foo\n\nhello"); br = getBufferedReader("foo\n\nhello");
assertEquals(0, br.getLineNumber()); assertEquals(0, br.getLineNumber());
assertTrue(br.readLine().equals("foo")); assertEquals("foo",br.readLine());
assertEquals(1, br.getLineNumber()); assertEquals(1, br.getLineNumber());
assertTrue(br.readLine().equals("")); assertEquals("",br.readLine());
assertEquals(2, br.getLineNumber()); assertEquals(2, br.getLineNumber());
assertTrue(br.readLine().equals("hello")); assertEquals("hello",br.readLine());
assertEquals(3, br.getLineNumber()); assertEquals(3, br.getLineNumber());
assertTrue(br.readLine() == null); assertTrue(br.readLine() == null);
assertEquals(3, br.getLineNumber()); assertEquals(3, br.getLineNumber());
@ -130,23 +130,23 @@ public class ExtendedBufferedReaderTest {
br = getBufferedReader("foo\n\nhello"); br = getBufferedReader("foo\n\nhello");
assertEquals('f', br.read()); assertEquals('f', br.read());
assertEquals('o', br.lookAhead()); assertEquals('o', br.lookAhead());
assertTrue(br.readLine().equals("oo")); assertEquals("oo",br.readLine());
assertEquals(1, br.getLineNumber()); assertEquals(1, br.getLineNumber());
assertEquals('\n', br.lookAhead()); assertEquals('\n', br.lookAhead());
assertTrue(br.readLine().equals("")); assertEquals("",br.readLine());
assertEquals(2, br.getLineNumber()); assertEquals(2, br.getLineNumber());
assertEquals('h', br.lookAhead()); assertEquals('h', br.lookAhead());
assertTrue(br.readLine().equals("hello")); assertEquals("hello",br.readLine());
assertTrue(br.readLine() == null); assertTrue(br.readLine() == null);
assertEquals(3, br.getLineNumber()); assertEquals(3, br.getLineNumber());
br = getBufferedReader("foo\rbaar\r\nfoo"); br = getBufferedReader("foo\rbaar\r\nfoo");
assertTrue(br.readLine().equals("foo")); assertEquals("foo",br.readLine());
assertEquals('b', br.lookAhead()); assertEquals('b', br.lookAhead());
assertTrue(br.readLine().equals("baar")); assertEquals("baar",br.readLine());
assertEquals('f', br.lookAhead()); assertEquals('f', br.lookAhead());
assertTrue(br.readLine().equals("foo")); assertEquals("foo",br.readLine());
assertTrue(br.readLine() == null); assertTrue(br.readLine() == null);
} }