Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 641 invoked from network); 1 Aug 2006 06:50:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Aug 2006 06:50:32 -0000 Received: (qmail 46348 invoked by uid 500); 1 Aug 2006 06:50:30 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 46128 invoked by uid 500); 1 Aug 2006 06:50:29 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 46117 invoked by uid 500); 1 Aug 2006 06:50:29 -0000 Received: (qmail 46114 invoked by uid 99); 1 Aug 2006 06:50:29 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 23:50:29 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 23:50:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EB7DE1A981A; Mon, 31 Jul 2006 23:50:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r427470 - in /jakarta/commons/sandbox/csv/trunk/src: java/org/apache/commons/csv/CSVParser.java test/org/apache/commons/csv/CSVParserTest.java Date: Tue, 01 Aug 2006 06:50:08 -0000 To: commons-cvs@jakarta.apache.org From: bayard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060801065008.EB7DE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bayard Date: Mon Jul 31 23:50:08 2006 New Revision: 427470 URL: http://svn.apache.org/viewvc?rev=427470&view=rev Log: Fixing bug reported byu Markus Rogg in #SANDBOX-153. Whitespace was being treated specially when it was not the delimiter. Unit test and patch applied. Modified: jakarta/commons/sandbox/csv/trunk/src/java/org/apache/commons/csv/CSVParser.java jakarta/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java Modified: jakarta/commons/sandbox/csv/trunk/src/java/org/apache/commons/csv/CSVParser.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/csv/trunk/src/java/org/apache/commons/csv/CSVParser.java?rev=427470&r1=427469&r2=427470&view=diff ============================================================================== --- jakarta/commons/sandbox/csv/trunk/src/java/org/apache/commons/csv/CSVParser.java (original) +++ jakarta/commons/sandbox/csv/trunk/src/java/org/apache/commons/csv/CSVParser.java Mon Jul 31 23:50:08 2006 @@ -557,7 +557,7 @@ * @return true if the given char is a whitespace character */ private boolean isWhitespace(int c) { - return Character.isWhitespace((char) c); + return Character.isWhitespace((char) c) && (c != strategy.getDelimiter()); } /** Modified: jakarta/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java?rev=427470&r1=427469&r2=427470&view=diff ============================================================================== --- jakarta/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java (original) +++ jakarta/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java Mon Jul 31 23:50:08 2006 @@ -526,4 +526,18 @@ } } } + + // From SANDBOX-153 + public void testDelimiterIsWhitespace() throws IOException { + String code = "one\ttwo\t\tfour \t five\t six"; + TestCSVParser parser = new TestCSVParser(new StringReader(code)); + parser.setStrategy(CSVStrategy.TDF_STRATEGY); + System.out.println("---------\n" + code + "\n-------------"); + assertEquals(CSVParser.TT_TOKEN + ";one;", parser.testNextToken()); + assertEquals(CSVParser.TT_TOKEN + ";two;", parser.testNextToken()); + assertEquals(CSVParser.TT_TOKEN + ";;", parser.testNextToken()); + assertEquals(CSVParser.TT_TOKEN + ";four;", parser.testNextToken()); + assertEquals(CSVParser.TT_TOKEN + ";five;", parser.testNextToken()); + assertEquals(CSVParser.TT_EOF + ";six;", parser.testNextToken()); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org