You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/08/17 15:13:19 UTC
lucene-solr:branch_6x: SOLR-9413: Fix analysis/kuromoji's
CSVUtil.quoteEscape logic, add TestCSVUtil test. (AppChecker,
Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 715db95af -> ca682750b
SOLR-9413: Fix analysis/kuromoji's CSVUtil.quoteEscape logic, add TestCSVUtil test. (AppChecker, Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ca682750
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ca682750
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ca682750
Branch: refs/heads/branch_6x
Commit: ca682750b4440da5aeaa6a84f9a0d1f295aa7963
Parents: 715db95
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Aug 17 14:56:49 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Aug 17 15:44:21 2016 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 ++
.../apache/lucene/analysis/ja/util/CSVUtil.java | 2 +-
.../apache/lucene/analysis/ja/TestCSVUtil.java | 52 ++++++++++++++++++++
3 files changed, 56 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca682750/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 3068d22..ad44c2a 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -68,6 +68,9 @@ Bug Fixes
norm and coordination factor using a default similarity added as ctor param.
(Uwe Schindler, Sascha Markus)
+* 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca682750/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
index 6301d2c..04f8603 100644
--- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
+++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
@@ -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 + "\"";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca682750/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java
new file mode 100644
index 0000000..01545db
--- /dev/null
+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java
@@ -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);
+ }
+
+}