Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 22C80906D for ; Wed, 28 Mar 2012 13:18:33 +0000 (UTC) Received: (qmail 15625 invoked by uid 500); 28 Mar 2012 13:18:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 15571 invoked by uid 500); 28 Mar 2012 13:18:32 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 15564 invoked by uid 99); 28 Mar 2012 13:18:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Mar 2012 13:18:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Mar 2012 13:18:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7E26723888EA for ; Wed, 28 Mar 2012 13:18:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1306307 - /commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java Date: Wed, 28 Mar 2012 13:18:11 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120328131811.7E26723888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Wed Mar 28 13:18:11 2012 New Revision: 1306307 URL: http://svn.apache.org/viewvc?rev=1306307&view=rev Log: Tidy up; rename shared fields to be clearer Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.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=1306307&r1=1306306&r2=1306307&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 Wed Mar 28 13:18:11 2012 @@ -41,12 +41,13 @@ import static org.junit.Assert.*; */ public class CSVParserTest { - String code = "a,b,c,d\n" + private static final String CSVINPUT = "a,b,c,d\n" + " a , b , 1 2 \n" + "\"foo baar\", b,\n" // + " \"foo\n,,\n\"\",,\n\\\"\",d,e\n"; + " \"foo\n,,\n\"\",,\n\"\"\",d,e\n"; // changed to use standard CSV escaping - String[][] res = { + + private static final String[][] RESULT = { {"a", "b", "c", "d"}, {"a", "b", "1 2"}, {"foo baar", "b", ""}, @@ -55,8 +56,8 @@ public class CSVParserTest { @Test public void testGetLine() throws IOException { - CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.DEFAULT.withSurroundingSpacesIgnored(true)); - for (String[] re : res) { + CSVParser parser = new CSVParser(new StringReader(CSVINPUT), CSVFormat.DEFAULT.withSurroundingSpacesIgnored(true)); + for (String[] re : RESULT) { assertArrayEquals(re, parser.getRecord().values()); } @@ -65,12 +66,12 @@ public class CSVParserTest { @Test public void testGetRecords() throws IOException { - CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.DEFAULT.withSurroundingSpacesIgnored(true)); + CSVParser parser = new CSVParser(new StringReader(CSVINPUT), CSVFormat.DEFAULT.withSurroundingSpacesIgnored(true)); List records = parser.getRecords(); - assertEquals(res.length, records.size()); + assertEquals(RESULT.length, records.size()); assertTrue(records.size() > 0); - for (int i = 0; i < res.length; i++) { - assertArrayEquals(res[i], records.get(i).values()); + for (int i = 0; i < RESULT.length; i++) { + assertArrayEquals(RESULT[i], records.get(i).values()); } } @@ -331,7 +332,7 @@ public class CSVParserTest { String code = "" + "a,b\n" // 1) + "\"\n\",\" \"\n" // 2) - + "\"\",#\n" // 2) + + "\"\",#\n" // 3) ; String[][] res = { {"a", "b"},