You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/03/17 18:36:38 UTC
svn commit: r1301967 -
/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java
Author: sebb
Date: Sat Mar 17 17:36:38 2012
New Revision: 1301967
URL: http://svn.apache.org/viewvc?rev=1301967&view=rev
Log:
Simplify assertions, and provide details if the strings are not equal
Modified:
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java
Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java?rev=1301967&r1=1301966&r2=1301967&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java (original)
+++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java Sat Mar 17 17:36:38 2012
@@ -113,16 +113,16 @@ public class ExtendedBufferedReaderTest
assertTrue(br.readLine() == null);
br = getBufferedReader("\n");
- assertTrue(br.readLine().equals(""));
+ assertEquals("",br.readLine());
assertTrue(br.readLine() == null);
br = getBufferedReader("foo\n\nhello");
assertEquals(0, br.getLineNumber());
- assertTrue(br.readLine().equals("foo"));
+ assertEquals("foo",br.readLine());
assertEquals(1, br.getLineNumber());
- assertTrue(br.readLine().equals(""));
+ assertEquals("",br.readLine());
assertEquals(2, br.getLineNumber());
- assertTrue(br.readLine().equals("hello"));
+ assertEquals("hello",br.readLine());
assertEquals(3, br.getLineNumber());
assertTrue(br.readLine() == null);
assertEquals(3, br.getLineNumber());
@@ -130,23 +130,23 @@ public class ExtendedBufferedReaderTest
br = getBufferedReader("foo\n\nhello");
assertEquals('f', br.read());
assertEquals('o', br.lookAhead());
- assertTrue(br.readLine().equals("oo"));
+ assertEquals("oo",br.readLine());
assertEquals(1, br.getLineNumber());
assertEquals('\n', br.lookAhead());
- assertTrue(br.readLine().equals(""));
+ assertEquals("",br.readLine());
assertEquals(2, br.getLineNumber());
assertEquals('h', br.lookAhead());
- assertTrue(br.readLine().equals("hello"));
+ assertEquals("hello",br.readLine());
assertTrue(br.readLine() == null);
assertEquals(3, br.getLineNumber());
br = getBufferedReader("foo\rbaar\r\nfoo");
- assertTrue(br.readLine().equals("foo"));
+ assertEquals("foo",br.readLine());
assertEquals('b', br.lookAhead());
- assertTrue(br.readLine().equals("baar"));
+ assertEquals("baar",br.readLine());
assertEquals('f', br.lookAhead());
- assertTrue(br.readLine().equals("foo"));
+ assertEquals("foo",br.readLine());
assertTrue(br.readLine() == null);
}