You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2015/08/20 11:59:17 UTC
svn commit: r1696746 - in
/tika/trunk/tika-parsers/src/test/java/org/apache/tika: embedder/ mime/
parser/ parser/chm/ parser/code/ parser/geo/topic/ parser/html/
parser/image/ parser/jdbc/ parser/mail/ parser/microsoft/
parser/microsoft/ooxml/ parser/m...
Author: nick
Date: Thu Aug 20 09:59:17 2015
New Revision: 1696746
URL: http://svn.apache.org/r1696746
Log:
TIKA-1710 patch from Yaniv Kunda - Use Commons IO instead of the Tika Core IO copies, and java.nio.charset.StandardCharsets
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.embedder;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -38,7 +39,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TemporaryResources;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
@@ -59,7 +59,7 @@ public class ExternalEmbedderTest {
protected static final DateFormat EXPECTED_METADATA_DATE_FORMATTER =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
- protected static final String DEFAULT_CHARSET = IOUtils.UTF_8.name();
+ protected static final String DEFAULT_CHARSET = UTF_8.name();
private static final String COMMAND_METADATA_ARGUMENT_DESCRIPTION = "dc:description";
private static final String TEST_TXT_PATH = "/test-documents/testTXT.txt";
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java Thu Aug 20 09:59:17 2015
@@ -17,6 +17,9 @@
package org.apache.tika.mime;
// Junit imports
+import static java.nio.charset.StandardCharsets.UTF_16BE;
+import static java.nio.charset.StandardCharsets.UTF_16LE;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
@@ -570,17 +573,17 @@ public class TestMimeTypes {
@Test
public void testXmlAndHtmlDetection() throws Exception {
assertTypeByData("application/xml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><records><record/></records>"
- .getBytes("UTF-8"));
+ .getBytes(UTF_8));
assertTypeByData("application/xml", "\uFEFF<?xml version=\"1.0\" encoding=\"UTF-16\"?><records><record/></records>"
- .getBytes("UTF-16LE"));
+ .getBytes(UTF_16LE));
assertTypeByData("application/xml", "\uFEFF<?xml version=\"1.0\" encoding=\"UTF-16\"?><records><record/></records>"
- .getBytes("UTF-16BE"));
+ .getBytes(UTF_16BE));
assertTypeByData("application/xml", "<!-- XML without processing instructions --><records><record/></records>"
- .getBytes("UTF-8"));
+ .getBytes(UTF_8));
assertTypeByData("text/html", "<html><body>HTML</body></html>"
- .getBytes("UTF-8"));
+ .getBytes(UTF_8));
assertTypeByData("text/html", "<!-- HTML comment --><html><body>HTML</body></html>"
- .getBytes("UTF-8"));
+ .getBytes(UTF_8));
}
@Test
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -33,7 +34,6 @@ import java.util.zip.ZipOutputStream;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.detect.Detector;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.XMPDM;
@@ -390,7 +390,7 @@ public class AutoDetectParserTest {
public void testSpecificParserList() throws Exception {
AutoDetectParser parser = new AutoDetectParser(new MyDetector(), new MyParser());
- InputStream is = new ByteArrayInputStream("test".getBytes(IOUtils.UTF_8));
+ InputStream is = new ByteArrayInputStream("test".getBytes(UTF_8));
Metadata metadata = new Metadata();
parser.parse(is, new BodyContentHandler(), metadata, new ParseContext());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java Thu Aug 20 09:59:17 2015
@@ -19,11 +19,12 @@ package org.apache.tika.parser;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.Reader;
-import org.apache.tika.io.IOUtils;
+
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.junit.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
public class ParsingReaderTest {
@@ -31,7 +32,7 @@ public class ParsingReaderTest {
@Test
public void testPlainText() throws Exception {
String data = "test content";
- InputStream stream = new ByteArrayInputStream(data.getBytes(IOUtils.UTF_8));
+ InputStream stream = new ByteArrayInputStream(data.getBytes(UTF_8));
Reader reader = new ParsingReader(stream, "test.txt");
assertEquals('t', reader.read());
assertEquals('e', reader.read());
@@ -54,7 +55,7 @@ public class ParsingReaderTest {
@Test
public void testXML() throws Exception {
String data = "<p>test <span>content</span></p>";
- InputStream stream = new ByteArrayInputStream(data.getBytes(IOUtils.UTF_8));
+ InputStream stream = new ByteArrayInputStream(data.getBytes(UTF_8));
Reader reader = new ParsingReader(stream, "test.xml");
assertEquals(' ', (char) reader.read());
assertEquals('t', (char) reader.read());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java Thu Aug 20 09:59:17 2015
@@ -28,8 +28,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.commons.io.IOUtils;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaMetadataKeys;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java Thu Aug 20 09:59:17 2015
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertTrue;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -68,7 +68,7 @@ public class TestChmBlockInfo {
int indexOfControlData = chmDirListCont.getControlDataIndex();
int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data,
- ChmConstants.LZXC.getBytes(IOUtils.UTF_8));
+ ChmConstants.LZXC.getBytes(UTF_8));
byte[] dir_chunk = null;
if (indexOfResetTable > 0) {
// dir_chunk = Arrays.copyOfRange( data, indexOfResetTable,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
@@ -150,7 +151,7 @@ public class TestChmExtraction {
}
//validate html
- String html = new String(data, "ISO-8859-1");
+ String html = new String(data, ISO_8859_1);
if (! htmlPairP.matcher(html).find()) {
System.err.println(lowName + " is invalid.");
System.err.println(html);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java Thu Aug 20 09:59:17 2015
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
import org.apache.tika.parser.chm.core.ChmCommons;
@@ -137,7 +137,7 @@ public class TestChmItspHeader {
@Test
public void testGetSignature() {
assertEquals(TestParameters.VP_ISTP_SIGNATURE, new String(
- chmItspHeader.getSignature(), IOUtils.UTF_8));
+ chmItspHeader.getSignature(), UTF_8));
}
@Test
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java Thu Aug 20 09:59:17 2015
@@ -17,11 +17,11 @@
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -65,7 +65,7 @@ public class TestChmLzxState {
ChmConstants.CONTROL_DATA);
int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data,
- ChmConstants.LZXC.getBytes(IOUtils.UTF_8));
+ ChmConstants.LZXC.getBytes(UTF_8));
byte[] dir_chunk = null;
if (indexOfResetTable > 0) {
// dir_chunk = Arrays.copyOfRange( data, indexOfResetTable,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java Thu Aug 20 09:59:17 2015
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -61,7 +61,7 @@ public class TestChmLzxcControlData {
int indexOfControlData = chmDirListCont.getControlDataIndex();
int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data,
- ChmConstants.LZXC.getBytes(IOUtils.UTF_8));
+ ChmConstants.LZXC.getBytes(UTF_8));
byte[] dir_chunk = null;
if (indexOfResetTable > 0) {
// dir_chunk = Arrays.copyOfRange( data, indexOfResetTable,
@@ -130,14 +130,14 @@ public class TestChmLzxcControlData {
@Test
public void testGetSignature() {
assertEquals(
- TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(IOUtils.UTF_8).length,
+ TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(UTF_8).length,
chmLzxcControlData.getSignature().length);
}
@Test
public void testGetSignaure() {
assertEquals(
- TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(IOUtils.UTF_8).length,
+ TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(UTF_8).length,
chmLzxcControlData.getSignature().length);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java Thu Aug 20 09:59:17 2015
@@ -17,10 +17,10 @@
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -60,7 +60,7 @@ public class TestChmLzxcResetTable {
int indexOfControlData = chmDirListCont.getControlDataIndex();
int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data,
- ChmConstants.LZXC.getBytes(IOUtils.UTF_8));
+ ChmConstants.LZXC.getBytes(UTF_8));
byte[] dir_chunk = null;
if (indexOfResetTable > 0) {
// dir_chunk = Arrays.copyOfRange( data, indexOfResetTable,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java Thu Aug 20 09:59:17 2015
@@ -18,7 +18,8 @@ package org.apache.tika.parser.chm;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.tika.io.IOUtils;
+
+import org.apache.commons.io.IOUtils;
import org.apache.tika.parser.chm.core.ChmCommons.EntryType;
/**
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java Thu Aug 20 09:59:17 2015
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.chm;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmPmglHeader;
import org.apache.tika.parser.chm.core.ChmCommons;
import org.apache.tika.parser.chm.core.ChmConstants;
@@ -47,7 +47,7 @@ public class TestPmglHeader {
@Test
public void testChmPmglHeaderGet() {
assertEquals(TestParameters.VP_PMGL_SIGNATURE, new String(
- chmPmglHeader.getSignature(), IOUtils.UTF_8));
+ chmPmglHeader.getSignature(), UTF_8));
}
@Test
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.code;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -24,7 +25,6 @@ import java.io.ByteArrayInputStream;
import java.util.Set;
import org.apache.tika.TikaTest;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.mime.MediaType;
@@ -63,7 +63,7 @@ public class SourceCodeParserTest extend
assertTrue(textContent.length() > 0);
assertTrue(textContent.indexOf("html") < 0);
- textContent = getText(new ByteArrayInputStream("public class HelloWorld {}".getBytes(IOUtils.UTF_8)), sourceCodeParser, createMetadata("text/x-java-source"));
+ textContent = getText(new ByteArrayInputStream("public class HelloWorld {}".getBytes(UTF_8)), sourceCodeParser, createMetadata("text/x-java-source"));
assertTrue(textContent.length() > 0);
assertTrue(textContent.indexOf("html") < 0);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java Thu Aug 20 09:59:17 2015
@@ -17,6 +17,7 @@
package org.apache.tika.parser.geo.topic;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -25,6 +26,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
@@ -51,7 +53,7 @@ public class GeoParserTest {
GeoParserConfig config = new GeoParserConfig();
context.set(GeoParserConfig.class, config);
- InputStream s = new ByteArrayInputStream(text.getBytes("UTF-8"));
+ InputStream s = new ByteArrayInputStream(text.getBytes(UTF_8));
/* if it's not available no tests to run */
if (!((GeoParser) geoparser).isAvailable())
return;
@@ -79,7 +81,7 @@ public class GeoParserTest {
ParseContext context = new ParseContext();
GeoParserConfig config = new GeoParserConfig();
context.set(GeoParserConfig.class, config);
- geoparser.parse(new ByteArrayInputStream(text.getBytes("UTF-8")),
+ geoparser.parse(new ByteArrayInputStream(text.getBytes(UTF_8)),
new BodyContentHandler(), metadata, context);
assertNull(metadata.get("Geographic_NAME"));
assertNull(metadata.get("Geographic_LONGITUDE"));
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,9 @@
*/
package org.apache.tika.parser.html;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -37,7 +40,6 @@ import java.util.regex.Pattern;
import org.apache.tika.Tika;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Geographic;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -164,7 +166,7 @@ public class HtmlParserTest {
public void testCharactersDirectlyUnderBodyElement() throws Exception {
String test = "<html><body>test</body></html>";
String content = new Tika().parseToString(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)));
+ new ByteArrayInputStream(test.getBytes(UTF_8)));
assertEquals("test", content);
}
@@ -222,7 +224,7 @@ public class HtmlParserTest {
+ "<body><a href=\"" + relative + "\">test</a></body></html>";
final List<String> links = new ArrayList<String>();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new DefaultHandler() {
@Override
public void startElement(
@@ -248,7 +250,7 @@ public class HtmlParserTest {
String test =
"<html><body><table><tr><td>a</td><td>b</td></table></body></html>";
String content = new Tika().parseToString(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)));
+ new ByteArrayInputStream(test.getBytes(UTF_8)));
assertContains("a", content);
assertContains("b", content);
assertFalse(content.contains("ab"));
@@ -268,7 +270,7 @@ public class HtmlParserTest {
+ "</head><body></body></html>";
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING));
}
@@ -286,7 +288,7 @@ public class HtmlParserTest {
+ "</head><body></body></html>";
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING));
}
@@ -302,7 +304,7 @@ public class HtmlParserTest {
"<html><head><title>\u017d</title></head><body></body></html>";
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("\u017d", metadata.get(TikaCoreProperties.TITLE));
}
@@ -320,14 +322,14 @@ public class HtmlParserTest {
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING));
metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "text/html; charset=ISO-8859-1");
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING));
}
@@ -344,7 +346,7 @@ public class HtmlParserTest {
public void testLineBreak() throws Exception {
String test = "<html><body><div>foo<br>bar</div>baz</body></html>";
String text = new Tika().parseToString(
- new ByteArrayInputStream(test.getBytes("US-ASCII")));
+ new ByteArrayInputStream(test.getBytes(US_ASCII)));
String[] parts = text.trim().split("\\s+");
assertEquals(3, parts.length);
assertEquals("foo", parts[0]);
@@ -363,7 +365,7 @@ public class HtmlParserTest {
Metadata metadata = new Metadata();
metadata.add(Metadata.CONTENT_LANGUAGE, "en");
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("en", metadata.get(Metadata.CONTENT_LANGUAGE));
@@ -383,7 +385,7 @@ public class HtmlParserTest {
+ "</head><body></body></html>";
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test1.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test1.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING));
@@ -395,7 +397,7 @@ public class HtmlParserTest {
+ "</head><body></body></html>";
metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test2.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test2.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING));
}
@@ -413,14 +415,14 @@ public class HtmlParserTest {
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING));
metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "charset=ISO-8859-1;text/html");
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING));
}
@@ -478,7 +480,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -516,7 +518,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -538,7 +540,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -561,7 +563,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -585,7 +587,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -609,7 +611,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -636,7 +638,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), metadata, new ParseContext());
String result = sw.toString();
@@ -659,7 +661,7 @@ public class HtmlParserTest {
StringWriter sw1 = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test1.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test1.getBytes(UTF_8)),
makeHtmlTransformer(sw1), new Metadata(), new ParseContext());
String result = sw1.toString();
@@ -680,7 +682,7 @@ public class HtmlParserTest {
StringWriter sw2 = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test2.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test2.getBytes(UTF_8)),
makeHtmlTransformer(sw2), new Metadata(), new ParseContext());
result = sw2.toString();
@@ -734,7 +736,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
makeHtmlTransformer(sw), new Metadata(), new ParseContext());
String result = sw.toString();
@@ -817,7 +819,7 @@ public class HtmlParserTest {
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- new ByteArrayInputStream(html.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(html.getBytes(UTF_8)),
makeHtmlTransformer(sw), metadata, parseContext);
String result = sw.toString();
@@ -838,7 +840,7 @@ public class HtmlParserTest {
BodyContentHandler handler = new BodyContentHandler();
new HtmlParser().parse(
- new ByteArrayInputStream(html.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(html.getBytes(UTF_8)),
handler, new Metadata(), new ParseContext());
// Make sure we get <tab>, "one", newline, newline
@@ -894,7 +896,7 @@ public class HtmlParserTest {
+ "</head><body></body></html>";
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test1.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test1.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("some description", metadata.get("og:description"));
assertTrue(metadata.isMultiValued("og:image"));
@@ -932,7 +934,7 @@ public class HtmlParserTest {
LinkContentHandler linkContentHandler = new LinkContentHandler();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test.getBytes(ISO_8859_1)),
linkContentHandler, metadata, new ParseContext());
// Expect no anchor text
@@ -946,7 +948,7 @@ public class HtmlParserTest {
parseContext.set(Schema.class, schema);
linkContentHandler = new LinkContentHandler();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test.getBytes(ISO_8859_1)),
linkContentHandler, metadata, parseContext);
// Expect anchor text
@@ -1037,7 +1039,7 @@ public class HtmlParserTest {
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
//Expecting first title to be set in meta data and second one to be ignored.
@@ -1053,7 +1055,7 @@ public class HtmlParserTest {
Metadata metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/html; charset=UTF-ELEVEN", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT));
assertEquals("text/html; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE));
@@ -1063,7 +1065,7 @@ public class HtmlParserTest {
metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("application/pdf", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT));
assertEquals("text/html; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE));
@@ -1074,7 +1076,7 @@ public class HtmlParserTest {
metadata = new Metadata();
new HtmlParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("application/ms-word", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT));
assertEquals("text/html; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE));
@@ -1091,7 +1093,7 @@ public class HtmlParserTest {
"<title>title</title></head><body>body</body></html>";
Metadata metadata = new Metadata();
new AutoDetectParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/html; charset=iso-8859-1", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT));
@@ -1105,7 +1107,7 @@ public class HtmlParserTest {
"<title>title</title></head><body>body</body></html>";
metadata = new Metadata();
new AutoDetectParser().parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/html; charset=iso-NUMBER_SEVEN", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT));
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java Thu Aug 20 09:59:17 2015
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEqu
import java.io.InputStream;
-import org.apache.tika.io.IOUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java Thu Aug 20 09:59:17 2015
@@ -17,6 +17,7 @@ package org.apache.tika.parser.jdbc;
* limitations under the License.
*/
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
@@ -26,10 +27,10 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.io.IOUtils;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.EmbeddedResourceHandler;
import org.apache.tika.extractor.ParserContainerExtractor;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Database;
import org.apache.tika.metadata.Metadata;
@@ -47,7 +48,6 @@ import org.xml.sax.ContentHandler;
public class SQLite3ParserTest extends TikaTest {
private final static String TEST_FILE_NAME = "testSqlite3b.db";
private final static String TEST_FILE1 = "/test-documents/" + TEST_FILE_NAME;
- ;
@Test
public void testBasic() throws Exception {
@@ -189,7 +189,7 @@ public class SQLite3ParserTest extends T
String[] strings = new String[4];
for (int i = 1; i < byteCopier.bytes.size(); i++) {
byte[] byteArr = byteCopier.bytes.get(i);
- String s = new String(byteArr, 0, Math.min(byteArr.length, 1000), "UTF-8");
+ String s = new String(byteArr, 0, Math.min(byteArr.length, 1000), UTF_8);
strings[i] = s;
}
byte[] oleBytes = new byte[]{
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.mail;
+import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -221,7 +222,7 @@ public class RFC822ParserTest extends Ti
"really really really really really really long name ");
}
String name = inputBuilder.toString();
- byte[] data = ("From: " + name + "\r\n\r\n").getBytes("US-ASCII");
+ byte[] data = ("From: " + name + "\r\n\r\n").getBytes(US_ASCII);
Parser parser = new RFC822Parser();
ContentHandler handler = new DefaultHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java Thu Aug 20 09:59:17 2015
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertTru
import java.io.InputStream;
import java.util.List;
+import org.apache.commons.io.IOUtils;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.EncryptedDocumentException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.OfficeOpenXMLExtended;
import org.apache.tika.metadata.TikaCoreProperties;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.microsoft.ooxml;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -33,7 +34,6 @@ import java.util.Map;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.EncryptedDocumentException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Office;
@@ -1069,13 +1069,13 @@ public class OOXMLParserTest extends Tik
//grab stderr
ByteArrayOutputStream errContent = new ByteArrayOutputStream();
- System.setErr(new PrintStream(errContent, true, IOUtils.UTF_8.name()));
+ System.setErr(new PrintStream(errContent, true, UTF_8.name()));
parser.parse(input, handler, metadata, context);
//return stderr
System.setErr(origErr);
- String err = errContent.toString(IOUtils.UTF_8.name());
+ String err = errContent.toString(UTF_8.name());
assertTrue(err.length() == 0);
input.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java Thu Aug 20 09:59:17 2015
@@ -17,6 +17,7 @@ package org.apache.tika.parser.mock;
* limitations under the License.
*/
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -27,9 +28,9 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.util.Date;
+import org.apache.commons.io.IOUtils;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
@@ -57,8 +58,8 @@ public class MockParserTest extends Tika
PrintStream err = System.err;
ByteArrayOutputStream outBos = new ByteArrayOutputStream();
ByteArrayOutputStream errBos = new ByteArrayOutputStream();
- PrintStream tmpOut = new PrintStream(outBos, true, IOUtils.UTF_8.toString());
- PrintStream tmpErr = new PrintStream(errBos, true, IOUtils.UTF_8.toString());
+ PrintStream tmpOut = new PrintStream(outBos, true, UTF_8.toString());
+ PrintStream tmpErr = new PrintStream(errBos, true, UTF_8.toString());
System.setOut(tmpOut);
System.setErr(tmpErr);
try {
@@ -68,10 +69,10 @@ public class MockParserTest extends Tika
System.setOut(out);
System.setErr(err);
}
- String outString = new String(outBos.toByteArray(), IOUtils.UTF_8);
+ String outString = new String(outBos.toByteArray(), UTF_8);
assertContains("writing to System.out", outString);
- String errString = new String(errBos.toByteArray(), IOUtils.UTF_8);
+ String errString = new String(errBos.toByteArray(), UTF_8);
assertContains("writing to System.err", errString);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.mp3;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -25,7 +26,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.tika.io.IOUtils;
+
import org.junit.After;
import org.junit.Test;
@@ -157,7 +158,7 @@ public class MpegStreamTest
public void testSkipNoCurrentHeader() throws IOException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- bos.write("This is a test".getBytes(IOUtils.UTF_8));
+ bos.write("This is a test".getBytes(UTF_8));
ByteArrayInputStream in = new ByteArrayInputStream(bos.toByteArray());
stream = new MpegStream(in);
assertFalse("Wrong result", stream.skipFrame());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java Thu Aug 20 09:59:17 2015
@@ -31,6 +31,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.io.IOUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.tika.TikaTest;
@@ -40,7 +41,6 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.extractor.ContainerExtractor;
import org.apache.tika.extractor.DocumentSelector;
import org.apache.tika.extractor.ParserContainerExtractor;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.OfficeOpenXMLCore;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.pkg;
+import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
import java.io.InputStream;
@@ -98,6 +99,6 @@ public class Bzip2ParserTest extends Abs
assertEquals(null, tracker.modifiedAts.get(0));
// Tar file starts with the directory name
- assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, "ASCII"));
+ assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, US_ASCII));
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.pkg;
+import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
import java.io.InputStream;
@@ -96,7 +97,7 @@ public class GzipParserTest extends Abst
assertEquals(null, tracker.modifiedAts.get(0));
// Tar file starts with the directory name
- assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, "ASCII"));
+ assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, US_ASCII));
}
@Test
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java Thu Aug 20 09:59:17 2015
@@ -32,11 +32,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.commons.io.FilenameUtils;
import org.apache.tika.Tika;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.ContainerExtractor;
import org.apache.tika.extractor.ParserContainerExtractor;
-import org.apache.tika.io.FilenameUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Office;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java Thu Aug 20 09:59:17 2015
@@ -13,6 +13,9 @@
*/
package org.apache.tika.parser.strings;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_16;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
@@ -34,11 +37,11 @@ public class Latin1StringsParserTest {
String testStr = "These are Latin1 accented scripts: \u00C2 \u00C3 \u00C9 \u00DC \u00E2 \u00E3 \u00E9 \u00FC";
String smallStr = "ab";
- byte[] iso8859Bytes = testStr.getBytes("ISO-8859-1");
- byte[] utf8Bytes = testStr.getBytes("UTF-8");
- byte[] utf16Bytes = testStr.getBytes("UTF-16");
+ byte[] iso8859Bytes = testStr.getBytes(ISO_8859_1);
+ byte[] utf8Bytes = testStr.getBytes(UTF_8);
+ byte[] utf16Bytes = testStr.getBytes(UTF_16);
byte[] zeros = new byte[10];
- byte[] smallString = smallStr.getBytes("ISO-8859-1");
+ byte[] smallString = smallStr.getBytes(ISO_8859_1);
byte[] trashBytes = { 0x00, 0x01, 0x02, 0x03, 0x1E, 0x1F, (byte) 0xFF };
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java?rev=1696746&r1=1696745&r2=1696746&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java Thu Aug 20 09:59:17 2015
@@ -16,6 +16,8 @@
*/
package org.apache.tika.parser.txt;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -23,7 +25,6 @@ import static org.junit.Assert.assertNul
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.ParseContext;
@@ -48,7 +49,7 @@ public class TXTParserTest {
Metadata metadata = new Metadata();
StringWriter writer = new StringWriter();
parser.parse(
- new ByteArrayInputStream(text.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(text.getBytes(ISO_8859_1)),
new WriteOutContentHandler(writer),
metadata,
new ParseContext());
@@ -73,7 +74,7 @@ public class TXTParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
parser.parse(
- new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(text.getBytes(UTF_8)),
handler, metadata, new ParseContext());
assertEquals("text/plain; charset=UTF-8", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated
@@ -159,14 +160,14 @@ public class TXTParserTest {
Metadata metadata = new Metadata();
parser.parse(
- new ByteArrayInputStream(test2.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test2.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated
metadata.set(Metadata.CONTENT_TYPE, "text/plain; charset=ISO-8859-15");
parser.parse(
- new ByteArrayInputStream(test2.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test2.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/plain; charset=ISO-8859-15", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated
@@ -185,7 +186,7 @@ public class TXTParserTest {
Metadata metadata = new Metadata();
parser.parse(
- new ByteArrayInputStream(test2.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test2.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated
@@ -193,7 +194,7 @@ public class TXTParserTest {
metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "text/html; charset=ISO-8859-15");
parser.parse(
- new ByteArrayInputStream(test2.getBytes("ISO-8859-1")),
+ new ByteArrayInputStream(test2.getBytes(ISO_8859_1)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/plain; charset=ISO-8859-15", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated
@@ -224,7 +225,7 @@ public class TXTParserTest {
metadata.set(TikaCoreProperties.LANGUAGE, "en");
parser.parse(
- new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(test.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("en", metadata.get(TikaCoreProperties.LANGUAGE));
@@ -259,7 +260,7 @@ public class TXTParserTest {
metadata = new Metadata();
writer = new StringWriter();
parser.parse(
- new ByteArrayInputStream("<html><body>hello world</body></html>".getBytes("ISO-8859-1")),
+ new ByteArrayInputStream("<html><body>hello world</body></html>".getBytes(ISO_8859_1)),
new WriteOutContentHandler(writer),
metadata,
new ParseContext());
@@ -278,7 +279,7 @@ public class TXTParserTest {
Metadata metadata = new Metadata();
parser.parse(
- new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(text.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE));
@@ -286,7 +287,7 @@ public class TXTParserTest {
// we get back (see TIKA-868)
metadata.set(Metadata.CONTENT_TYPE, "application/binary; charset=UTF-8");
parser.parse(
- new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)),
+ new ByteArrayInputStream(text.getBytes(UTF_8)),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("text/plain; charset=UTF-8", metadata.get(Metadata.CONTENT_TYPE));
}