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 2018/11/20 20:35:14 UTC
[tika] branch master updated: TIKA-2785 -- fix unit test that is
failing in Linux but not Windows, take 3
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push:
new f2e1937 TIKA-2785 -- fix unit test that is failing in Linux but not Windows, take 3
f2e1937 is described below
commit f2e1937005545da5b9d23683aa0f1c82da1721cc
Author: TALLISON <ta...@apache.org>
AuthorDate: Tue Nov 20 15:34:57 2018 -0500
TIKA-2785 -- fix unit test that is failing in Linux but not Windows, take 3
---
.../java/org/apache/tika/server/CXFTestBase.java | 2 +-
.../org/apache/tika/server/TikaResourceTest.java | 27 ++++++++++++-
.../tika/server/TikaServerIntegrationTest.java | 44 ----------------------
3 files changed, 27 insertions(+), 46 deletions(-)
diff --git a/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java b/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
index 57220d4..32dd235 100644
--- a/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
+++ b/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
@@ -84,7 +84,7 @@ public abstract class CXFTestBase {
this.tika = new TikaConfig(getClass().getResourceAsStream("tika-config-for-server-tests.xml"));
TikaResource.init(tika,
new CommonsDigester(DIGESTER_READ_LIMIT, "md5,sha1:32"),
- new DefaultInputStreamFactory(), new ServerStatus());
+ new DefaultInputStreamFactory(), new ServerStatus(true));
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
setUpResources(sf);
setUpProviders(sf);
diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
index 813e8c4..2ca357c 100644
--- a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
+++ b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.core.Response;
import java.io.InputStream;
-import java.net.SocketException;
import java.util.ArrayList;
import java.util.List;
@@ -42,6 +41,7 @@ public class TikaResourceTest extends CXFTestBase {
public static final String TEST_DOC = "test.doc";
public static final String TEST_PASSWORD_PROTECTED = "password.xls";
private static final String TEST_RECURSIVE_DOC = "test_recursive_embedded.docx";
+ private static final String TEST_OOM = "mock/fake_oom.xml";
private static final String STREAM_CLOSED_FAULT = "java.io.IOException: Stream Closed";
@@ -396,4 +396,29 @@ public class TikaResourceTest extends CXFTestBase {
assertEquals(200, response.getStatus());
}
+
+ @Test
+ public void testOOMInLegacyMode() throws Exception {
+
+ Response response = null;
+ try {
+ response = WebClient
+ .create(endPoint + TIKA_PATH)
+ .accept("text/plain")
+ .put(ClassLoader
+ .getSystemResourceAsStream(TEST_OOM));
+ } catch (Exception e) {
+ //oom may or may not cause an exception depending
+ //on the timing
+ }
+
+ response = WebClient
+ .create(endPoint + TIKA_PATH)
+ .accept("text/plain")
+ .put(ClassLoader
+ .getSystemResourceAsStream(TEST_RECURSIVE_DOC));
+ String responseMsg = getStringFromInputStream((InputStream) response.getEntity());
+
+ assertContains("plundered our seas", responseMsg);
+ }
}
diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaServerIntegrationTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaServerIntegrationTest.java
index c67129e..c78610c 100644
--- a/tika-server/src/test/java/org/apache/tika/server/TikaServerIntegrationTest.java
+++ b/tika-server/src/test/java/org/apache/tika/server/TikaServerIntegrationTest.java
@@ -142,50 +142,6 @@ public class TikaServerIntegrationTest extends TikaTest {
}
@Test
- public void testOOMInLegacyMode() throws Exception {
-
- Thread serverThread = new Thread() {
- @Override
- public void run() {
- TikaServerCli.main(
- new String[]{
- "-p", INTEGRATION_TEST_PORT
- });
- }
- };
- serverThread.start();
- awaitServerStartup();
-
- Response response = null;
- try {
- response = WebClient
- .create(endPoint + META_PATH)
- .accept("application/json")
- .put(ClassLoader
- .getSystemResourceAsStream(TEST_OOM));
- } catch (Exception e) {
- //oom may or may not cause an exception depending
- //on the timing
- }
-
- try {
- response = WebClient
- .create(endPoint + META_PATH)
- .accept("application/json")
- .put(ClassLoader
- .getSystemResourceAsStream(TEST_RECURSIVE_DOC));
- Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
- List<Metadata> metadataList = JsonMetadataList.fromJson(reader);
- assertEquals(12, metadataList.size());
- assertEquals("Microsoft Office Word", metadataList.get(0).get(OfficeOpenXMLExtended.APPLICATION));
- assertContains("plundered our seas", metadataList.get(6).get("X-TIKA:content"));
-
- } finally {
- serverThread.interrupt();
- }
- }
-
- @Test
public void testOOM() throws Exception {
Thread serverThread = new Thread() {