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 2014/12/15 07:04:29 UTC
svn commit: r1645570 - in
/tika/trunk/tika-server/src/test/java/org/apache/tika/server:
MetadataResourceTest.java TikaResourceTest.java
Author: nick
Date: Mon Dec 15 06:04:29 2014
New Revision: 1645570
URL: http://svn.apache.org/r1645570
Log:
Fix indents / whitespace
Modified:
tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java?rev=1645570&r1=1645569&r2=1645570&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java Mon Dec 15 06:04:29 2014
@@ -48,29 +48,29 @@ public class MetadataResourceTest extend
@Override
protected void setUpProviders(JAXRSServerFactoryBean sf) {}
- @Test
- public void testSimpleWord() throws Exception {
- Response response = WebClient
- .create(endPoint + META_PATH)
- .type("application/msword")
- .accept("text/csv")
- .put(ClassLoader
- .getSystemResourceAsStream(TikaResourceTest.TEST_DOC));
-
- Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8");
-
- CSVReader csvReader = new CSVReader(reader);
-
- Map<String, String> metadata = new HashMap<String, String>();
-
- String[] nextLine;
- while ((nextLine = csvReader.readNext()) != null) {
- metadata.put(nextLine[0], nextLine[1]);
- }
- csvReader.close();
-
- assertNotNull(metadata.get("Author"));
- assertEquals("Maxim Valyanskiy", metadata.get("Author"));
- }
+ @Test
+ public void testSimpleWord() throws Exception {
+ Response response = WebClient
+ .create(endPoint + META_PATH)
+ .type("application/msword")
+ .accept("text/csv")
+ .put(ClassLoader
+ .getSystemResourceAsStream(TikaResourceTest.TEST_DOC));
+
+ Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8");
+
+ CSVReader csvReader = new CSVReader(reader);
+
+ Map<String, String> metadata = new HashMap<String, String>();
+
+ String[] nextLine;
+ while ((nextLine = csvReader.readNext()) != null) {
+ metadata.put(nextLine[0], nextLine[1]);
+ }
+ csvReader.close();
+
+ assertNotNull(metadata.get("Author"));
+ assertEquals("Maxim Valyanskiy", metadata.get("Author"));
+ }
}
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java?rev=1645570&r1=1645569&r2=1645570&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java Mon Dec 15 06:04:29 2014
@@ -34,6 +34,7 @@ public class TikaResourceTest extends CX
private static final String TIKA_PATH = "/tika";
public static final String TEST_DOC = "test.doc";
public static final String TEST_XLSX = "16637.xlsx";
+ public static final String TEST_PASSWORD_PROTECTED = "password.xls";
private static final int UNPROCESSEABLE = 422;
@Override
@@ -46,99 +47,99 @@ public class TikaResourceTest extends CX
@Override
protected void setUpProviders(JAXRSServerFactoryBean sf) {}
- @Test
- public void testHelloWorld() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("text/plain").accept("text/plain").get();
- assertEquals(TikaResource.GREETING,
- getStringFromInputStream((InputStream) response.getEntity()));
- }
-
- @Test
- public void testSimpleWord() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("application/msword")
- .accept("text/plain")
- .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
- String responseMsg = getStringFromInputStream((InputStream) response
- .getEntity());
- assertTrue(responseMsg.contains("test"));
- }
-
- @Test
- public void testApplicationWadl() throws Exception {
- Response response = WebClient
- .create(endPoint + TIKA_PATH + "?_wadl")
- .accept("text/plain").get();
- String resp = getStringFromInputStream((InputStream) response
- .getEntity());
- assertTrue(resp.startsWith("<application"));
- }
-
- @Test
- public void testPasswordXLS() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("application/vnd.ms-excel")
- .accept("text/plain")
- .put(ClassLoader.getSystemResourceAsStream("password.xls"));
-
- assertEquals(UNPROCESSEABLE, response.getStatus());
- }
-
- @Test
- public void testSimpleWordHTML() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("application/msword")
- .accept("text/html")
- .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
- String responseMsg = getStringFromInputStream((InputStream) response
- .getEntity());
- assertTrue(responseMsg.contains("test"));
- }
-
- @Test
- public void testPasswordXLSHTML() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("application/vnd.ms-excel")
- .accept("text/html")
- .put(ClassLoader.getSystemResourceAsStream("password.xls"));
-
- assertEquals(UNPROCESSEABLE, response.getStatus());
- }
-
- @Test
- public void testSimpleWordXML() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("application/msword")
- .accept("text/xml")
- .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
- String responseMsg = getStringFromInputStream((InputStream) response
- .getEntity());
- assertTrue(responseMsg.contains("test"));
- }
-
- @Test
- public void testPasswordXLSXML() throws Exception {
- Response response = WebClient.create(endPoint + TIKA_PATH)
- .type("application/vnd.ms-excel")
- .accept("text/xml")
- .put(ClassLoader.getSystemResourceAsStream("password.xls"));
+ @Test
+ public void testHelloWorld() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("text/plain").accept("text/plain").get();
+ assertEquals(TikaResource.GREETING,
+ getStringFromInputStream((InputStream) response.getEntity()));
+ }
- assertEquals(UNPROCESSEABLE, response.getStatus());
- }
-
- @Test
- public void testSimpleWordMultipartXML() throws Exception {
- ClassLoader.getSystemResourceAsStream(TEST_DOC);
- Attachment attachmentPart =
- new Attachment("myworddoc", "application/msword", ClassLoader.getSystemResourceAsStream(TEST_DOC));
- WebClient webClient = WebClient.create(endPoint + TIKA_PATH + "/form");
- Response response = webClient.type("multipart/form-data")
- .accept("text/xml")
- .put(attachmentPart);
- String responseMsg = getStringFromInputStream((InputStream) response
- .getEntity());
- assertTrue(responseMsg.contains("test"));
- }
+ @Test
+ public void testSimpleWord() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/msword")
+ .accept("text/plain")
+ .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
+ String responseMsg = getStringFromInputStream((InputStream) response
+ .getEntity());
+ assertTrue(responseMsg.contains("test"));
+ }
+
+ @Test
+ public void testApplicationWadl() throws Exception {
+ Response response = WebClient
+ .create(endPoint + TIKA_PATH + "?_wadl")
+ .accept("text/plain").get();
+ String resp = getStringFromInputStream((InputStream) response
+ .getEntity());
+ assertTrue(resp.startsWith("<application"));
+ }
+
+ @Test
+ public void testPasswordXLS() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/vnd.ms-excel")
+ .accept("text/plain")
+ .put(ClassLoader.getSystemResourceAsStream("password.xls"));
+
+ assertEquals(UNPROCESSEABLE, response.getStatus());
+ }
+
+ @Test
+ public void testSimpleWordHTML() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/msword")
+ .accept("text/html")
+ .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
+ String responseMsg = getStringFromInputStream((InputStream) response
+ .getEntity());
+ assertTrue(responseMsg.contains("test"));
+ }
+
+ @Test
+ public void testPasswordXLSHTML() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/vnd.ms-excel")
+ .accept("text/html")
+ .put(ClassLoader.getSystemResourceAsStream("password.xls"));
+
+ assertEquals(UNPROCESSEABLE, response.getStatus());
+ }
+
+ @Test
+ public void testSimpleWordXML() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/msword")
+ .accept("text/xml")
+ .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
+ String responseMsg = getStringFromInputStream((InputStream) response
+ .getEntity());
+ assertTrue(responseMsg.contains("test"));
+ }
+
+ @Test
+ public void testPasswordXLSXML() throws Exception {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/vnd.ms-excel")
+ .accept("text/xml")
+ .put(ClassLoader.getSystemResourceAsStream("password.xls"));
+
+ assertEquals(UNPROCESSEABLE, response.getStatus());
+ }
+
+ @Test
+ public void testSimpleWordMultipartXML() throws Exception {
+ ClassLoader.getSystemResourceAsStream(TEST_DOC);
+ Attachment attachmentPart =
+ new Attachment("myworddoc", "application/msword", ClassLoader.getSystemResourceAsStream(TEST_DOC));
+ WebClient webClient = WebClient.create(endPoint + TIKA_PATH + "/form");
+ Response response = webClient.type("multipart/form-data")
+ .accept("text/xml")
+ .put(attachmentPart);
+ String responseMsg = getStringFromInputStream((InputStream) response
+ .getEntity());
+ assertTrue(responseMsg.contains("test"));
+ }
}