You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2019/02/13 13:32:21 UTC
[tika] branch branch_1x updated: TIKA-2826 - mea culpa and my
apologies...fixed master vs branch_1x incompatibilities.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_1x by this push:
new 3ad6edc TIKA-2826 - mea culpa and my apologies...fixed master vs branch_1x incompatibilities.
3ad6edc is described below
commit 3ad6edc732ad4d9ecdd53e5b0fba516cbf5235d6
Author: TALLISON <ta...@apache.org>
AuthorDate: Wed Feb 13 08:32:09 2019 -0500
TIKA-2826 - mea culpa and my apologies...fixed master vs branch_1x incompatibilities.
---
.../src/main/java/org/apache/tika/parser/csv/CSVParser.java | 2 +-
.../test/java/org/apache/tika/parser/csv/CSVParserTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/csv/CSVParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/csv/CSVParser.java
index 7fb57f6..1e1aa20 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/csv/CSVParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/csv/CSVParser.java
@@ -52,7 +52,7 @@ import org.xml.sax.SAXException;
public class CSVParser extends AbstractParser {
private static final String CSV_PREFIX = "csv";
public static final Property DELIMITER = Property.externalText(
- CSV_PREFIX+ TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER+"delimiter");
+ CSV_PREFIX + Metadata.NAMESPACE_PREFIX_DELIMITER+"delimiter");
private static final String TD = "td";
private static final String TR = "tr";
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/csv/CSVParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/csv/CSVParserTest.java
index de6ec29..c20c000 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/csv/CSVParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/csv/CSVParserTest.java
@@ -65,7 +65,7 @@ public class CSVParserTest extends TikaTest {
@Test
public void testCSV_UTF8() throws Exception {
Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test.csv");
+ metadata.set(Metadata.RESOURCE_NAME_KEY, "test.csv");
XMLResult xmlResult = getXML(new ByteArrayInputStream(CSV_UTF8), PARSER, metadata);
assertEquals("comma", xmlResult.metadata.get(CSVParser.DELIMITER));
assertEquals("text/csv; charset=ISO-8859-1", xmlResult.metadata.get(Metadata.CONTENT_TYPE));
@@ -95,7 +95,7 @@ public class CSVParserTest extends TikaTest {
@Test
public void testCSV_UTF16LE() throws Exception {
Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test.csv");
+ metadata.set(Metadata.RESOURCE_NAME_KEY, "test.csv");
XMLResult xmlResult = getXML(new ByteArrayInputStream(CSV_UTF_16LE), PARSER, metadata);
assertEquals("comma", xmlResult.metadata.get(CSVParser.DELIMITER));
assertEquals("text/csv; charset=UTF-16LE", xmlResult.metadata.get(Metadata.CONTENT_TYPE));
@@ -105,7 +105,7 @@ public class CSVParserTest extends TikaTest {
@Test
public void testCSV_UTF16LE_BOM() throws Exception {
Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test.csv");
+ metadata.set(Metadata.RESOURCE_NAME_KEY, "test.csv");
XMLResult xmlResult = getXML(new ByteArrayInputStream(
concat(ByteOrderMark.UTF_16LE.getBytes(), CSV_UTF_16LE)), PARSER, metadata);
assertEquals("comma", xmlResult.metadata.get(CSVParser.DELIMITER));
@@ -123,7 +123,7 @@ public class CSVParserTest extends TikaTest {
@Test
public void testTSV_UTF8() throws Exception {
Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test.csv");
+ metadata.set(Metadata.RESOURCE_NAME_KEY, "test.csv");
XMLResult xmlResult = getXML(new ByteArrayInputStream(TSV_UTF8), PARSER, metadata);
assertEquals("tab", xmlResult.metadata.get(CSVParser.DELIMITER));
assertEquals("text/tsv; charset=ISO-8859-1", xmlResult.metadata.get(Metadata.CONTENT_TYPE));
@@ -133,7 +133,7 @@ public class CSVParserTest extends TikaTest {
@Test
public void testTSV_UTF16LE() throws Exception {
Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test.csv");
+ metadata.set(Metadata.RESOURCE_NAME_KEY, "test.csv");
XMLResult xmlResult = getXML(new ByteArrayInputStream(TSV_UTF_16LE), PARSER, metadata);
assertEquals("tab", xmlResult.metadata.get(CSVParser.DELIMITER));
assertEquals("text/tsv; charset=UTF-16LE", xmlResult.metadata.get(Metadata.CONTENT_TYPE));
@@ -152,7 +152,7 @@ public class CSVParserTest extends TikaTest {
"brown,\"la\"zy\"\n" +
"brown,\"dog\n").getBytes(StandardCharsets.UTF_8);
Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test.csv");
+ metadata.set(Metadata.RESOURCE_NAME_KEY, "test.csv");
XMLResult xmlResult = getXML(new ByteArrayInputStream(csv), PARSER, metadata);
assertEquals("tab", xmlResult.metadata.get(CSVParser.DELIMITER));
assertEquals("text/tsv; charset=ISO-8859-1", xmlResult.metadata.get(Metadata.CONTENT_TYPE));