Modified: tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (original) +++ tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java Sun Aug 31 19:36:36 2014 @@ -17,7 +17,6 @@ package org.apache.tika.parser.microsoft.ooxml; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; @@ -73,13 +72,14 @@ public class OOXMLParserTest extends Tik assertEquals("Simple Excel document", metadata.get(TikaCoreProperties.TITLE)); assertEquals("Keith Bennett", metadata.get(TikaCoreProperties.CREATOR)); assertEquals("Keith Bennett", metadata.get(Metadata.AUTHOR)); + String content = handler.toString(); - assertTrue(content.contains("Sample Excel Worksheet")); - assertTrue(content.contains("Numbers and their Squares")); - assertTrue(content.contains("9")); - assertFalse(content.contains("9.0")); - assertTrue(content.contains("196")); - assertFalse(content.contains("196.0")); + assertContains("Sample Excel Worksheet", content); + assertContains("Numbers and their Squares", content); + assertContains("9", content); + assertNotContained("9.0", content); + assertContains("196", content); + assertNotContained("196.0", content); assertEquals("false", metadata.get(TikaMetadataKeys.PROTECTED)); } finally { input.close(); @@ -104,37 +104,40 @@ public class OOXMLParserTest extends Tik String content = handler.toString(); // Number #,##0.00 - assertTrue(content.contains("1,599.99")); - assertTrue(content.contains("-1,599.99")); + assertContains("1,599.99", content); + assertContains("-1,599.99", content); // Currency $#,##0.00;[Red]($#,##0.00) - assertTrue(content.contains("$1,599.99")); - assertTrue(content.contains("$1,599.99)")); + assertContains("$1,599.99", content); + assertContains("$1,599.99)", content); - // Scientific 0.00E+00 - // poi <=3.8beta1 returns 1.98E08, newer versions return 1.98+E08 - assertTrue(content.contains("1.98E08") || content.contains("1.98E+08")); - assertTrue(content.contains("-1.98E08") || content.contains("-1.98E+08")); + // Scientific 0.00E+00 + // poi <=3.8beta1 returns 1.98E08, newer versions return 1.98+E08 + assertTrue(content.contains("1.98E08") || content.contains("1.98E+08")); + assertTrue(content.contains("-1.98E08") || content.contains("-1.98E+08")); // Percentage - assertTrue(content.contains("2.50%")); + assertContains("2.50%", content); // Excel rounds up to 3%, but that requires Java 1.6 or later if(System.getProperty("java.version").startsWith("1.5")) { - assertTrue(content.contains("2%")); + assertContains("2%", content); } else { - assertTrue(content.contains("3%")); + assertContains("3%", content); } // Time Format: h:mm - assertTrue(content.contains("6:15")); - assertTrue(content.contains("18:15")); + assertContains("6:15", content); + assertContains("18:15", content); // Date Format: d-mmm-yy - assertTrue(content.contains("17-May-07")); + assertContains("17-May-07", content); // Currency $#,##0.00;[Red]($#,##0.00) - assertTrue(content.contains("$1,599.99")); - assertTrue(content.contains("($1,599.99)")); + assertContains("$1,599.99", content); + assertContains("($1,599.99)", content); + + // Fraction (2.5): # ?/? + assertContains("2 1/2", content); // Below assertions represent outstanding formatting issues to be addressed // they are included to allow the issues to be progressed with the Apache POI @@ -142,19 +145,16 @@ public class OOXMLParserTest extends Tik /************************************************************************* // Date Format: m/d/yy - assertTrue(content.contains("03/10/2009")); + assertContains("03/10/2009", content); // Date/Time Format - assertTrue(content.contains("19/01/2008 04:35")); + assertContains("19/01/2008 04:35", content); // Custom Number (0 "dollars and" .00 "cents") - assertTrue(content.contains("19 dollars and .99 cents")); + assertContains("19 dollars and .99 cents", content); // Custom Number ("At" h:mm AM/PM "on" dddd mmmm d"," yyyy) - assertTrue(content.contains("At 4:20 AM on Thursday May 17, 2007")); - - // Fraction (2.5): # ?/? - assertTrue(content.contains("2 1 / 2")); + assertContains("At 4:20 AM on Thursday May 17, 2007", content); **************************************************************************/ } finally { input.close(); @@ -187,8 +187,6 @@ public class OOXMLParserTest extends Tik Parser parser = new AutoDetectParser(); Metadata metadata = new Metadata(); - // TODO: should auto-detect without the resource name - metadata.set(Metadata.RESOURCE_NAME_KEY, filename); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -262,8 +260,6 @@ public class OOXMLParserTest extends Tik Parser parser = new AutoDetectParser(); final Metadata metadata = new Metadata(); - // TODO: should auto-detect without the resource name - metadata.set(Metadata.RESOURCE_NAME_KEY, filename); // Allow the value to be access from the inner class final int currentI = i; @@ -385,7 +381,6 @@ public class OOXMLParserTest extends Tik */ @Test public void testWordHTML() throws Exception { - XMLResult result = getXML("testWORD.docx"); String xml = result.xml; Metadata metadata = result.metadata; @@ -528,7 +523,7 @@ public class OOXMLParserTest extends Tik assertEquals("true", metadata.get(TikaMetadataKeys.PROTECTED)); String content = handler.toString(); - assertTrue(content.contains("Office")); + assertContains("Office", content); } finally { input.close(); } @@ -548,7 +543,7 @@ public class OOXMLParserTest extends Tik InputStream input = getTestDocument("NullHeader.docx"); try { parser.parse(input, handler, metadata, context); - assertFalse(handler.toString().length()==0); + assertEquals("Should have found some text", false, handler.toString().isEmpty()); } finally { input.close(); } @@ -715,8 +710,11 @@ public class OOXMLParserTest extends Tik assertContains("Master footer is here", content); } - // TODO: once we fix TIKA-712, re-enable this - /* + /** + * TIKA-712 Master Slide Text from PPT and PPTX files + * should be extracted too + */ + @Test public void testMasterText() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); @@ -732,10 +730,8 @@ public class OOXMLParserTest extends Tik String content = handler.toString(); assertContains("Text that I added to the master slide", content); } - */ - // TODO: once we fix TIKA-712, re-enable this - /* + @Test public void testMasterText2() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); @@ -751,7 +747,6 @@ public class OOXMLParserTest extends Tik String content = handler.toString(); assertContains("Text that I added to the master slide", content); } - */ @Test public void testWordArt() throws Exception { @@ -1001,9 +996,9 @@ public class OOXMLParserTest extends Tik assertEquals( "application/vnd.openxmlformats-officedocument.wordprocessingml.document", metadata.get(Metadata.CONTENT_TYPE)); - assertTrue(handler.toString().contains("BigCompany")); - assertTrue(handler.toString().contains("Seasoned")); - assertTrue(handler.toString().contains("Rich_text_in_cell")); + assertContains("BigCompany", handler.toString()); + assertContains("Seasoned", handler.toString()); + assertContains("Rich_text_in_cell", handler.toString()); } finally { input.close(); } @@ -1037,13 +1032,13 @@ public class OOXMLParserTest extends Tik //grab stderr ByteArrayOutputStream errContent = new ByteArrayOutputStream(); - System.setErr(new PrintStream(errContent)); + System.setErr(new PrintStream(errContent, true, "UTF-8")); parser.parse(input, handler, metadata, context); //return stderr System.setErr(origErr); - String err = errContent.toString(); + String err = errContent.toString("UTF-8"); assertTrue(err.length() == 0); input.close(); } @@ -1103,4 +1098,6 @@ public class OOXMLParserTest extends Tik assertTrue(a < b); assertTrue(b < c); } + } +
Modified: tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java (original) +++ tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java Sun Aug 31 19:36:36 2014 @@ -115,6 +115,8 @@ public class Mp3ParserTest { assertTrue(content.contains("2008")); assertTrue(content.contains("Test Comment")); assertTrue(content.contains("Rock")); + assertTrue(content.contains(", track 1")); + assertTrue(content.contains(", disc 1")); // Check un-typed audio properties assertEquals("MPEG 3 Layer III Version 1", metadata.get("version")); @@ -124,11 +126,14 @@ public class Mp3ParserTest { // Check XMPDM-typed audio properties assertEquals("Test Album", metadata.get(XMPDM.ALBUM)); assertEquals("Test Artist", metadata.get(XMPDM.ARTIST)); + assertEquals("Test Album Artist", metadata.get(XMPDM.ALBUM_ARTIST)); assertEquals(null, metadata.get(XMPDM.COMPOSER)); assertEquals("2008", metadata.get(XMPDM.RELEASE_DATE)); assertEquals("Rock", metadata.get(XMPDM.GENRE)); assertEquals("XXX - ID3v1 Comment\nTest Comment", metadata.get(XMPDM.LOG_COMMENT.getName())); assertEquals("1", metadata.get(XMPDM.TRACK_NUMBER)); + assertEquals("1/1", metadata.get(XMPDM.DISC_NUMBER)); + assertEquals("1", metadata.get(XMPDM.COMPILATION)); assertEquals("44100", metadata.get(XMPDM.AUDIO_SAMPLE_RATE)); assertEquals("Mono", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE)); @@ -203,11 +208,24 @@ public class Mp3ParserTest { assertTrue(content.contains("2008")); assertTrue(content.contains("Test Comment")); assertTrue(content.contains("Rock")); + assertTrue(content.contains(", disc 1")); assertEquals("MPEG 3 Layer III Version 1", metadata.get("version")); assertEquals("44100", metadata.get("samplerate")); assertEquals("1", metadata.get("channels")); checkDuration(metadata, 2); + + // Check XMPDM-typed audio properties + assertEquals("Test Album", metadata.get(XMPDM.ALBUM)); + assertEquals("Test Artist", metadata.get(XMPDM.ARTIST)); + assertEquals("Test Album Artist", metadata.get(XMPDM.ALBUM_ARTIST)); + assertEquals(null, metadata.get(XMPDM.COMPOSER)); + assertEquals("2008", metadata.get(XMPDM.RELEASE_DATE)); + assertEquals("Rock", metadata.get(XMPDM.GENRE)); + assertEquals("1", metadata.get(XMPDM.COMPILATION)); + + assertEquals(null, metadata.get(XMPDM.TRACK_NUMBER)); + assertEquals("1", metadata.get(XMPDM.DISC_NUMBER)); } /** Modified: tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java (original) +++ tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java Sun Aug 31 19:36:36 2014 @@ -157,7 +157,7 @@ public class MpegStreamTest public void testSkipNoCurrentHeader() throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); - bos.write("This is a test".getBytes()); + 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/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java (original) +++ tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java Sun Aug 31 19:36:36 2014 @@ -24,6 +24,7 @@ import java.io.InputStream; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; +import org.apache.tika.metadata.XMP; import org.apache.tika.metadata.XMPDM; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; @@ -81,11 +82,17 @@ public class MP4ParserTest { assertEquals("Test Genre", metadata.get(XMPDM.GENRE)); assertEquals("Test Comments", metadata.get(XMPDM.LOG_COMMENT.getName())); assertEquals("1", metadata.get(XMPDM.TRACK_NUMBER)); + assertEquals("Test Album Artist", metadata.get(XMPDM.ALBUM_ARTIST)); + assertEquals("6", metadata.get(XMPDM.DISC_NUMBER)); + assertEquals("0", metadata.get(XMPDM.COMPILATION)); + assertEquals("44100", metadata.get(XMPDM.AUDIO_SAMPLE_RATE)); - //assertEquals("Stereo", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE)); // TODO Extract + assertEquals("Stereo", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE)); assertEquals("M4A", metadata.get(XMPDM.AUDIO_COMPRESSOR)); + assertEquals("iTunes 10.5.3.3", metadata.get(XMP.CREATOR_TOOL)); + // Check again by file, rather than stream TikaInputStream tstream = TikaInputStream.get( Modified: tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (original) +++ tika/branches/1.6/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java Sun Aug 31 19:36:36 2014 @@ -27,6 +27,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -566,7 +567,7 @@ public class PDFParserTest extends TikaT Set<String> knownContentDiffs = new HashSet<String>(); for (File f : testDocs.listFiles()) { - if (! f.getName().toLowerCase().endsWith(".pdf")) { + if (! f.getName().toLowerCase(Locale.ROOT).endsWith(".pdf")) { continue; } Modified: tika/branches/1.6/tika-parsers/src/test/resources/test-documents/testMP3id3v2.mp3 URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/resources/test-documents/testMP3id3v2.mp3?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== Binary files - no diff available. Modified: tika/branches/1.6/tika-parsers/src/test/resources/test-documents/testMP3id3v24.mp3 URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/src/test/resources/test-documents/testMP3id3v24.mp3?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== Binary files - no diff available. Propchange: tika/branches/1.6/tika-serialization/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 31 19:36:36 2014 @@ -0,0 +1,2 @@ +target +.* Modified: tika/branches/1.6/tika-serialization/pom.xml URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-serialization/pom.xml?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-serialization/pom.xml (original) +++ tika/branches/1.6/tika-serialization/pom.xml Sun Aug 31 19:36:36 2014 @@ -59,7 +59,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> </dependencies> @@ -85,9 +84,9 @@ <url>http://www.apache.org</url> </organization> <scm> - <url>http://svn.apache.org/viewvc/tika/tags/1.6/tika-app</url> - <connection>scm:svn:http://svn.apache.org/repos/asf/tika/tags/1.6/tika-serialization</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/tags/1.6/tika-serialization</developerConnection> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-app</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-serialization</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-serialization</developerConnection> </scm> <issueManagement> <system>JIRA</system> Modified: tika/branches/1.6/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java (original) +++ tika/branches/1.6/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java Sun Aug 31 19:36:36 2014 @@ -17,8 +17,6 @@ package org.apache.tika.metadata.seriali * limitations under the License. */ -import static org.junit.Assert.*; - import java.io.StringReader; import java.io.StringWriter; @@ -26,6 +24,10 @@ import org.apache.tika.exception.TikaExc import org.apache.tika.metadata.Metadata; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class JsonMetadataTest { @Test Modified: tika/branches/1.6/tika-server/pom.xml URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/pom.xml?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/pom.xml (original) +++ tika/branches/1.6/tika-server/pom.xml Sun Aug 31 19:36:36 2014 @@ -66,8 +66,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> - <version>4.11</version> </dependency> </dependencies> @@ -218,9 +216,9 @@ <url>http://www.apache.org</url> </organization> <scm> - <url>http://svn.apache.org/viewvc/tika/tags/1.6/tika-server</url> - <connection>scm:svn:http://svn.apache.org/repos/asf/tika/tags/1.6/tika-server</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/tags/1.6/tika-server</developerConnection> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-server</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-server</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-server</developerConnection> </scm> <issueManagement> <system>JIRA</system> Modified: tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaMimeTypes.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaMimeTypes.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaMimeTypes.java (original) +++ tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaMimeTypes.java Sun Aug 31 19:36:36 2014 @@ -66,26 +66,24 @@ public class TikaMimeTypes { } h.append("<ul>"); for (String section : firstType.keySet()) { - h.append("<li><a href=\"#" + firstType.get(section) + "\">" + - section + "</a></li>\n"); + h.append("<li><a href=\"#").append(firstType.get(section)).append("\">").append(section).append("</a></li>\n"); } h.append("</ul>"); // Output all of them for (MediaTypeDetails type : types) { - h.append("<a name=\"" + type.type + "\"></a>\n"); - h.append("<h2>" + type.type + "</h2>\n"); + h.append("<a name=\"").append(type.type).append("\"></a>\n"); + h.append("<h2>").append(type.type).append("</h2>\n"); for (MediaType alias : type.aliases) { - h.append("<div>Alias: " + alias + "</div>\n"); + h.append("<div>Alias: ").append(alias).append("</div>\n"); } if (type.supertype != null) { - h.append("<div>Super Type: <a href=\"#" + type.supertype + - "\">" + type.supertype + "</a></div>\n"); + h.append("<div>Super Type: <a href=\"#").append(type.supertype).append("\">").append(type.supertype).append("</a></div>\n"); } if (type.parser != null) { - h.append("<div>Parser: " + type.parser + "</div>\n"); + h.append("<div>Parser: ").append(type.parser).append("</div>\n"); } } @@ -125,14 +123,14 @@ public class TikaMimeTypes { text.append("\n"); for (MediaType alias : type.aliases) { - text.append(" alias: " + alias + "\n"); + text.append(" alias: ").append(alias).append("\n"); } if (type.supertype != null) { - text.append(" supertype: " + type.supertype.toString() + "\n"); + text.append(" supertype: ").append(type.supertype.toString()).append("\n"); } if (type.parser != null) { - text.append(" parser: " + type.parser + "\n"); + text.append(" parser: ").append(type.parser).append("\n"); } } Modified: tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaResource.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaResource.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaResource.java (original) +++ tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaResource.java Sun Aug 31 19:36:36 2014 @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -204,6 +205,7 @@ public static void fillMetadata(AutoDete throw new WebApplicationException(e); } catch (EncryptedDocumentException e) { logger.warn(String.format( + Locale.ROOT, "%s: Encrypted document", info.getPath() ), e); @@ -211,6 +213,7 @@ public static void fillMetadata(AutoDete throw new WebApplicationException(e, Response.status(422).build()); } catch (TikaException e) { logger.warn(String.format( + Locale.ROOT, "%s: Text extraction failed", info.getPath() ), e); @@ -303,6 +306,7 @@ public static void fillMetadata(AutoDete } catch (EncryptedDocumentException e) { logger.warn(String.format( + Locale.ROOT, "%s: Encrypted document", info.getPath() ), e); @@ -310,6 +314,7 @@ public static void fillMetadata(AutoDete } catch (TikaException e) { logger.warn(String.format( + Locale.ROOT, "%s: Text extraction failed", info.getPath() ), e); @@ -335,11 +340,13 @@ public static void fillMetadata(AutoDete public static void logRequest(Log logger, UriInfo info, Metadata metadata) { if (metadata.get(org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE)==null) { logger.info(String.format( + Locale.ROOT, "%s (autodetecting type)", info.getPath() )); } else { logger.info(String.format( + Locale.ROOT, "%s (%s)", info.getPath(), metadata.get(org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE) Modified: tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java (original) +++ tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java Sun Aug 31 19:36:36 2014 @@ -17,10 +17,11 @@ package org.apache.tika.server; -import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; -import java.util.Properties; +import java.util.Set; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -41,11 +42,14 @@ public class TikaServerCli { private static final Log logger = LogFactory.getLog(TikaServerCli.class); public static final int DEFAULT_PORT = 9998; public static final String DEFAULT_HOST = "localhost"; - + public static final Set<String> LOG_LEVELS = + new HashSet<String>(Arrays.asList("debug", "info")); + private static Options getOptions() { Options options = new Options(); options.addOption("h", "host", true, "host name (default = " + DEFAULT_HOST + ')'); options.addOption("p", "port", true, "listen port (default = " + DEFAULT_PORT + ')'); + options.addOption("l", "log", true, "request URI log level ('debug' or 'info')"); options.addOption("?", "help", false, "this help message"); return options; @@ -79,52 +83,45 @@ public class TikaServerCli { port = Integer.valueOf(line.getOptionValue("port")); } + TikaLoggingFilter logFilter = null; + if (line.hasOption("log")) { + String logLevel = line.getOptionValue("log"); + if (LOG_LEVELS.contains(logLevel)) { + boolean isInfoLevel = "info".equals(logLevel); + logFilter = new TikaLoggingFilter(isInfoLevel); + } else { + logger.info("Unsupported request URI log level: " + logLevel); + } + } // The Tika Configuration to use throughout TikaConfig tika = TikaConfig.getDefaultConfig(); JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); - // Note - at least one of these stops TikaWelcome matching on / - // This prevents TikaWelcome acting as a partial solution to TIKA-1269 - sf.setResourceClasses(MetadataEP.class, MetadataResource.class, DetectorResource.class, - TikaResource.class, UnpackerResource.class, - TikaDetectors.class, TikaParsers.class, - TikaMimeTypes.class, TikaVersion.class, - TikaWelcome.class); - // Use this one instead for the Welcome page to work -/* - sf.setResourceClasses( -// MetadataEP.class, - MetadataResource.class, - TikaResource.class, -// UnpackerResource.class, - TikaDetectors.class, - TikaMimeTypes.class, - TikaParsers.class, - TikaVersion.class, - TikaWelcome.class - ); -*/ + List<ResourceProvider> rCoreProviders = new ArrayList<ResourceProvider>(); + rCoreProviders.add(new SingletonResourceProvider(new MetadataResource(tika))); + rCoreProviders.add(new SingletonResourceProvider(new DetectorResource(tika))); + rCoreProviders.add(new SingletonResourceProvider(new TikaResource(tika))); + rCoreProviders.add(new SingletonResourceProvider(new UnpackerResource(tika))); + rCoreProviders.add(new SingletonResourceProvider(new TikaMimeTypes(tika))); + rCoreProviders.add(new SingletonResourceProvider(new TikaDetectors(tika))); + rCoreProviders.add(new SingletonResourceProvider(new TikaParsers(tika))); + rCoreProviders.add(new SingletonResourceProvider(new TikaVersion(tika))); + List<ResourceProvider> rAllProviders = new ArrayList<ResourceProvider>(rCoreProviders); + rAllProviders.add(new SingletonResourceProvider(new TikaWelcome(tika, rCoreProviders))); + sf.setResourceProviders(rAllProviders); + List<Object> providers = new ArrayList<Object>(); providers.add(new TarWriter()); providers.add(new ZipWriter()); providers.add(new CSVMessageBodyWriter()); providers.add(new JSONMessageBodyWriter()); providers.add(new TikaExceptionMapper()); + if (logFilter != null) { + providers.add(logFilter); + } sf.setProviders(providers); - List<ResourceProvider> rProviders = new ArrayList<ResourceProvider>(); - rProviders.add(new SingletonResourceProvider(new MetadataResource(tika))); - rProviders.add(new SingletonResourceProvider(new DetectorResource(tika))); - rProviders.add(new SingletonResourceProvider(new TikaResource(tika))); - rProviders.add(new SingletonResourceProvider(new UnpackerResource(tika))); - rProviders.add(new SingletonResourceProvider(new TikaMimeTypes(tika))); - rProviders.add(new SingletonResourceProvider(new TikaDetectors(tika))); - rProviders.add(new SingletonResourceProvider(new TikaParsers(tika))); - rProviders.add(new SingletonResourceProvider(new TikaVersion(tika))); - rProviders.add(new SingletonResourceProvider(new TikaWelcome(tika, sf))); - sf.setResourceProviders(rProviders); - sf.setAddress("http://"; + host + ":" + port + "/"); BindingFactoryManager manager = sf.getBus().getExtension( BindingFactoryManager.class); Modified: tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java (original) +++ tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java Sun Aug 31 19:36:36 2014 @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -35,7 +36,7 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; +import org.apache.cxf.jaxrs.lifecycle.ResourceProvider; import org.apache.tika.Tika; import org.apache.tika.config.TikaConfig; @@ -59,12 +60,14 @@ public class TikaWelcome { private Tika tika; private HTMLHelper html; - private List<Class<?>> endpoints; + private List<Class<?>> endpoints = new LinkedList<Class<?>>(); - public TikaWelcome(TikaConfig tika, JAXRSServerFactoryBean sf) { + public TikaWelcome(TikaConfig tika, List<ResourceProvider> rCoreProviders) { this.tika = new Tika(tika); this.html = new HTMLHelper(); - this.endpoints = sf.getResourceClasses(); + for (ResourceProvider rp : rCoreProviders) { + this.endpoints.add(rp.getResourceClass()); + } } protected List<Endpoint> identifyEndpoints() { Modified: tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java (original) +++ tika/branches/1.6/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java Sun Aug 31 19:36:36 2014 @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import javax.ws.rs.PUT; @@ -126,6 +127,7 @@ public class UnpackerResource { parser.parse(is, ch, metadata, pc); } catch (TikaException ex) { logger.warn(String.format( + Locale.ROOT, "%s: Unpacker failed", info.getPath() ), ex); Modified: tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/DetectorResourceTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/DetectorResourceTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/DetectorResourceTest.java (original) +++ tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/DetectorResourceTest.java Sun Aug 31 19:36:36 2014 @@ -57,7 +57,7 @@ public class DetectorResourceTest extend } @Test - public void testDetectCsvWithExt() throws IllegalStateException, Exception { + public void testDetectCsvWithExt() throws Exception { String url = endPoint + DETECT_STREAM_PATH; Response response = WebClient .create(endPoint + DETECT_STREAM_PATH) @@ -74,7 +74,7 @@ public class DetectorResourceTest extend } @Test - public void testDetectCsvNoExt() throws IllegalStateException, Exception { + public void testDetectCsvNoExt() throws Exception { String url = endPoint + DETECT_STREAM_PATH; Response response = WebClient .create(endPoint + DETECT_STREAM_PATH) Modified: tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java (original) +++ tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java Sun Aug 31 19:36:36 2014 @@ -82,7 +82,7 @@ public class MetadataEPTest extends CXFT .post(ClassLoader.getSystemResourceAsStream(TikaResourceTest.TEST_DOC)); Assert.assertEquals(Status.OK.getStatusCode(), response.getStatus()); - Reader reader = new InputStreamReader((InputStream) response.getEntity()); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); @SuppressWarnings("resource") CSVReader csvReader = new CSVReader(reader); @@ -105,7 +105,7 @@ public class MetadataEPTest extends CXFT Assert.assertEquals(Status.OK.getStatusCode(), response.getStatus()); - Reader reader = new InputStreamReader((InputStream) response.getEntity()); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); Metadata metadata = JsonMetadata.fromJson(reader); assertNotNull(metadata.get("Author")); assertEquals("Maxim Valyanskiy", metadata.get("Author")); @@ -128,7 +128,7 @@ public class MetadataEPTest extends CXFT .accept(MediaType.APPLICATION_JSON).post(ClassLoader.getSystemResourceAsStream(TikaResourceTest.TEST_DOC)); Assert.assertEquals(Status.OK.getStatusCode(), response.getStatus()); - Reader reader = new InputStreamReader((InputStream) response.getEntity()); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); Metadata metadata = JsonMetadata.fromJson(reader); assertNotNull(metadata.get("Author")); Modified: tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java (original) +++ tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java Sun Aug 31 19:36:36 2014 @@ -57,8 +57,7 @@ public class MetadataResourceTest extend .put(ClassLoader .getSystemResourceAsStream(TikaResourceTest.TEST_DOC)); - Reader reader = new InputStreamReader( - (InputStream) response.getEntity()); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); CSVReader csvReader = new CSVReader(reader); Modified: tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaDetectorsTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaDetectorsTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaDetectorsTest.java (original) +++ tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaDetectorsTest.java Sun Aug 31 19:36:36 2014 @@ -99,11 +99,11 @@ public class TikaDetectorsTest extends C String jsonStr = getStringFromInputStream((InputStream) response.getEntity()); Map<String,Map<String,Object>> json = (Map<String,Map<String,Object>>)JSON.parse(jsonStr); - + // Should have a nested structure - assertEquals(true, json.containsKey("name")); - assertEquals(true, json.containsKey("composite")); - assertEquals(true, json.containsKey("children")); + assertTrue(json.containsKey("name")); + assertTrue(json.containsKey("composite")); + assertTrue(json.containsKey("children")); assertEquals("org.apache.tika.detect.DefaultDetector", json.get("name")); assertEquals(Boolean.TRUE, json.get("composite")); @@ -113,11 +113,11 @@ public class TikaDetectorsTest extends C boolean hasOgg = false, hasPOIFS = false, hasZIP = false, hasMime = false; for (Object o : children) { Map<String,Object> d = (Map<String,Object>)o; - assertEquals(true, d.containsKey("name")); - assertEquals(true, d.containsKey("composite")); + assertTrue(d.containsKey("name")); + assertTrue(d.containsKey("composite")); assertEquals(Boolean.FALSE, d.get("composite")); assertEquals(false, d.containsKey("children")); - + String name = (String)d.get("name"); if (OggDetector.class.getName().equals(name)) { hasOgg = true; @@ -132,9 +132,9 @@ public class TikaDetectorsTest extends C hasMime = true; } } - assertEquals(true, hasOgg); - assertEquals(true, hasPOIFS); - assertEquals(true, hasZIP); - assertEquals(true, hasMime); + assertTrue(hasOgg); + assertTrue(hasPOIFS); + assertTrue(hasZIP); + assertTrue(hasMime); } } Modified: tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java (original) +++ tika/branches/1.6/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java Sun Aug 31 19:36:36 2014 @@ -18,11 +18,15 @@ package org.apache.tika.server; import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.cxf.jaxrs.lifecycle.ResourceProvider; import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.tika.Tika; import org.junit.Test; @@ -33,15 +37,11 @@ public class TikaWelcomeTest extends CXF @Override protected void setUpResources(JAXRSServerFactoryBean sf) { - sf.setResourceClasses(TikaWelcome.class, TikaVersion.class); - sf.setResourceProvider( - TikaWelcome.class, - new SingletonResourceProvider(new TikaWelcome(tika, sf)) - ); - sf.setResourceProvider( - TikaVersion.class, - new SingletonResourceProvider(new TikaVersion(tika)) - ); + List<ResourceProvider> rpsCore = + Collections.<ResourceProvider>singletonList(new SingletonResourceProvider(new TikaVersion(tika))); + List<ResourceProvider> all = new ArrayList<ResourceProvider>(rpsCore); + all.add(new SingletonResourceProvider(new TikaWelcome(tika, rpsCore))); + sf.setResourceProviders(all); } @Override @@ -64,12 +64,11 @@ public class TikaWelcomeTest extends CXF assertContains("GET", html); assertContains(WELCOME_PATH, html); assertContains("text/plain", html); - assertContains("text/html", html); // Check that the Tika Version details come through too assertContains(VERSION_PATH, html); } - + @Test public void testGetTextWelcome() throws Exception { Response response = WebClient @@ -84,7 +83,6 @@ public class TikaWelcomeTest extends CXF // Check our details were found assertContains("GET " + WELCOME_PATH, text); assertContains("=> text/plain", text); - assertContains("=> text/html", text); // Check that the Tika Version details come through too assertContains("GET " + VERSION_PATH, text); Propchange: tika/branches/1.6/tika-translate/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Aug 31 19:36:36 2014 @@ -1,3 +1,2 @@ -.settings -.classpath -.project +target +.* Modified: tika/branches/1.6/tika-translate/pom.xml URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-translate/pom.xml?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-translate/pom.xml (original) +++ tika/branches/1.6/tika-translate/pom.xml Sun Aug 31 19:36:36 2014 @@ -61,8 +61,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> - <version>4.11</version> </dependency> </dependencies> <build> @@ -146,9 +144,9 @@ <url>http://www.apache.org</url> </organization> <scm> - <url>http://svn.apache.org/viewvc/tika/tags/1.6/translate</url> - <connection>scm:svn:http://svn.apache.org/repos/asf/tika/tags/1.6/translate</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/tags/1.6/translate</developerConnection> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-translate</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-translate</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-translate</developerConnection> </scm> <issueManagement> <system>JIRA</system> Modified: tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java (original) +++ tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java Sun Aug 31 19:36:36 2014 @@ -85,7 +85,7 @@ public class GoogleTranslator implements .query("key", apiKey).query("source", sourceLanguage) .query("target", targetLanguage).query("q", text).get(); BufferedReader reader = new BufferedReader(new InputStreamReader( - (InputStream) response.getEntity())); + (InputStream) response.getEntity(), "UTF-8")); String line = null; StringBuffer responseText = new StringBuffer(); while ((line = reader.readLine()) != null) { Modified: tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/MicrosoftTranslator.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/MicrosoftTranslator.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/MicrosoftTranslator.java (original) +++ tika/branches/1.6/tika-translate/src/main/java/org/apache/tika/language/translate/MicrosoftTranslator.java Sun Aug 31 19:36:36 2014 @@ -56,7 +56,7 @@ public class MicrosoftTranslator impleme props.load(stream); clientId = props.getProperty(ID_PROPERTY); clientSecret = props.getProperty(SECRET_PROPERTY); - if (!clientId.equals(DEFAULT_ID) && !clientSecret.equals(DEFAULT_SECRET)) available = true; + this.available = checkAvailable(); } } catch (IOException e) { e.printStackTrace(); @@ -119,7 +119,7 @@ public class MicrosoftTranslator impleme */ public void setId(String id){ this.clientId = id; - if (!clientId.equals(DEFAULT_ID) && !clientSecret.equals(DEFAULT_SECRET)) available = true; + this.available = checkAvailable(); } /** @@ -128,6 +128,13 @@ public class MicrosoftTranslator impleme */ public void setSecret(String secret){ this.clientSecret = secret; - if (!clientId.equals(DEFAULT_ID) && !clientSecret.equals(DEFAULT_SECRET)) available = true; + this.available = checkAvailable(); + } + + private boolean checkAvailable(){ + return clientId != null && + !clientId.equals(DEFAULT_ID) && + clientSecret != null && + !clientSecret.equals(DEFAULT_SECRET); } } Modified: tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/CachedTranslatorTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/CachedTranslatorTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/CachedTranslatorTest.java (original) +++ tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/CachedTranslatorTest.java Sun Aug 31 19:36:36 2014 @@ -20,8 +20,10 @@ package org.apache.tika.language.transla import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Test harness for the {@link CachedTranslator}. Take care to choose your target language carefully Modified: tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/MicrosoftTranslatorTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/MicrosoftTranslatorTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/MicrosoftTranslatorTest.java (original) +++ tika/branches/1.6/tika-translate/src/test/java/org/apache/tika/language/translate/MicrosoftTranslatorTest.java Sun Aug 31 19:36:36 2014 @@ -21,24 +21,24 @@ import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Test cases for the {@link MicrosoftTranslator} class. */ public class MicrosoftTranslatorTest { - Tika tika; + MicrosoftTranslator translator; @Before public void setUp() { - tika = new Tika(); + translator = new MicrosoftTranslator(); } @Test public void testSimpleTranslate() throws Exception { String source = "hello"; String expected = "salut"; - String translated = tika.translate(source, "en", "fr"); - System.err.println(tika.getTranslator().isAvailable()); - if (tika.getTranslator().isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")", + String translated = translator.translate(source, "en", "fr"); + if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")", expected.equalsIgnoreCase(translated)); } @@ -46,10 +46,31 @@ public class MicrosoftTranslatorTest { public void testSimpleDetectTranslate() throws Exception { String source = "hello"; String expected = "salut"; - String translated = tika.translate(source, "fr"); - System.err.println(tika.getTranslator().isAvailable()); - if (tika.getTranslator().isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")", + String translated = translator.translate(source, "fr"); + if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")", expected.equalsIgnoreCase(translated)); } + + @Test + public void testSettersAndIsAvailable(){ + try{ + translator.setId("foo"); + translator.setSecret("bar"); + } + catch(Exception e){ + e.printStackTrace(); + fail(e.getMessage()); + } + //reset + translator = new MicrosoftTranslator(); + try{ + translator.setSecret("bar"); + translator.setId("foo"); + } + catch(Exception e){ + e.printStackTrace(); + fail(e.getMessage()); + } + } } Modified: tika/branches/1.6/tika-xmp/pom.xml URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-xmp/pom.xml?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-xmp/pom.xml (original) +++ tika/branches/1.6/tika-xmp/pom.xml Sun Aug 31 19:36:36 2014 @@ -90,8 +90,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> - <version>4.11</version> </dependency> </dependencies> @@ -101,9 +99,9 @@ <url>http://www.apache.org</url> </organization> <scm> - <url>http://svn.apache.org/viewvc/tika/tags/1.6/tika-xmp</url> - <connection>scm:svn:http://svn.apache.org/repos/asf/tika/tags/1.6/tika-xmp</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/tags/1.6/tika-xmp</developerConnection> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-xmp</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-xmp</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-xmp</developerConnection> </scm> <issueManagement> <system>JIRA</system> Modified: tika/branches/1.6/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java URL: http://svn.apache.org/viewvc/tika/branches/1.6/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java?rev=1621623&r1=1621622&r2=1621623&view=diff ============================================================================== --- tika/branches/1.6/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java (original) +++ tika/branches/1.6/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java Sun Aug 31 19:36:36 2014 @@ -16,8 +16,6 @@ */ package org.apache.tika.xmp; -import static org.junit.Assert.*; - import java.util.Date; import java.util.Properties; @@ -37,6 +35,12 @@ import com.adobe.xmp.XMPMeta; import com.adobe.xmp.XMPUtils; import com.adobe.xmp.properties.XMPProperty; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class XMPMetadataTest { private Metadata tikaMetadata; private XMPMetadata xmpMeta;
