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 32CE49E71 for ; Thu, 29 Mar 2012 00:31:41 +0000 (UTC) Received: (qmail 723 invoked by uid 500); 29 Mar 2012 00:31:40 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 664 invoked by uid 500); 29 Mar 2012 00:31:40 -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 657 invoked by uid 99); 29 Mar 2012 00:31:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 00:31:40 +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; Thu, 29 Mar 2012 00:31:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 00B44238899C for ; Thu, 29 Mar 2012 00:31:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1306659 - /commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java Date: Thu, 29 Mar 2012 00:31:16 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120329003117.00B44238899C@eris.apache.org> Author: sebb Date: Thu Mar 29 00:31:16 2012 New Revision: 1306659 URL: http://svn.apache.org/viewvc?rev=1306659&view=rev Log: Add a few more blank lines to the test Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java?rev=1306659&r1=1306658&r2=1306659&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java Thu Mar 29 00:31:16 2012 @@ -94,11 +94,18 @@ public class CSVLexerTest { public void testNextToken2EmptyLines() throws IOException { final String code = "1,2,3,\n"+ // 1 + "\n"+ // 1b + "\n"+ // 1c "a,b x,c#no-comment\n"+ // 2 "#foo\n"+ // 3 "\n"+ // 4 + "\n"+ // 4b "d,e,#no-comment\n"+ // 5 + "\n"+ // 5b + "\n"+ // 5c "# penultimate comment\n"+ // 6 + "\n"+ // 6b + "\n"+ // 6c "# Final comment\n"; // 7 CSVFormat format = CSVFormat.DEFAULT.withCommentStart('#').withEmptyLinesIgnored(false); assertFalse("Should not ignore empty lines", format.isEmptyLinesIgnored()); @@ -110,15 +117,22 @@ public class CSVLexerTest { assertTokenEquals(TOKEN, "2", parser.nextToken(new Token())); assertTokenEquals(TOKEN, "3", parser.nextToken(new Token())); assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 1 + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 1b + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 1c assertTokenEquals(TOKEN, "a", parser.nextToken(new Token())); assertTokenEquals(TOKEN, "b x", parser.nextToken(new Token())); assertTokenEquals(EORECORD, "c#no-comment", parser.nextToken(new Token())); // 2 assertTokenEquals(COMMENT, "", parser.nextToken(new Token())); // 3 assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 4 + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 4b assertTokenEquals(TOKEN, "d", parser.nextToken(new Token())); assertTokenEquals(TOKEN, "e", parser.nextToken(new Token())); assertTokenEquals(EORECORD, "#no-comment", parser.nextToken(new Token())); // 5 + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 5b + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 5c assertTokenEquals(COMMENT, "", parser.nextToken(new Token())); // 6 + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 6b + assertTokenEquals(EORECORD, "", parser.nextToken(new Token())); // 6c assertTokenEquals(COMMENT, "", parser.nextToken(new Token())); // 7 assertTokenEquals(EOF, "", parser.nextToken(new Token())); assertTokenEquals(EOF, "", parser.nextToken(new Token()));