mirror of https://github.com/apache/lucene.git
SOLR-9413: Fix analysis/kuromoji's CSVUtil.quoteEscape logic, add TestCSVUtil test. (AppChecker, Christine Poerschke)
This commit is contained in:
parent
105c7eae87
commit
75924f5834
lucene
CHANGES.txt
analysis/kuromoji/src
java/org/apache/lucene/analysis/ja/util
test/org/apache/lucene/analysis/ja
|
@ -85,6 +85,9 @@ Bug Fixes
|
|||
* LUCENE-7391: Fix performance regression in MemoryIndex's fields() introduced
|
||||
in Lucene 6. (Steve Mason via David Smiley)
|
||||
|
||||
* SOLR-9413: Fix analysis/kuromoji's CSVUtil.quoteEscape logic, add TestCSVUtil test.
|
||||
(AppChecker, Christine Poerschke)
|
||||
|
||||
Improvements
|
||||
|
||||
* LUCENE-7323: Compound file writing now verifies the incoming
|
||||
|
|
|
@ -101,7 +101,7 @@ public final class CSVUtil {
|
|||
String result = original;
|
||||
|
||||
if (result.indexOf('\"') >= 0) {
|
||||
result.replace("\"", ESCAPED_QUOTE);
|
||||
result = result.replace("\"", ESCAPED_QUOTE);
|
||||
}
|
||||
if(result.indexOf(COMMA) >= 0) {
|
||||
result = "\"" + result + "\"";
|
||||
|
|
|
@ -0,0 +1,52 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You 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 org.apache.lucene.analysis.ja;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.lucene.analysis.ja.util.CSVUtil;
|
||||
import org.apache.lucene.util.LuceneTestCase;
|
||||
|
||||
/*
|
||||
* Tests for the CSVUtil class.
|
||||
*/
|
||||
public class TestCSVUtil extends LuceneTestCase {
|
||||
|
||||
public void testQuoteEscapeQuotes() throws IOException {
|
||||
final String input = "\"Let It Be\" is a song and album by the The Beatles.";
|
||||
final String expectedOutput = input.replace("\"", "\"\"");
|
||||
implTestQuoteEscape(input, expectedOutput);
|
||||
}
|
||||
|
||||
public void testQuoteEscapeComma() throws IOException {
|
||||
final String input = "To be, or not to be ...";
|
||||
final String expectedOutput = '"'+input+'"';
|
||||
implTestQuoteEscape(input, expectedOutput);
|
||||
}
|
||||
|
||||
public void testQuoteEscapeQuotesAndComma() throws IOException {
|
||||
final String input = "\"To be, or not to be ...\" is a well-known phrase from Shakespeare's Hamlet.";
|
||||
final String expectedOutput = '"'+input.replace("\"", "\"\"")+'"';
|
||||
implTestQuoteEscape(input, expectedOutput);
|
||||
}
|
||||
|
||||
private void implTestQuoteEscape(String input, String expectedOutput) throws IOException {
|
||||
final String actualOutput = CSVUtil.quoteEscape(input);
|
||||
assertEquals(expectedOutput, actualOutput);
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue