svn commit: r1584546 - in /tika/trunk/tika-server/src/test/java/org/apache/tika/server: CXFTestBase.java UnpackerResourceTest.java

[th...@apache.org]

Author: thaichat04
Date: Fri Apr  4 07:39:11 2014
New Revision: 1584546

URL: http://svn.apache.org/r1584546
Log:
Reput again failed test causing by compress-1.7

Modified:
    tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
    tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java

Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java?rev=1584546&r1=1584545&r2=1584546&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java Fri Apr  4 07:39:11 2014
@@ -27,6 +27,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.utils.IOUtils;
@@ -71,6 +73,22 @@ public class CXFTestBase {
 		return bos.toString("UTF-8");
 	}
 
+	protected Map<String, String> readArchiveFromStream(ArchiveInputStream zip) throws IOException {
+        Map<String, String> data = new HashMap<String, String>();
+        while (true) {
+            ArchiveEntry entry = zip.getNextEntry();
+            if (entry == null) {
+                break;
+            }
+
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            IOUtils.copy(zip, bos);
+            data.put(entry.getName(), DigestUtils.md5Hex(bos.toByteArray()));
+        }
+
+        return data;
+	}
+
 	private File writeTemporaryArchiveFile(InputStream inputStream, String archiveType) throws IOException {
 	  File tempFile = File.createTempFile("tmp-", "." + archiveType);
       IOUtils.copy(inputStream, new FileOutputStream(tempFile));

Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java?rev=1584546&r1=1584545&r2=1584546&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java Fri Apr  4 07:39:11 2014
@@ -29,6 +29,7 @@ import java.util.Map;
 
 import javax.ws.rs.core.Response;
 
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxrs.JAXRSBindingFactory;
@@ -37,7 +38,6 @@ import org.apache.cxf.jaxrs.client.WebCl
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class UnpackerResourceTest extends CXFTestBase {
@@ -190,14 +190,13 @@ public class UnpackerResourceTest extend
 		assertEquals(XSL_IMAGE2_MD5, data.get("1.jpg"));
 	}
 
-	@Ignore("Tar format correct, but unable reading by TarArchiveInputStream (COMPRESS-262)")
 	@Test
 	public void testTarDocPicture() throws Exception {
 		Response response = WebClient.create(endPoint + UNPACKER_PATH)
 				.type(APPLICATION_MSWORD).accept("application/x-tar")
 				.put(ClassLoader.getSystemResourceAsStream(TEST_DOC_WAV));
 
-		Map<String, String> data = readZipArchive((InputStream) response.getEntity());
+		Map<String, String> data = readArchiveFromStream(new TarArchiveInputStream((InputStream) response.getEntity()));
 
 		assertEquals(JPG_MD5, data.get(JPG_NAME));
 	}