You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2012/03/27 01:37:48 UTC
svn commit: r1305674 - in
/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv:
CSVParserTest.java ExtendedBufferedReaderTest.java
Author: ebourg
Date: Mon Mar 26 23:37:47 2012
New Revision: 1305674
URL: http://svn.apache.org/viewvc?rev=1305674&view=rev
Log:
Use JUnit 4 assertions for arrays
Modified:
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java
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/CSVParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java?rev=1305674&r1=1305673&r2=1305674&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java (original)
+++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java Mon Mar 26 23:37:47 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -58,7 +57,7 @@ public class CSVParserTest {
public void testGetLine() throws IOException {
CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.DEFAULT.withSurroundingSpacesIgnored(true));
for (String[] re : res) {
- assertTrue("Failed to match: "+Arrays.toString(re), Arrays.equals(re, parser.getRecord().values()));
+ assertArrayEquals(re, parser.getRecord().values());
}
assertNull(parser.getRecord());
@@ -71,7 +70,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
@@ -92,7 +91,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
@@ -111,7 +110,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
@@ -139,7 +138,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
}
@@ -166,7 +165,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
}
@@ -190,7 +189,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
}
@@ -212,7 +211,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
}
@@ -252,7 +251,7 @@ public class CSVParserTest {
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
@@ -295,7 +294,7 @@ public class CSVParserTest {
List<CSVRecord> records = parser.getRecords();
assertTrue(records.size() > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], records.get(i).values()));
+ assertArrayEquals(res[i], records.get(i).values());
}
}
@@ -407,9 +406,9 @@ public class CSVParserTest {
}
assertEquals(3, records.size());
- assertTrue(Arrays.equals(new String[]{"a", "b", "c"}, records.get(0).values()));
- assertTrue(Arrays.equals(new String[]{"1", "2", "3"}, records.get(1).values()));
- assertTrue(Arrays.equals(new String[]{"x", "y", "z"}, records.get(2).values()));
+ assertArrayEquals(new String[]{"a", "b", "c"}, records.get(0).values());
+ assertArrayEquals(new String[]{"1", "2", "3"}, records.get(1).values());
+ assertArrayEquals(new String[]{"x", "y", "z"}, records.get(2).values());
}
@Test
@@ -424,12 +423,12 @@ public class CSVParserTest {
fail("expected UnsupportedOperationException");
} catch (UnsupportedOperationException expected) {
}
- assertTrue(Arrays.equals(new String[]{"a", "b", "c"}, iterator.next().values()));
- assertTrue(Arrays.equals(new String[]{"1", "2", "3"}, iterator.next().values()));
+ assertArrayEquals(new String[]{"a", "b", "c"}, iterator.next().values());
+ assertArrayEquals(new String[]{"1", "2", "3"}, iterator.next().values());
assertTrue(iterator.hasNext());
assertTrue(iterator.hasNext());
assertTrue(iterator.hasNext());
- assertTrue(Arrays.equals(new String[]{"x", "y", "z"}, iterator.next().values()));
+ assertArrayEquals(new String[]{"x", "y", "z"}, iterator.next().values());
assertFalse(iterator.hasNext());
try {
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=1305674&r1=1305673&r2=1305674&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 Mon Mar 26 23:37:47 2012
@@ -18,7 +18,6 @@
package org.apache.commons.csv;
import java.io.StringReader;
-import java.util.Arrays;
import org.junit.Test;
@@ -97,13 +96,13 @@ public class ExtendedBufferedReaderTest
ref[1] = 'b';
ref[2] = 'c';
assertEquals(3, br.read(res, 0, 3));
- assertTrue(Arrays.equals(res, ref));
+ assertArrayEquals(ref, res);
assertEquals('c', br.readAgain());
assertEquals('d', br.lookAhead());
ref[4] = 'd';
assertEquals(1, br.read(res, 4, 1));
- assertTrue(Arrays.equals(res, ref));
+ assertArrayEquals(ref, res);
assertEquals('d', br.readAgain());
}