You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by kk...@apache.org on 2013/12/19 20:46:51 UTC
svn commit: r1552405 [4/4] - in /tika/trunk: ./ tika-app/
tika-app/src/test/java/org/apache/tika/cli/ tika-bundle/
tika-bundle/src/test/java/org/apache/tika/bundle/ tika-core/
tika-core/src/test/java/org/apache/tika/
tika-core/src/test/java/org/apache/...
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,9 @@
*/
package org.apache.tika.parser.microsoft;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import java.util.Locale;
@@ -29,10 +32,12 @@ import org.apache.tika.metadata.OfficeOp
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
public class WordParserTest extends TikaTest {
+ @Test
public void testWordParser() throws Exception {
InputStream input = WordParserTest.class.getResourceAsStream(
"/test-documents/testWORD.doc");
@@ -53,6 +58,7 @@ public class WordParserTest extends Tika
}
}
+ @Test
public void testWordWithWAV() throws Exception {
InputStream input = WordParserTest.class.getResourceAsStream(
"/test-documents/Doc1_ole.doc");
@@ -71,6 +77,7 @@ public class WordParserTest extends Tika
* Test that the word converter is able to generate the
* correct HTML for the document
*/
+ @Test
public void testWordHTML() throws Exception {
// Try with a document containing various tables and
@@ -134,6 +141,7 @@ public class WordParserTest extends Tika
assertTrue("Bold text wasn't contiguous: "+xml, xml.contains("F<b>oob</b>a<b>r</b>"));
}
+ @Test
public void testEmbeddedNames() throws Exception {
String result = getXML("testWORD_embedded_pdf.doc").xml;
@@ -151,6 +159,7 @@ public class WordParserTest extends Tika
}
// TIKA-982
+ @Test
public void testEmbeddedRTF() throws Exception {
String result = getXML("testWORD_embedded_rtf.doc").xml;
assertTrue(result.indexOf("<div class=\"embedded\" id=\"_1404039792\" />") != -1);
@@ -158,12 +167,14 @@ public class WordParserTest extends Tika
}
// TIKA-1019
+ @Test
public void testDocumentLink() throws Exception {
String result = getXML("testDocumentLink.doc").xml;
assertTrue(result.indexOf("<div class=\"embedded\" id=\"_1327495610\" />") != -1);
assertTrue(result.indexOf("_1327495610.unknown") != -1);
}
+ @Test
public void testWord6Parser() throws Exception {
InputStream input = WordParserTest.class.getResourceAsStream(
"/test-documents/testWORD6.doc");
@@ -186,6 +197,7 @@ public class WordParserTest extends Tika
}
}
+ @Test
public void testVarious() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -261,6 +273,7 @@ public class WordParserTest extends Tika
* TIKA-1044 - Handle documents where parts of the
* text have no formatting or styles applied to them
*/
+ @Test
public void testNoFormat() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -280,6 +293,7 @@ public class WordParserTest extends Tika
/**
* Ensures that custom OLE2 (HPSF) properties are extracted
*/
+ @Test
public void testCustomProperties() throws Exception {
InputStream input = WordParserTest.class.getResourceAsStream(
"/test-documents/testWORD_custom_props.doc");
@@ -317,6 +331,7 @@ public class WordParserTest extends Tika
assertEquals("2010-12-30T23:00:00Z", metadata.get("custom:MyCustomDate"));
}
+ @Test
public void testExceptions1() throws Exception {
XMLResult xml;
Level logLevelStart = Logger.getRootLogger().getLevel();
@@ -331,6 +346,7 @@ public class WordParserTest extends Tika
}
}
+ @Test
public void testTabularSymbol() throws Exception {
assertContains("one two", getXML("testWORD_tabular_symbol.doc").xml.replaceAll("\\s+", " "));
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,15 +16,19 @@
*/
package org.apache.tika.parser.microsoft;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
+
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
import java.io.InputStream;
-public class WriteProtectedParserTest extends TestCase {
+public class WriteProtectedParserTest {
+
+ @Test
public void testWriteProtected() throws Exception {
InputStream input = ExcelParserTest.class.getResourceAsStream(
"/test-documents/protect.xlsx");
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java Thu Dec 19 19:46:49 2013
@@ -16,10 +16,15 @@
*/
package org.apache.tika.parser.microsoft.ooxml;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
import org.apache.tika.Tika;
import org.apache.tika.extractor.ContainerExtractor;
import org.apache.tika.extractor.ParserContainerExtractor;
import org.apache.tika.parser.microsoft.AbstractPOIContainerExtractionTest;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests that the various POI OOXML powered parsers are
@@ -28,8 +33,8 @@ import org.apache.tika.parser.microsoft.
public class OOXMLContainerExtractionTest extends AbstractPOIContainerExtractionTest {
private ContainerExtractor extractor;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() {
Tika tika = new Tika();
extractor = new ParserContainerExtractor(
tika.getParser(), tika.getDetector());
@@ -38,6 +43,7 @@ public class OOXMLContainerExtractionTes
/**
* For office files which don't have anything embedded in them
*/
+ @Test
public void testWithoutEmbedded() throws Exception {
String[] files = new String[] {
"testEXCEL.xlsx", "testWORD.docx", "testPPT.pptx",
@@ -61,6 +67,7 @@ public class OOXMLContainerExtractionTes
* Office files with embedded images, but no other
* office files in them
*/
+ @Test
public void testEmbeddedImages() throws Exception {
TrackingHandler handler;
@@ -122,6 +129,7 @@ public class OOXMLContainerExtractionTes
* -> excel
* -> image
*/
+ @Test
public void testEmbeddedOfficeFiles() throws Exception {
TrackingHandler handler;
@@ -256,6 +264,7 @@ public class OOXMLContainerExtractionTes
assertEquals(TYPE_EMF, handler.mediaTypes.get(8)); // Icon of embedded office doc
}
+ @Test
public void testEmbeddedOutlook() throws Exception {
TrackingHandler handler =
process("EmbeddedOutlook.docx", extractor, false);
@@ -270,6 +279,7 @@ public class OOXMLContainerExtractionTes
assertEquals(TYPE_MSG, handler.mediaTypes.get(1));
}
+ @Test
public void testEmbeddedPDF() throws Exception {
TrackingHandler handler =
process("EmbeddedPDF.docx", extractor, false);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,10 @@
*/
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;
import java.io.InputStream;
import java.io.PrintStream;
@@ -40,6 +44,7 @@ import org.apache.tika.parser.ParseConte
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.microsoft.WordParserTest;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
public class OOXMLParserTest extends TikaTest {
@@ -51,6 +56,7 @@ public class OOXMLParserTest extends Tik
"/test-documents/" + name));
}
+ @Test
public void testExcel() throws Exception {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
@@ -80,6 +86,7 @@ public class OOXMLParserTest extends Tik
}
}
+ @Test
public void testExcelFormats() throws Exception {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
@@ -158,6 +165,7 @@ public class OOXMLParserTest extends Tik
* We have a number of different powerpoint files,
* such as presentation, macro-enabled etc
*/
+ @Test
public void testPowerPoint() throws Exception {
String[] extensions = new String[] {
"pptx", "pptm", "ppsm", "ppsx", "potm"
@@ -232,6 +240,7 @@ public class OOXMLParserTest extends Tik
* Test that the metadata is already extracted when the body is processed.
* See TIKA-1109
*/
+ @Test
public void testPowerPointMetadataEarly() throws Exception {
String[] extensions = new String[] {
"pptx", "pptm", "ppsm", "ppsx", "potm"
@@ -288,6 +297,7 @@ public class OOXMLParserTest extends Tik
* For the PowerPoint formats we don't currently support, ensure that
* we don't break either
*/
+ @Test
public void testUnsupportedPowerPoint() throws Exception {
String[] extensions = new String[] { "xps", "thmx" };
String[] mimeTypes = new String[] {
@@ -326,6 +336,7 @@ public class OOXMLParserTest extends Tik
* Test the plain text output of the Word converter
* @throws Exception
*/
+ @Test
public void testWord() throws Exception {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
@@ -350,6 +361,7 @@ public class OOXMLParserTest extends Tik
* Test the plain text output of the Word converter
* @throws Exception
*/
+ @Test
public void testWordFootnote() throws Exception {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
@@ -371,6 +383,7 @@ public class OOXMLParserTest extends Tik
* Test that the word converter is able to generate the
* correct HTML for the document
*/
+ @Test
public void testWordHTML() throws Exception {
XMLResult result = getXML("testWORD.docx");
@@ -437,6 +450,7 @@ public class OOXMLParserTest extends Tik
/**
* Test that we can extract image from docx header
*/
+ @Test
public void testWordPicturesInHeader() throws Exception {
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
@@ -468,6 +482,7 @@ public class OOXMLParserTest extends Tik
* Documents with some sheets are protected, but not all.
* See TIKA-364.
*/
+ @Test
public void testProtectedExcelSheets() throws Exception {
InputStream input = OOXMLParserTest.class
.getResourceAsStream("/test-documents/protectedSheets.xlsx");
@@ -494,6 +509,7 @@ public class OOXMLParserTest extends Tik
* An excel document which is password protected.
* See TIKA-437.
*/
+ @Test
public void testProtectedExcelFile() throws Exception {
Parser parser = new AutoDetectParser();
@@ -522,6 +538,7 @@ public class OOXMLParserTest extends Tik
* Test docx without headers
* TIKA-633
*/
+ @Test
public void testNullHeaders() throws Exception {
Parser parser = new AutoDetectParser();
Metadata metadata = new Metadata();
@@ -537,6 +554,7 @@ public class OOXMLParserTest extends Tik
}
}
+ @Test
public void testVarious() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -608,6 +626,7 @@ public class OOXMLParserTest extends Tik
assertContains("\uD800\uDF32\uD800\uDF3f\uD800\uDF44\uD800\uDF39\uD800\uDF43\uD800\uDF3A", content);
}
+ @Test
public void testVariousPPTX() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -679,7 +698,7 @@ public class OOXMLParserTest extends Tik
assertContains("\uD800\uDF32\uD800\uDF3f\uD800\uDF44\uD800\uDF39\uD800\uDF43\uD800\uDF3A", content);
}
-
+ @Test
public void testMasterFooter() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -734,6 +753,7 @@ public class OOXMLParserTest extends Tik
}
*/
+ @Test
public void testWordArt() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -752,6 +772,7 @@ public class OOXMLParserTest extends Tik
/**
* Ensures that custom OOXML properties are extracted
*/
+ @Test
public void testExcelCustomProperties() throws Exception {
InputStream input = OOXMLParserTest.class.getResourceAsStream(
"/test-documents/testEXCEL_custom_props.xlsx");
@@ -784,6 +805,8 @@ public class OOXMLParserTest extends Tik
assertEquals("2010-12-30T22:00:00Z", metadata.get("custom:MyCustomDate"));
assertEquals("2010-12-29T22:00:00Z", metadata.get("custom:myCustomSecondDate"));
}
+
+ @Test
public void testWordCustomProperties() throws Exception {
InputStream input = OOXMLParserTest.class.getResourceAsStream(
"/test-documents/testWORD_custom_props.docx");
@@ -826,6 +849,8 @@ public class OOXMLParserTest extends Tik
assertEquals("2010-12-30T23:00:00Z", metadata.get("custom:MyCustomDate"));
assertEquals("2010-12-29T22:00:00Z", metadata.get("custom:myCustomSecondDate"));
}
+
+ @Test
public void testPowerPointCustomProperties() throws Exception {
InputStream input = OOXMLParserTest.class.getResourceAsStream(
"/test-documents/testPPT_custom_props.pptx");
@@ -861,6 +886,7 @@ public class OOXMLParserTest extends Tik
}
// TIKA-989:
+ @Test
public void testEmbeddedPDF() throws Exception {
InputStream input = OOXMLParserTest.class.getResourceAsStream(
"/test-documents/testWORD_embedded_pdf.docx");
@@ -896,6 +922,7 @@ public class OOXMLParserTest extends Tik
}
// TIKA-997:
+ @Test
public void testEmbeddedZipInPPTX() throws Exception {
String xml = getXML("test_embedded_zip.pptx").xml;
int h = xml.indexOf("<div class=\"embedded\" id=\"slide1_rId3\" />");
@@ -912,6 +939,7 @@ public class OOXMLParserTest extends Tik
}
// TIKA-1006
+ @Test
public void testWordNullStyle() throws Exception {
String xml = getXML("testWORD_null_style.docx").xml;
assertContains("Test av styrt dokument", xml);
@@ -921,6 +949,7 @@ public class OOXMLParserTest extends Tik
* TIKA-1044 - Handle word documents where parts of the
* text have no formatting or styles applied to them
*/
+ @Test
public void testNoFormat() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -938,6 +967,7 @@ public class OOXMLParserTest extends Tik
}
// TIKA-1005:
+ @Test
public void testTextInsideTextBox() throws Exception {
String xml = getXML("testWORD_text_box.docx").xml;
assertContains("This text is directly in the body of the document.", xml);
@@ -947,6 +977,7 @@ public class OOXMLParserTest extends Tik
}
// TIKA-1032:
+ @Test
public void testEmbeddedPPTXTwoSlides() throws Exception {
String xml = getXML("testPPT_embedded_two_slides.pptx").xml;
assertContains("<div class=\"embedded\" id=\"slide1_rId7\" />" , xml);
@@ -957,6 +988,7 @@ public class OOXMLParserTest extends Tik
* Test for missing text described in
* <a href="https://issues.apache.org/jira/browse/TIKA-1130">TIKA-1130</a>.
*/
+ @Test
public void testMissingText() throws Exception {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
@@ -976,6 +1008,7 @@ public class OOXMLParserTest extends Tik
}
//TIKA-1100:
+ @Test
public void testExcelTextBox() throws Exception {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
@@ -987,6 +1020,7 @@ public class OOXMLParserTest extends Tik
}
//TIKA-792; with room for future missing bean tests
+ @Test
public void testWordMissingOOXMLBeans() throws Exception{
//If a bean is missing, POI prints stack trace to stderr
String[] fileNames = new String[]{
@@ -1014,6 +1048,7 @@ public class OOXMLParserTest extends Tik
}
//TIKA-817
+ @Test
public void testPPTXAutodate() throws Exception {
//Following POI-52368, the stored date is extracted,
//not the auto-generated date.
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,10 +16,11 @@
*/
package org.apache.tika.parser.mp3;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -28,12 +29,13 @@ import org.apache.tika.parser.AutoDetect
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
* Test case for parsing mp3 files.
*/
-public class Mp3ParserTest extends TestCase {
+public class Mp3ParserTest {
/**
* Checks the duration of an MP3 file.
@@ -48,6 +50,7 @@ public class Mp3ParserTest extends TestC
/**
* Test that with only ID3v1 tags, we get some information out
*/
+ @Test
public void testMp3ParsingID3v1() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -84,6 +87,7 @@ public class Mp3ParserTest extends TestC
* Test that with only ID3v2 tags, we get the full
* set of information out.
*/
+ @Test
public void testMp3ParsingID3v2() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -136,6 +140,7 @@ public class Mp3ParserTest extends TestC
* Test that with both id3v2 and id3v1, we prefer the
* details from id3v2
*/
+ @Test
public void testMp3ParsingID3v1v2() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -172,6 +177,7 @@ public class Mp3ParserTest extends TestC
* Test that with only ID3v2 tags, of version 2.4, we get the full
* set of information out.
*/
+ @Test
public void testMp3ParsingID3v24() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -208,6 +214,7 @@ public class Mp3ParserTest extends TestC
* Tests that a file with characters not in the ISO 8859-1
* range is correctly handled
*/
+ @Test
public void testMp3ParsingID3i18n() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -244,6 +251,7 @@ public class Mp3ParserTest extends TestC
* Tests that a file with both lyrics and
* ID3v2 tags gets both extracted correctly
*/
+ @Test
public void testMp3ParsingLyrics() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -280,6 +288,7 @@ public class Mp3ParserTest extends TestC
checkDuration(metadata, 1);
}
+ @Test
public void testID3v2Frame() throws Exception {
byte[] empty = new byte[] {
0x49, 0x44, 0x33, 3, 1, 0,
@@ -309,6 +318,7 @@ public class Mp3ParserTest extends TestC
* This test will check for the complicated set of ID3v2.4
* tags.
*/
+ @Test
public void testTIKA424() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -348,6 +358,7 @@ public class Mp3ParserTest extends TestC
* In this case, it is a file with JPEG data in the ID3, which
* is trunacted before the end of the JPEG bit of the ID3 frame.
*/
+ @Test
public void testTIKA474() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -382,6 +393,7 @@ public class Mp3ParserTest extends TestC
}
// TIKA-1024
+ @Test
public void testNakedUTF16BOM() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,9 +16,10 @@
*/
package org.apache.tika.parser.mp4;
-import java.io.InputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import java.io.InputStream;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
@@ -28,16 +29,18 @@ import org.apache.tika.parser.AutoDetect
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
* Test case for parsing mp4 files.
*/
-public class MP4ParserTest extends TestCase {
+public class MP4ParserTest {
/**
* Test that we can extract information from
* a M4A MP4 Audio file
*/
+ @Test
public void testMP4ParsingAudio() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java Thu Dec 19 19:46:49 2013
@@ -17,25 +17,28 @@
package org.apache.tika.parser.netcdf;
//JDK imports
+import static org.junit.Assert.assertEquals;
+
import java.io.InputStream;
+
+
//TIKA imports
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
-//Junit imports
-import junit.framework.TestCase;
-
/**
* Test cases to exercise the {@link NetCDFParser}.
*
*/
-public class NetCDFParserTest extends TestCase {
+public class NetCDFParserTest {
+ @Test
public void testParseGlobalMetadata() throws Exception {
if(System.getProperty("java.version").startsWith("1.5")) {
return;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,9 @@
*/
package org.apache.tika.parser.odf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import org.apache.tika.TikaTest;
@@ -28,6 +31,7 @@ import org.apache.tika.parser.ParseConte
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.opendocument.OpenOfficeParser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
public class ODFParserTest extends TikaTest {
@@ -42,6 +46,7 @@ public class ODFParserTest extends TikaT
};
}
+ @Test
public void testOO3() throws Exception {
for (Parser parser : getParsers()) {
InputStream input = ODFParserTest.class.getResourceAsStream(
@@ -67,6 +72,7 @@ public class ODFParserTest extends TikaT
}
}
+ @Test
public void testOO2() throws Exception {
for (Parser parser : getParsers()) {
InputStream input = ODFParserTest.class.getResourceAsStream(
@@ -139,6 +145,7 @@ public class ODFParserTest extends TikaT
* Similar to {@link #testXMLParser()}, but using a different
* OO2 file with different metadata in it
*/
+ @Test
public void testOO2Metadata() throws Exception {
InputStream input = ODFParserTest.class.getResourceAsStream(
"/test-documents/testOpenOffice2.odf");
@@ -200,6 +207,7 @@ public class ODFParserTest extends TikaT
/**
* Similar to {@link #testXMLParser()}, but using an OO3 file
*/
+ @Test
public void testOO3Metadata() throws Exception {
InputStream input = ODFParserTest.class.getResourceAsStream(
"/test-documents/testODFwithOOo3.odt");
@@ -269,6 +277,7 @@ public class ODFParserTest extends TikaT
}
}
+ @Test
public void testODPMasterFooter() throws Exception {
InputStream input = ODFParserTest.class.getResourceAsStream(
"/test-documents/testMasterFooter.odp");
@@ -284,6 +293,7 @@ public class ODFParserTest extends TikaT
}
}
+ @Test
public void testODTFooter() throws Exception {
InputStream input = ODFParserTest.class.getResourceAsStream(
"/test-documents/testFooter.odt");
@@ -301,6 +311,7 @@ public class ODFParserTest extends TikaT
}
}
+ @Test
public void testODSFooter() throws Exception {
InputStream input = ODFParserTest.class.getResourceAsStream(
"/test-documents/testFooter.ods");
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,11 @@
*/
package org.apache.tika.parser.pdf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -36,6 +41,7 @@ import org.apache.tika.parser.Parser;
import org.apache.tika.parser.PasswordProvider;
import org.apache.tika.parser.microsoft.AbstractPOIContainerExtractionTest.TrackingHandler;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
* Test case for parsing pdf files.
@@ -47,6 +53,7 @@ public class PDFParserTest extends TikaT
public static final MediaType TYPE_DOCX = MediaType.application("vnd.openxmlformats-officedocument.wordprocessingml.document");
+ @Test
public void testPdfParsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
Metadata metadata = new Metadata();
@@ -77,6 +84,7 @@ public class PDFParserTest extends TikaT
!content.contains("libraries.Apache"));
}
+ @Test
public void testCustomMetadata() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
Metadata metadata = new Metadata();
@@ -106,6 +114,7 @@ public class PDFParserTest extends TikaT
* they're encrypted (potentially both text and metadata),
* but we can decrypt them easily.
*/
+ @Test
public void testProtectedPDF() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -163,6 +172,7 @@ public class PDFParserTest extends TikaT
assertTrue(content.contains("In many important respects"));
}
+ @Test
public void testTwoTextBoxes() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
InputStream stream = PDFParserTest.class.getResourceAsStream(
@@ -172,6 +182,7 @@ public class PDFParserTest extends TikaT
assertTrue(content.contains("Left column line 1 Left column line 2 Right column line 1 Right column line 2"));
}
+ @Test
public void testVarious() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
Metadata metadata = new Metadata();
@@ -237,6 +248,7 @@ public class PDFParserTest extends TikaT
//assertContains("\uD800\uDF32\uD800\uDF3f\uD800\uDF44\uD800\uDF39\uD800\uDF43\uD800\uDF3A", content);
}
+ @Test
public void testAnnotations() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
InputStream stream = getResourceAsStream("/test-documents/testAnnotations.pdf");
@@ -273,6 +285,7 @@ public class PDFParserTest extends TikaT
}
// TIKA-981
+ @Test
public void testPopupAnnotation() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
InputStream stream = getResourceAsStream("/test-documents/testPopupAnnotation.pdf");
@@ -281,6 +294,7 @@ public class PDFParserTest extends TikaT
assertContains("igalsh", content);
}
+ @Test
public void testEmbeddedPDFs() throws Exception {
String xml = getXML("testPDFPackage.pdf").xml;
assertContains("PDF1", xml);
@@ -302,6 +316,7 @@ public class PDFParserTest extends TikaT
return count;
}
+ @Test
public void testPageNumber() throws Exception {
final XMLResult result = getXML("testPageNumber.pdf");
final String content = result.xml.replaceAll("\\s+","");
@@ -316,11 +331,13 @@ public class PDFParserTest extends TikaT
* test will need updating when we're able to apply the annotation
* to the text itself, rather than following on afterwards as now
*/
+ @Test
public void testLinks() throws Exception {
final XMLResult result = getXML("testPDFVarious.pdf");
assertContains("<div class=\"annotation\"><a href=\"http://tika.apache.org/\" /></div>", result.xml);
}
+ @Test
public void testDisableAutoSpace() throws Exception {
PDFParser parser = new PDFParser();
parser.getPDFParserConfig().setEnableAutoSpace(false);
@@ -361,6 +378,7 @@ public class PDFParserTest extends TikaT
}
+ @Test
public void testDuplicateOverlappingText() throws Exception {
PDFParser parser = new PDFParser();
InputStream stream = getResourceAsStream("/test-documents/testOverlappingText.pdf");
@@ -392,6 +410,7 @@ public class PDFParserTest extends TikaT
}
+ @Test
public void testSortByPosition() throws Exception {
PDFParser parser = new PDFParser();
parser.getPDFParserConfig().setEnableAutoSpace(false);
@@ -430,6 +449,7 @@ public class PDFParserTest extends TikaT
}
// TIKA-1035
+ @Test
public void testBookmarks() throws Exception {
String xml = getXML("testPDF_bookmarks.pdf").xml;
int i = xml.indexOf("Denmark bookmark is here");
@@ -440,6 +460,7 @@ public class PDFParserTest extends TikaT
}
//TIKA-1124
+ @Test
public void testEmbeddedPDFEmbeddingAnotherDocument() throws Exception {
/* format of test doc:
docx/
@@ -495,6 +516,7 @@ public class PDFParserTest extends TikaT
*
* TODO: more testing
*/
+ @Test
public void testSequentialParser() throws Exception{
Parser defaultParser = new AutoDetectParser();
Parser sequentialParser = new AutoDetectParser();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java Thu Dec 19 19:46:49 2013
@@ -30,6 +30,7 @@ import org.apache.tika.parser.AbstractPa
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.junit.Before;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -43,9 +44,8 @@ public abstract class AbstractPkgTest ex
protected Parser autoDetectParser;
protected EmbeddedTrackingParser tracker;
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
tracker = new EmbeddedTrackingParser();
trackingContext = new ParseContext();
trackingContext.set(Parser.class, tracker);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java Thu Dec 19 19:46:49 2013
@@ -17,15 +17,21 @@
package org.apache.tika.parser.pkg;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
public class ArParserTest extends AbstractPkgTest {
+ @Test
public void testArParsing() throws Exception {
Parser parser = new AutoDetectParser();
@@ -65,6 +71,7 @@ public class ArParserTest extends Abstra
* Tests that the ParseContext parser is correctly fired for all the
* embedded entries.
*/
+ @Test
public void testEmbedded() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,12 +16,16 @@
*/
package org.apache.tika.parser.pkg;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
@@ -29,6 +33,7 @@ import org.xml.sax.ContentHandler;
*/
public class Bzip2ParserTest extends AbstractPkgTest {
+ @Test
public void testBzip2Parsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -69,6 +74,7 @@ public class Bzip2ParserTest extends Abs
* Tests that the ParseContext parser is correctly
* fired for all the embedded entries.
*/
+ @Test
public void testEmbedded() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,12 +16,16 @@
*/
package org.apache.tika.parser.pkg;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
@@ -29,6 +33,7 @@ import org.xml.sax.ContentHandler;
*/
public class GzipParserTest extends AbstractPkgTest {
+ @Test
public void testGzipParsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -68,6 +73,7 @@ public class GzipParserTest extends Abst
* Tests that the ParseContext parser is correctly
* fired for all the embedded entries.
*/
+ @Test
public void testEmbedded() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -92,6 +98,7 @@ public class GzipParserTest extends Abst
assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, "ASCII"));
}
+ @Test
public void testSvgzParsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,12 +16,17 @@
*/
package org.apache.tika.parser.pkg;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
@@ -29,6 +34,7 @@ import org.xml.sax.ContentHandler;
*/
public class TarParserTest extends AbstractPkgTest {
+ @Test
public void testTarParsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -68,6 +74,7 @@ public class TarParserTest extends Abstr
* Tests that the ParseContext parser is correctly
* fired for all the embedded entries.
*/
+ @Test
public void testEmbedded() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,10 @@
*/
package org.apache.tika.parser.pkg;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
@@ -27,6 +31,7 @@ import org.apache.tika.parser.AutoDetect
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
/**
@@ -34,6 +39,7 @@ import org.xml.sax.ContentHandler;
*/
public class ZipParserTest extends AbstractPkgTest {
+ @Test
public void testZipParsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -73,6 +79,7 @@ public class ZipParserTest extends Abstr
* Tests that the ParseContext parser is correctly
* fired for all the embedded entries.
*/
+ @Test
public void testEmbedded() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
ContentHandler handler = new BodyContentHandler();
@@ -114,6 +121,7 @@ public class ZipParserTest extends Abstr
*
* @see <a href="https://issues.apache.org/jira/browse/TIKA-346">TIKA-346</a>
*/
+ @Test
public void testUnsupportedZipCompressionMethod() throws Exception {
String content = new Tika().parseToString(
ZipParserTest.class.getResourceAsStream(
@@ -137,6 +145,7 @@ public class ZipParserTest extends Abstr
}
// TIKA-1036
+ @Test
public void testPlaceholders() throws Exception {
String xml = getXML("testEmbedded.zip").xml;
assertContains("<div class=\"embedded\" id=\"test1.txt\" />", xml);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,18 +16,22 @@
*/
package org.apache.tika.parser.prt;
+import static org.junit.Assert.assertEquals;
+
import java.io.InputStream;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
public class PRTParserTest extends TikaTest {
/**
* Try with a simple file
*/
+ @Test
public void testPRTParserBasics() throws Exception {
InputStream input = getResourceAsStream("/test-documents/testCADKEY.prt");
try {
@@ -66,6 +70,7 @@ public class PRTParserTest extends TikaT
/**
* Now a more complex one
*/
+ @Test
public void testPRTParserComplex() throws Exception {
InputStream input = getResourceAsStream("/test-documents/testCADKEY2.prt");
try {
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,10 @@
*/
package org.apache.tika.parser.rtf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -30,6 +34,7 @@ import org.apache.tika.metadata.OfficeOp
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.WriteOutContentHandler;
+import org.junit.Test;
/**
* Junit test class for the Tika {@link RTFParser}
@@ -48,6 +53,7 @@ public class RTFParserTest extends TikaT
}
}
+ @Test
public void testBasicExtraction() throws Exception {
File file = getResourceAsFile("/test-documents/testRTF.rtf");
@@ -65,12 +71,14 @@ public class RTFParserTest extends TikaT
assertContains("indexation Word", content);
}
+ @Test
public void testUmlautSpacesExtraction2() throws Exception {
String content = getText("testRTFUmlautSpaces2.rtf");
content = content.replaceAll("\\s+", "");
assertEquals("\u00DCbersicht", content);
}
+ @Test
public void testUnicodeUCNControlWordCharacterDoublingExtraction() throws Exception {
String content = getText("testRTFUnicodeUCNControlWordCharacterDoubling.rtf");
@@ -81,17 +89,20 @@ public class RTFParserTest extends TikaT
assertFalse("Doubled character \u5E74", content.contains("\u5E74\u5E74"));
}
+ @Test
public void testHexEscapeInsideWord() throws Exception {
String content = getText("testRTFHexEscapeInsideWord.rtf");
assertContains("ESP\u00cdRITO", content);
}
+ @Test
public void testWindowsCodepage1250() throws Exception {
String content = getText("testRTFWindowsCodepage1250.rtf");
assertContains("za\u017c\u00f3\u0142\u0107 g\u0119\u015bl\u0105 ja\u017a\u0144", content);
assertContains("ZA\u017b\u00d3\u0141\u0106 G\u0118\u015aL\u0104 JA\u0179\u0143", content);
}
+ @Test
public void testTableCellSeparation() throws Exception {
File file = getResourceAsFile("/test-documents/testRTFTableCellSeparation.rtf");
String content = tika.parseToString(file);
@@ -100,6 +111,7 @@ public class RTFParserTest extends TikaT
assertContains("a b c d \u00E4 \u00EB \u00F6 \u00FC", content);
}
+ @Test
public void testTableCellSeparation2() throws Exception {
String content = getText("testRTFTableCellSeparation2.rtf");
// TODO: why do we insert extra whitespace...?
@@ -107,6 +119,7 @@ public class RTFParserTest extends TikaT
assertContains("Station Fax", content);
}
+ @Test
public void testWordPadCzechCharactersExtraction() throws Exception {
File file = getResourceAsFile("/test-documents/testRTFWordPadCzechCharacters.rtf");
String s1 = tika.parseToString(file);
@@ -114,6 +127,7 @@ public class RTFParserTest extends TikaT
assertTrue(s1.contains("starov\u011Bk\u00E9 \u017Eidovsk\u00E9 n\u00E1bo\u017Eensk\u00E9 texty"));
}
+ @Test
public void testWord2010CzechCharactersExtraction() throws Exception {
File file = getResourceAsFile("/test-documents/testRTFWord2010CzechCharacters.rtf");
String s1 = tika.parseToString(file);
@@ -121,6 +135,7 @@ public class RTFParserTest extends TikaT
assertTrue(s1.contains("starov\u011Bk\u00E9 \u017Eidovsk\u00E9 n\u00E1bo\u017Eensk\u00E9 texty"));
}
+ @Test
public void testMS932Extraction() throws Exception {
File file = getResourceAsFile("/test-documents/testRTF-ms932.rtf");
String s1 = tika.parseToString(file);
@@ -133,17 +148,20 @@ public class RTFParserTest extends TikaT
assertEquals("\u30bf\u30a4\u30c8\u30eb", r.metadata.get(TikaCoreProperties.TITLE));
}
+ @Test
public void testUmlautSpacesExtraction() throws Exception {
File file = getResourceAsFile("/test-documents/testRTFUmlautSpaces.rtf");
String s1 = tika.parseToString(file);
assertTrue(s1.contains("\u00DCbersicht"));
}
+ @Test
public void testGothic() throws Exception {
String content = getText("testRTFUnicodeGothic.rtf");
assertContains("\uD800\uDF32\uD800\uDF3f\uD800\uDF44\uD800\uDF39\uD800\uDF43\uD800\uDF3A", content);
}
+ @Test
public void testJapaneseText() throws Exception {
Result r = getResult("testRTFJapanese.rtf");
String content = r.text;
@@ -163,6 +181,7 @@ public class RTFParserTest extends TikaT
assertContains("\u6771\u4eac\u90fd\u4e09\u9df9\u5e02", content);
}
+ @Test
public void testMaxLength() throws Exception {
File file = getResourceAsFile("/test-documents/testRTFJapanese.rtf");
Metadata metadata = new Metadata();
@@ -192,11 +211,13 @@ public class RTFParserTest extends TikaT
assertTrue(content.length() <= 100);
}
+ @Test
public void testTextWithCurlyBraces() throws Exception {
String content = getText("testRTFWithCurlyBraces.rtf");
assertContains("{ some text inside curly brackets }", content);
}
+ @Test
public void testControls() throws Exception {
Result r = getResult("testRTFControls.rtf");
String content = r.text;
@@ -210,7 +231,7 @@ public class RTFParserTest extends TikaT
assertContains("\u201cDouble quoted text again\u201d", content);
}
-
+ @Test
public void testInvalidUnicode() throws Exception {
Result r = getResult("testRTFInvalidUnicode.rtf");
String content = r.text;
@@ -219,6 +240,7 @@ public class RTFParserTest extends TikaT
assertContains("Mismatched pair \ufffd\ufffd here", content);
}
+ @Test
public void testVarious() throws Exception {
Result r = getResult("testRTFVarious.rtf");
String content = r.text;
@@ -277,12 +299,14 @@ public class RTFParserTest extends TikaT
assertContains("\uD800\uDF32\uD800\uDF3f\uD800\uDF44\uD800\uDF39\uD800\uDF43\uD800\uDF3A", content);
}
+ @Test
public void testVariousStyle() throws Exception {
String content = getXML("testRTFVarious.rtf").xml;
assertContains("<b>Bold</b>", content);
assertContains("<i>italic</i>", content);
}
+ @Test
public void testBoldItalic() throws Exception {
String content = getXML("testRTFBoldItalic.rtf").xml;
assertContains("<b>bold</b>", content);
@@ -293,21 +317,25 @@ public class RTFParserTest extends TikaT
assertContains("<i>italic then </i><b><i>bold then</i></b><b> not italic</b>", content);
}
+ @Test
public void testHyperlink() throws Exception {
String content = getXML("testRTFHyperlink.rtf").xml;
assertContains("our most <a href=\"http://r.office.microsoft.com/r/rlidwelcomeFAQ?clid=1033\">frequently asked questions</a>", content);
assertEquals(-1, content.indexOf("<p>\t\t</p>"));
}
+ @Test
public void testIgnoredControlWord() throws Exception {
assertContains("<p>The quick brown fox jumps over the lazy dog</p>", getXML("testRTFIgnoredControlWord.rtf").xml);
}
+ @Test
public void testFontAfterBufferedText() throws Exception {
assertContains("\u0423\u0432\u0430\u0436\u0430\u0435\u043c\u044b\u0439 \u043a\u043b\u0438\u0435\u043d\u0442!",
getXML("testFontAfterBufferedText.rtf").xml);
}
+ @Test
public void testListMicrosoftWord() throws Exception {
String content = getXML("testRTFListMicrosoftWord.rtf").xml;
assertContains("<ol>\t<li>one</li>", content);
@@ -316,6 +344,7 @@ public class RTFParserTest extends TikaT
assertContains("</ul>", content);
}
+ @Test
public void testListLibreOffice() throws Exception {
String content = getXML("testRTFListLibreOffice.rtf").xml;
assertContains("<ol>\t<li>one</li>", content);
@@ -325,11 +354,13 @@ public class RTFParserTest extends TikaT
}
// TIKA-782
+ @Test
public void testBinControlWord() throws Exception {
assertTrue(getXML("testBinControlWord.rtf").xml.indexOf("\u00ff\u00ff\u00ff\u00ff") == -1);
}
// TIKA-999
+ @Test
public void testMetaDataCounts() throws Exception {
XMLResult xml = getXML("test_embedded_package.rtf");
assertEquals("1", xml.metadata.get(Office.PAGE_COUNT));
@@ -339,6 +370,7 @@ public class RTFParserTest extends TikaT
}
// TIKA-1192
+ @Test
public void testListOverride() throws Exception {
Result r = getResult("testRTFListOverride.rtf");
String content = r.text;
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java Thu Dec 19 19:46:49 2013
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
public class CharsetDetectorTest {
+
@Test
public void testTagDropper() throws IOException {
InputStream in = CharsetDetectorTest.class.getResourceAsStream( "/test-documents/resume.html" );
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,10 @@
*/
package org.apache.tika.parser.txt;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
@@ -25,15 +29,15 @@ import org.apache.tika.parser.ParseConte
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.WriteOutContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;
-import junit.framework.TestCase;
-
-public class TXTParserTest extends TestCase {
+public class TXTParserTest {
private Parser parser = new TXTParser();
+ @Test
public void testEnglishText() throws Exception {
String text =
"Hello, World! This is simple UTF-8 text content written"
@@ -61,6 +65,7 @@ public class TXTParserTest extends TestC
assertTrue(content.contains("stream"));
}
+ @Test
public void testUTF8Text() throws Exception {
String text = "I\u00F1t\u00EBrn\u00E2ti\u00F4n\u00E0liz\u00E6ti\u00F8n";
@@ -75,6 +80,7 @@ public class TXTParserTest extends TestC
assertTrue(handler.toString().contains(text));
}
+ @Test
public void testEmptyText() throws Exception {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
@@ -91,6 +97,7 @@ public class TXTParserTest extends TestC
* otherwise ISO-8859-1, except if it contains the currency/euro symbol
* (byte 0xa4) in which case it's more likely to be ISO-8859-15.
*/
+ @Test
public void testLatinDetectionHeuristics() throws Exception {
String windows = "test\r\n";
String unix = "test\n";
@@ -128,6 +135,7 @@ public class TXTParserTest extends TestC
*
* @see <a href="https://issues.apache.org/jira/browse/TIKA-240">TIKA-240</a>
*/
+ @Test
public void testDropByteOrderMark() throws Exception {
assertExtractText("UTF-8 BOM", "test", new byte[] {
(byte) 0xEF, (byte) 0xBB, (byte) 0xBF, 't', 'e', 's', 't' });
@@ -142,6 +150,7 @@ public class TXTParserTest extends TestC
*
* @see <a href="https://issues.apache.org/jira/browse/TIKA-335">TIKA-335</a>
*/
+ @Test
public void testUseIncomingCharsetAsHint() throws Exception {
// Could be ISO 8859-1 or ISO 8859-15 or ...
// u00e1 is latin small letter a with acute
@@ -167,6 +176,7 @@ public class TXTParserTest extends TestC
*
* @see <a href="https://issues.apache.org/jira/browse/TIKA-341">TIKA-341</a>
*/
+ @Test
public void testUsingCharsetInContentTypeHeader() throws Exception {
// Could be ISO 8859-1 or ISO 8859-15 or ...
// u00e1 is latin small letter a with acute
@@ -205,6 +215,7 @@ public class TXTParserTest extends TestC
*
* @see <a href="https://issues.apache.org/jira/browse/TIKA-335">TIKA-335</a>
*/
+ @Test
public void testRetainIncomingLanguage() throws Exception {
final String test = "Simple Content";
@@ -218,6 +229,7 @@ public class TXTParserTest extends TestC
assertEquals("en", metadata.get(TikaCoreProperties.LANGUAGE));
}
+ @Test
public void testCP866() throws Exception {
Metadata metadata = new Metadata();
StringWriter writer = new StringWriter();
@@ -230,6 +242,7 @@ public class TXTParserTest extends TestC
assertEquals("text/plain; charset=IBM866", metadata.get(Metadata.CONTENT_TYPE));
}
+ @Test
public void testEBCDIC_CP500() throws Exception {
Metadata metadata = new Metadata();
StringWriter writer = new StringWriter();
@@ -258,6 +271,7 @@ public class TXTParserTest extends TestC
*
* @see <a href="https://issues.apache.org/jira/browse/TIKA-771">TIKA-771</a>
*/
+ @Test
public void testCharsetDetectionWithShortSnipet() throws Exception {
final String text = "Hello, World!";
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/video/FLVParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/video/FLVParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/video/FLVParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,13 +16,15 @@
*/
package org.apache.tika.parser.video;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
+import org.junit.Test;
-public class FLVParserTest extends TestCase {
+public class FLVParserTest {
+ @Test
public void testFLV() throws Exception {
String path = "/test-documents/testFLV.flv";
Metadata metadata = new Metadata();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,17 +16,23 @@
*/
package org.apache.tika.parser.xml;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;
public class DcXMLParserTest extends TikaTest {
+ @Test
public void testXMLParserAsciiChars() throws Exception {
InputStream input = DcXMLParserTest.class.getResourceAsStream(
"/test-documents/testXML.xml");
@@ -78,6 +84,7 @@ public class DcXMLParserTest extends Tik
}
}
+ @Test
public void testXMLParserNonAsciiChars() throws Exception {
InputStream input = DcXMLParserTest.class.getResourceAsStream("/test-documents/testXML.xml");
try {
@@ -92,6 +99,7 @@ public class DcXMLParserTest extends Tik
}
// TIKA-1048
+ @Test
public void testNoSpaces() throws Exception {
String text = getXML("testXML2.xml").xml;
assertFalse(text.contains("testSubject"));
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,6 +16,8 @@
*/
package org.apache.tika.parser.xml;
+import static org.junit.Assert.assertEquals;
+
import java.io.InputStream;
import org.apache.tika.TikaTest;
@@ -24,6 +26,7 @@ import org.apache.tika.metadata.Property
import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.TeeContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
public class EmptyAndDuplicateElementsXMLParserTest extends TikaTest {
@@ -33,6 +36,7 @@ public class EmptyAndDuplicateElementsXM
private Property LAST_NAME = Property.internalTextBag(
"custom" + Metadata.NAMESPACE_PREFIX_DELIMITER + "LastName");
+ @Test
public void testDefaultBehavior() throws Exception {
InputStream input = EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
"/test-documents/testXML3.xml");
@@ -60,6 +64,7 @@ public class EmptyAndDuplicateElementsXM
}
}
+ @Test
public void testEmptiesAndRepeats() throws Exception {
InputStream input = EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
"/test-documents/testXML3.xml");
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java Thu Dec 19 19:46:49 2013
@@ -16,20 +16,23 @@
*/
package org.apache.tika.parser.xml;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.tika.extractor.ContainerExtractor;
-import org.apache.tika.extractor.EmbeddedDocumentExtractor;
import org.apache.tika.extractor.ParserContainerExtractor;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.microsoft.AbstractPOIContainerExtractionTest;
import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
import org.xml.sax.ContentHandler;
import java.io.InputStream;
-public class FictionBookParserTest extends TestCase {
+public class FictionBookParserTest {
+
+ @Test
public void testFB2() throws Exception {
InputStream input = FictionBookParserTest.class.getResourceAsStream("/test-documents/test.fb2");
try {
@@ -44,6 +47,7 @@ public class FictionBookParserTest exten
}
}
+ @Test
public void testEmbedded() throws Exception {
InputStream input = FictionBookParserTest.class.getResourceAsStream("/test-documents/test.fb2");
try {
Modified: tika/trunk/tika-server/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/pom.xml?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-server/pom.xml (original)
+++ tika/trunk/tika-server/pom.xml Thu Dec 19 19:46:49 2013
@@ -62,6 +62,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>4.11</version>
</dependency>
</dependencies>
@@ -171,4 +172,22 @@
</plugins>
</build>
+ <url>http://tika.apache.org/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <scm>
+ <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>
+ <url>https://issues.apache.org/jira/browse/TIKA</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/job/Tika-trunk/</url>
+ </ciManagement>
</project>
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=1552405&r1=1552404&r2=1552405&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 Thu Dec 19 19:46:49 2013
@@ -28,9 +28,8 @@ import org.apache.commons.compress.archi
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
-import junit.framework.TestCase;
-public class CXFTestBase extends TestCase {
+public class CXFTestBase {
protected String getStringFromInputStream(InputStream in) throws Exception {
CachedOutputStream bos = new CachedOutputStream();
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataEPTest.java Thu Dec 19 19:46:49 2013
@@ -17,6 +17,9 @@ package org.apache.tika.server;
* limitations under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -40,7 +43,9 @@ import org.apache.cxf.jaxrs.JAXRSServerF
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.tika.io.IOUtils;
import org.eclipse.jetty.util.ajax.JSON;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import au.com.bytecode.opencsv.CSVReader;
@@ -66,13 +71,8 @@ public class MetadataEPTest extends CXFT
return new ByteArrayInputStream(out.toByteArray());
}
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(MetadataEP.class);
List<Object> providers = new ArrayList<Object>();
@@ -87,13 +87,8 @@ public class MetadataEPTest extends CXFT
server = sf.create();
}
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() {
server.stop();
server.destroy();
}
@@ -106,6 +101,7 @@ public class MetadataEPTest extends CXFT
Reader reader = new InputStreamReader((InputStream) response.getEntity());
+ @SuppressWarnings("resource")
CSVReader csvReader = new CSVReader(reader);
Map<String, String> metadata = new HashMap<String, String>();
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=1552405&r1=1552404&r2=1552405&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 Thu Dec 19 19:46:49 2013
@@ -17,6 +17,9 @@
package org.apache.tika.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -31,6 +34,8 @@ import org.apache.cxf.jaxrs.JAXRSBinding
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import au.com.bytecode.opencsv.CSVReader;
@@ -43,13 +48,8 @@ public class MetadataResourceTest extend
private Server server;
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(MetadataResource.class);
sf.setResourceProvider(MetadataResource.class,
@@ -64,13 +64,8 @@ public class MetadataResourceTest extend
server = sf.create();
}
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() {
server.stop();
server.destroy();
}
@@ -87,7 +82,8 @@ public class MetadataResourceTest extend
Reader reader = new InputStreamReader(
(InputStream) response.getEntity());
- CSVReader csvReader = new CSVReader(reader);
+ @SuppressWarnings("resource")
+ CSVReader csvReader = new CSVReader(reader);
Map<String, String> metadata = new HashMap<String, String>();
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=1552405&r1=1552404&r2=1552405&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 Thu Dec 19 19:46:49 2013
@@ -17,6 +17,9 @@
package org.apache.tika.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import javax.ws.rs.core.Response;
@@ -28,6 +31,8 @@ import org.apache.cxf.jaxrs.JAXRSServerF
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class TikaResourceTest extends CXFTestBase {
@@ -40,13 +45,8 @@ public class TikaResourceTest extends CX
private Server server;
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(TikaResource.class);
sf.setResourceProvider(TikaResource.class,
@@ -61,13 +61,8 @@ public class TikaResourceTest extends CX
server = sf.create();
}
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
server.stop();
server.destroy();
}
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java Thu Dec 19 19:46:49 2013
@@ -17,6 +17,8 @@
package org.apache.tika.server;
+import static org.junit.Assert.assertEquals;
+
import java.io.InputStream;
import javax.ws.rs.core.Response;
@@ -28,6 +30,8 @@ import org.apache.cxf.jaxrs.JAXRSServerF
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.tika.Tika;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class TikaVersionTest extends CXFTestBase {
@@ -37,13 +41,8 @@ public class TikaVersionTest extends CXF
+ TikaServerCli.DEFAULT_PORT;
private Server server;
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(TikaVersion.class);
sf.setResourceProvider(
@@ -67,13 +66,8 @@ public class TikaVersionTest extends CXF
server = sf.create();
}
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
server.stop();
server.destroy();
}
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=1552405&r1=1552404&r2=1552405&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 Thu Dec 19 19:46:49 2013
@@ -17,6 +17,11 @@
package org.apache.tika.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
@@ -26,12 +31,15 @@ import org.apache.cxf.jaxrs.JAXRSBinding
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
import javax.ws.rs.core.Response;
public class UnpackerResourceTest extends CXFTestBase {
@@ -67,13 +75,8 @@ public class UnpackerResourceTest extend
private Server server;
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
List<Object> providers = new ArrayList<Object>();
providers.add(new TarWriter());
@@ -93,13 +96,8 @@ public class UnpackerResourceTest extend
server = sf.create();
}
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() {
server.stop();
server.destroy();
}
Modified: tika/trunk/tika-xmp/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-xmp/pom.xml?rev=1552405&r1=1552404&r2=1552405&view=diff
==============================================================================
--- tika/trunk/tika-xmp/pom.xml (original)
+++ tika/trunk/tika-xmp/pom.xml Thu Dec 19 19:46:49 2013
@@ -80,7 +80,26 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>4.11</version>
</dependency>
</dependencies>
+ <url>http://tika.apache.org/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <scm>
+ <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>
+ <url>https://issues.apache.org/jira/browse/TIKA</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/job/Tika-trunk/</url>
+ </ciManagement>
</project>