Skip to content

Commit

Permalink
fixed bug reported on github issue #306 - empty row returned when pro…
Browse files Browse the repository at this point in the history
…cessing commented line at the end of the input.
  • Loading branch information
jbax committed Jan 23, 2019
1 parent 154b2be commit 22437eb
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/univocity/parsers/csv/CsvParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ protected final boolean consumeValueOnEOF() {
}
}
}
boolean out = prev != '\0' && ch != delimiter && ch != newLine;
boolean out = prev != '\0' && ch != delimiter && ch != newLine && ch != comment;
ch = prev = '\0';
if (match > 0) {
saveMatchingCharacters();
Expand Down
20 changes: 15 additions & 5 deletions src/test/java/com/univocity/parsers/issues/github/Github_305.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
/*
* Copyright (c) 2019 Univocity Software Pty Ltd. All rights reserved.
* This file is subject to the terms and conditions defined in file
* 'LICENSE.txt', which is part of this source code package.
*/
/*******************************************************************************
* Copyright 2019 Univocity Software Pty Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
******************************************************************************/
package com.univocity.parsers.issues.github;


Expand Down
63 changes: 63 additions & 0 deletions src/test/java/com/univocity/parsers/issues/github/Github_306.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*******************************************************************************
* Copyright 2019 Univocity Software Pty Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
******************************************************************************/
package com.univocity.parsers.issues.github;


import com.univocity.parsers.csv.*;
import org.testng.annotations.*;

import java.io.*;
import java.util.*;

import static org.testng.Assert.*;

/**
* From: https://github.com/univocity/univocity-parsers/issues/306
*
* @author Univocity Software Pty Ltd - <a href="mailto:[email protected]">[email protected]</a>
*/
public class Github_306 {

@Test
public void testWithMultilineRecordsAndFooter() {
final String csv = "Timestamp,Value,Metric,Entity,host\n" +
"2019-01-21T11:39:53.763Z,160527072,jvm_memory_used,dev,\"LOCAL\n" +
"HOST\"\n" +
"2019-01-21T11:40:08.765Z,1.6270228E+8,jvm_memory_used,dev,\"LOCAL\n" +
"HOST\"\n" +
"#created at 2019-01-22T11:39:43.312Z";
final CsvParserSettings settings = new CsvParserSettings();
settings.setReadInputOnSeparateThread(false);
settings.setQuoteDetectionEnabled(true);
settings.setLineSeparatorDetectionEnabled(true);
settings.setHeaderExtractionEnabled(true);
settings.setDelimiterDetectionEnabled(true);

final CsvParser csvParser = new CsvParser(settings);
csvParser.beginParsing(new StringReader(csv));

assertEquals(csvParser.getDetectedFormat().getDelimiterString(), ",");

final List<String[]> dataRows = csvParser.parseAll(new StringReader(csv));
assertEquals(dataRows.size(), 2);

for (String[] columns : csvParser.parseAll()) {
assertEquals(columns.length, 5);
}

}

}

0 comments on commit 22437eb

Please sign in to comment.