Author: nick
Date: Fri May 22 16:53:17 2015
New Revision: 1681160
URL: http://svn.apache.org/r1681160
Log:
TIKA-1632 Add some test zlib compressed files, another magic for it, and
detection unit tests
Added:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib
(with props)
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib0
(with props)
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib5
(with props)
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib9
(with props)
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1681160&r1=1681159&r2=1681160&view=diff
==============================================================================
---
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
(original)
+++
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
Fri May 22 16:53:17 2015
@@ -4009,8 +4009,10 @@
<_comment>ZLIB Compressed Data Format</_comment>
<tika:link>http://tools.ietf.org/html/rfc1950</tika:link>
<magic priority="45">
- <!-- Low compression -->
+ <!-- Low/No compression -->
<match value="\x78\x01" type="string" offset="0" />
+ <!-- Medium compression -->
+ <match value="\x78\x5e" type="string" offset="0" />
<!-- Default compression -->
<match value="\x78\x9c" type="string" offset="0" />
<!-- Best compression -->
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=1681160&r1=1681159&r2=1681160&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
Fri May 22 16:53:17 2015
@@ -921,6 +921,15 @@ public class TestMimeTypes {
assertTypeByNameAndData("application/cbor", "NUTCH-1997.cbor");
assertTypeByData("application/cbor", "NUTCH-1997.cbor");
}
+
+ @Test
+ public void testZLIB() throws IOException {
+ // ZLIB encoded versions of testTXT.txt
+ assertTypeByData("application/zlib", "testTXT.zlib");
+ assertTypeByData("application/zlib", "testTXT.zlib0");
+ assertTypeByData("application/zlib", "testTXT.zlib5");
+ assertTypeByData("application/zlib", "testTXT.zlib9");
+ }
private void assertText(byte[] prefix) throws IOException {
assertMagic("text/plain", prefix);
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib?rev=1681160&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib
------------------------------------------------------------------------------
svn:mime-type = application/zlib
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib0
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib0?rev=1681160&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib0
------------------------------------------------------------------------------
svn:mime-type = application/zlib
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib5
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib5?rev=1681160&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib5
------------------------------------------------------------------------------
svn:mime-type = application/zlib
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib9
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib9?rev=1681160&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT.zlib9
------------------------------------------------------------------------------
svn:mime-type = application/zlib
