You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2015/01/14 13:16:42 UTC
svn commit: r1651634 - in
/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser: audio/ dwg/
epub/ font/ fork/ html/ ibooks/ mail/ mbox/ microsoft/ mp3/ mp4/ netcdf/
odf/ pdf/ rtf/ txt/ xml/
Author: nick
Date: Wed Jan 14 12:16:41 2015
New Revision: 1651634
URL: http://svn.apache.org/r1651634
Log:
Use assertContains(needle,haystack) rather than assertTrue(haystack.contains(needle)), to get more helpful failure error messages
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java Wed Jan 14 12:16:41 2015
@@ -17,7 +17,7 @@
package org.apache.tika.parser.audio;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.apache.tika.TikaTest.assertContains;
import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
@@ -37,6 +37,6 @@ public class MidiParserTest {
assertEquals("0", metadata.get("patches"));
assertEquals("PPQ", metadata.get("divisionType"));
- assertTrue(content.contains("Untitled"));
+ assertContains("Untitled", content);
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java Wed Jan 14 12:16:41 2015
@@ -18,7 +18,7 @@ package org.apache.tika.parser.dwg;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.apache.tika.TikaTest.assertContains;
import java.io.InputStream;
@@ -133,9 +133,9 @@ public class DWGParserTest {
metadata.get(Metadata.SUBJECT));
String content = handler.toString();
- assertTrue(content.contains("The quick brown fox jumps over the lazy dog"));
- assertTrue(content.contains("Gym class"));
- assertTrue(content.contains("www.alfresco.com"));
+ assertContains("The quick brown fox jumps over the lazy dog", content);
+ assertContains("Gym class", content);
+ assertContains("www.alfresco.com", content);
} finally {
input.close();
}
@@ -159,7 +159,7 @@ public class DWGParserTest {
assertNull(metadata.get(TikaCoreProperties.RELATION));
String content = handler.toString();
- assertTrue(content.contains(""));
+ assertEquals("", content);
} finally {
input.close();
}
@@ -196,8 +196,8 @@ public class DWGParserTest {
metadata.get("MyCustomProperty"));
String content = handler.toString();
- assertTrue(content.contains("This is a comment"));
- assertTrue(content.contains("mycompany"));
+ assertContains("This is a comment", content);
+ assertContains("mycompany", content);
} finally {
input.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java Wed Jan 14 12:16:41 2015
@@ -17,7 +17,7 @@
package org.apache.tika.parser.epub;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.apache.tika.TikaTest.assertContains;
import java.io.InputStream;
@@ -49,10 +49,10 @@ public class EpubParserTest {
metadata.get(TikaCoreProperties.PUBLISHER));
String content = handler.toString();
- assertTrue(content.contains("Plus a simple div"));
- assertTrue(content.contains("First item"));
- assertTrue(content.contains("The previous headings were subchapters"));
- assertTrue(content.contains("Table data"));
+ assertContains("Plus a simple div", content);
+ assertContains("First item", content);
+ assertContains("The previous headings were subchapters", content);
+ assertContains("Table data", content);
} finally {
input.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java Wed Jan 14 12:16:41 2015
@@ -17,7 +17,7 @@
package org.apache.tika.parser.font;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.apache.tika.TikaTest.assertContains;
import java.util.TimeZone;
@@ -73,9 +73,9 @@ public class FontParsersTest {
String content = handler.toString();
// Test that the comments got extracted
- assertTrue(content.contains("Comments"));
- assertTrue(content.contains("This is a comment in a sample file"));
- assertTrue(content.contains("UniqueID 12345"));
+ assertContains("Comments", content);
+ assertContains("This is a comment in a sample file", content);
+ assertContains("UniqueID 12345", content);
}
@Test
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java Wed Jan 14 12:16:41 2015
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.fork;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
@@ -66,8 +66,8 @@ public class ForkParserIntegrationTest {
parser.parse(stream, output, new Metadata(), context);
String content = output.toString();
- assertTrue(content.contains("Test d'indexation"));
- assertTrue(content.contains("http://www.apache.org"));
+ assertContains("Test d'indexation", content);
+ assertContains("http://www.apache.org", content);
} finally {
parser.close();
}
@@ -233,8 +233,8 @@ public class ForkParserIntegrationTest {
"/test-documents/testTXT.txt");
parser.parse(stream, body, new Metadata(), context);
String content = body.toString();
- assertTrue(content.contains("Test d'indexation"));
- assertTrue(content.contains("http://www.apache.org"));
+ assertContains("Test d'indexation", content);
+ assertContains("http://www.apache.org", content);
} finally {
parser.close();
}
@@ -257,10 +257,10 @@ public class ForkParserIntegrationTest {
parser.parse(stream, output, new Metadata(), context);
String content = output.toString();
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("Tika - Content Analysis Toolkit"));
- assertTrue(content.contains("incubator"));
- assertTrue(content.contains("Apache Software Foundation"));
+ assertContains("Apache Tika", content);
+ assertContains("Tika - Content Analysis Toolkit", content);
+ assertContains("incubator", content);
+ assertContains("Apache Software Foundation", content);
} finally {
parser.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java Wed Jan 14 12:16:41 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.html;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -138,9 +139,9 @@ public class HtmlParserTest {
assertEquals("Tika Developers", metadata.get("Author"));
assertEquals("5", metadata.get("refresh"));
- assertTrue(content.contains("ability of Apache Tika"));
- assertTrue(content.contains("extract content"));
- assertTrue(content.contains("an XHTML document"));
+ assertContains("ability of Apache Tika", content);
+ assertContains("extract content", content);
+ assertContains("an XHTML document", content);
}
@Test
@@ -243,8 +244,8 @@ public class HtmlParserTest {
"<html><body><table><tr><td>a</td><td>b</td></table></body></html>";
String content = new Tika().parseToString(
new ByteArrayInputStream(test.getBytes("UTF-8")));
- assertTrue(content.contains("a"));
- assertTrue(content.contains("b"));
+ assertContains("a", content);
+ assertContains("b", content);
assertFalse(content.contains("ab"));
}
@@ -845,10 +846,10 @@ public class HtmlParserTest {
assertFalse(content.contains("item_aitem_b"));
// Should contain the two list items with a newline in between.
- assertTrue(content.contains("item_a\nitem_b"));
+ assertContains("item_a\nitem_b", content);
// Should contain æä»ä¹éè¦æå¸®ä½ ç (can i help you) without whitespace
- assertTrue(content.contains("æä»ä¹éè¦æå¸®ä½ ç"));
+ assertContains("æä»ä¹éè¦æå¸®ä½ ç", content);
}
/**
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java Wed Jan 14 12:16:41 2015
@@ -51,11 +51,11 @@ public class iBooksParserTest {
/* TODO For some reason, the xhtml files in iBooks-style ePub are not parsed properly, and the content comes back empty.git che
String content = handler.toString();
System.out.println("content="+content);
- assertTrue(content.contains("Plus a simple div"));
- assertTrue(content.contains("First item"));
- assertTrue(content.contains("The previous headings were subchapters"));
- assertTrue(content.contains("Table data"));
- assertTrue(content.contains("Lorem ipsum dolor rutur amet"));
+ assertContains("Plus a simple div", content);
+ assertContains("First item", content);
+ assertContains("The previous headings were subchapters", content);
+ assertContains("Table data", content);
+ assertContains("Lorem ipsum dolor rutur amet", content);
*/
} finally {
input.close();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java Wed Jan 14 12:16:41 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.mail;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -147,7 +148,7 @@ public class RFC822ParserTest {
try {
parser.parse(stream, handler, metadata, new ParseContext());
//tests correct decoding of base64 text, including ISO-8859-1 bytes into Unicode
- assertTrue(handler.toString().contains("Here is some text, with international characters, voil\u00E0!"));
+ assertContains("Here is some text, with international characters, voil\u00E0!", handler.toString());
} catch (Exception e) {
fail("Exception thrown: " + e.getMessage());
}
@@ -251,7 +252,7 @@ public class RFC822ParserTest {
assertEquals("def", metadata.getValues(Metadata.MESSAGE_TO)[1]);
assertEquals("abcd", metadata.get(TikaCoreProperties.TITLE));
assertEquals("abcd", metadata.get(Metadata.SUBJECT));
- assertTrue(handler.toString().contains("bar biz bat"));
+ assertContains("bar biz bat", handler.toString());
}
private static InputStream getStream(String name) {
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java Wed Jan 14 12:16:41 2015
@@ -17,7 +17,7 @@
package org.apache.tika.parser.mbox;
import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.apache.tika.TikaTest.assertContains;
import java.io.InputStream;
import java.util.Map;
@@ -64,8 +64,8 @@ public class MboxParserTest {
}
String content = handler.toString();
- assertTrue(content.contains("Test content 1"));
- assertTrue(content.contains("Test content 2"));
+ assertContains("Test content 1", content);
+ assertContains("Test content 2", content);
assertEquals("application/mbox", metadata.get(Metadata.CONTENT_TYPE));
Map<Integer, Metadata> mailsMetadata = mboxParser.getTrackingMetadata();
@@ -92,7 +92,7 @@ public class MboxParserTest {
stream.close();
}
- assertTrue(handler.toString().contains("Test content"));
+ assertContains("Test content", handler.toString());
assertEquals("Nb. Of mails", 1, mboxParser.getTrackingMetadata().size());
Metadata mailMetadata = mboxParser.getTrackingMetadata().get(0);
@@ -136,8 +136,8 @@ public class MboxParserTest {
stream.close();
}
- assertTrue(handler.toString().contains("Test content"));
- assertTrue(handler.toString().contains("> quoted stuff"));
+ assertContains("Test content", handler.toString());
+ assertContains("> quoted stuff", handler.toString());
}
@Test
@@ -161,7 +161,7 @@ public class MboxParserTest {
assertEquals("Jothi Padmanabhan <jo...@yahoo-inc.com>", firstMail.get(TikaCoreProperties.CREATOR));
assertEquals("core-user@hadoop.apache.org", firstMail.get(Metadata.MESSAGE_RECIPIENT_ADDRESS));
- assertTrue(handler.toString().contains("When a Mapper completes"));
+ assertContains("When a Mapper completes", handler.toString());
}
private static InputStream getStream(String name) {
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java Wed Jan 14 12:16:41 2015
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.microsoft;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -80,11 +81,10 @@ public class OutlookParserTest {
metadata.get(TikaCoreProperties.CREATED));
String content = handler.toString();
- assertTrue(content.contains(""));
- assertTrue(content.contains("Microsoft Outlook Express 6"));
- assertTrue(content.contains("L'\u00C9quipe Microsoft Outlook Express"));
- assertTrue(content.contains("Nouvel utilisateur de Outlook Express"));
- assertTrue(content.contains("Messagerie et groupes de discussion"));
+ assertContains("Microsoft Outlook Express 6", content);
+ assertContains("L'\u00C9quipe Microsoft Outlook Express", content);
+ assertContains("Nouvel utilisateur de Outlook Express", content);
+ assertContains("Messagerie et groupes de discussion", content);
}
/**
@@ -144,9 +144,9 @@ public class OutlookParserTest {
metadata.get(TikaCoreProperties.TITLE));
String content = handler.toString();
- assertTrue(content.contains("Outlook 2003"));
- assertTrue(content.contains("Streamlined Mail Experience"));
- assertTrue(content.contains("Navigation Pane"));
+ assertContains("Outlook 2003", content);
+ assertContains("Streamlined Mail Experience", content);
+ assertContains("Navigation Pane", content);
}
@Test
@@ -174,10 +174,10 @@ public class OutlookParserTest {
// As the HTML version should have been processed, ensure
// we got some of the links
String content = sw.toString();
- assertTrue(content.contains("<dd>tests.chang@fengttt.com</dd>"));
- assertTrue(content.contains("<p>Alfresco MSG format testing"));
- assertTrue(content.contains("<li>1"));
- assertTrue(content.contains("<li>2"));
+ assertContains("<dd>tests.chang@fengttt.com</dd>", content);
+ assertContains("<p>Alfresco MSG format testing", content);
+ assertContains("<li>1", content);
+ assertContains("<li>2", content);
// Make sure we don't have nested html docs
assertEquals(2, content.split("<body>").length);
@@ -237,15 +237,15 @@ public class OutlookParserTest {
// As the HTML version should have been processed, ensure
// we got some of the links
String content = sw.toString().replaceAll("<p>\\s+","<p>");
- assertTrue(content.contains("<dd>New Outlook User</dd>"));
- assertTrue(content.contains("designed <i>to help you"));
- assertTrue(content.contains("<p><a href=\"http://r.office.microsoft.com/r/rlidOutlookWelcomeMail10?clid=1033\">Cached Exchange Mode</a>"));
+ assertContains("<dd>New Outlook User</dd>", content);
+ assertContains("designed <i>to help you", content);
+ assertContains("<p><a href=\"http://r.office.microsoft.com/r/rlidOutlookWelcomeMail10?clid=1033\">Cached Exchange Mode</a>", content);
// Link - check text around it, and the link itself
- assertTrue(content.contains("sign up for a free subscription"));
- assertTrue(content.contains("Office Newsletter"));
- assertTrue(content.contains("newsletter will be sent to you"));
- assertTrue(content.contains("http://r.office.microsoft.com/r/rlidNewsletterSignUp?clid=1033"));
+ assertContains("sign up for a free subscription", content);
+ assertContains("Office Newsletter", content);
+ assertContains("newsletter will be sent to you", content);
+ assertContains("http://r.office.microsoft.com/r/rlidNewsletterSignUp?clid=1033", content);
// Make sure we don't have nested html docs
assertEquals(2, content.split("<body>").length);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java Wed Jan 14 12:16:41 2015
@@ -50,8 +50,8 @@ public class PowerPointParserTest extend
assertEquals("Keith Bennett", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Keith Bennett", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("Powerpoint X for Mac"));
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("Powerpoint X for Mac", content);
} finally {
input.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java Wed Jan 14 12:16:41 2015
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.microsoft;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.InputStream;
@@ -46,8 +46,8 @@ public class PublisherParserTest {
assertEquals("Nick Burch", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Nick Burch", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("0123456789"));
- assertTrue(content.contains("abcdef"));
+ assertContains("0123456789", content);
+ assertContains("abcdef", content);
} finally {
input.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java?rev=1651634&r1=1651633&r2=1651634&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java Wed Jan 14 12:16:41 2015
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.microsoft;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.InputStream;
@@ -45,7 +45,7 @@ public class VisioParserTest {
assertEquals("", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Hogwarts", metadata.get(TikaCoreProperties.CREATOR));
String content = handler.toString();
- assertTrue(content.contains("Some random text, on a page"));
+ assertContains("Some random text, on a page", content);
} finally {
input.close();
}
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -53,7 +53,7 @@ public class WordParserTest extends Tika
assertEquals("Sample Word Document", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Keith Bennett", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Keith Bennett", metadata.get(Metadata.AUTHOR));
- assertTrue(handler.toString().contains("Sample Word Document"));
+ assertContains("Sample Word Document", handler.toString());
} finally {
input.close();
}
@@ -68,7 +68,7 @@ public class WordParserTest extends Tika
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
- assertTrue(handler.toString().contains("MSj00974840000[1].wav"));
+ assertContains("MSj00974840000[1].wav", handler.toString());
} finally {
input.close();
}
@@ -192,7 +192,7 @@ public class WordParserTest extends Tika
assertEquals("Gym class featuring a brown fox and lazy dog", metadata.get(Metadata.SUBJECT));
assertEquals("Nevin Nollop", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Nevin Nollop", metadata.get(Metadata.AUTHOR));
- assertTrue(handler.toString().contains("The quick brown fox jumps over the lazy dog"));
+ assertContains("The quick brown fox jumps over the lazy dog", handler.toString());
} finally {
input.close();
}
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -16,7 +16,9 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertTrue;
+import static org.apache.tika.TikaTest.assertContains;
+
+import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
@@ -24,8 +26,6 @@ import org.apache.tika.sax.BodyContentHa
import org.junit.Test;
import org.xml.sax.ContentHandler;
-import java.io.InputStream;
-
public class WriteProtectedParserTest {
@Test
@@ -37,6 +37,6 @@ public class WriteProtectedParserTest {
ContentHandler handler = new BodyContentHandler();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
String content = handler.toString();
- assertTrue(content.contains("Office"));
+ assertContains("Office", content);
}
}
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.mp3;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import java.io.InputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -70,12 +70,12 @@ public class Mp3ParserTest {
assertEquals("Test Artist", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Test Title"));
- assertTrue(content.contains("Test Artist"));
- assertTrue(content.contains("Test Album"));
- assertTrue(content.contains("2008"));
- assertTrue(content.contains("Test Comment"));
- assertTrue(content.contains("Rock"));
+ assertContains("Test Title", content);
+ assertContains("Test Artist", content);
+ assertContains("Test Album", content);
+ assertContains("2008", content);
+ assertContains("Test Comment", content);
+ assertContains("Rock", content);
assertEquals("MPEG 3 Layer III Version 1", metadata.get("version"));
assertEquals("44100", metadata.get("samplerate"));
@@ -109,14 +109,14 @@ public class Mp3ParserTest {
// Check the textual contents
String content = handler.toString();
- assertTrue(content.contains("Test Title"));
- assertTrue(content.contains("Test Artist"));
- assertTrue(content.contains("Test Album"));
- assertTrue(content.contains("2008"));
- assertTrue(content.contains("Test Comment"));
- assertTrue(content.contains("Rock"));
- assertTrue(content.contains(", track 1"));
- assertTrue(content.contains(", disc 1"));
+ assertContains("Test Title", content);
+ assertContains("Test Artist", content);
+ assertContains("Test Album", content);
+ assertContains("2008", content);
+ assertContains("Test Comment", content);
+ assertContains("Rock", content);
+ assertContains(", track 1", content);
+ assertContains(", disc 1", content);
// Check un-typed audio properties
assertEquals("MPEG 3 Layer III Version 1", metadata.get("version"));
@@ -165,12 +165,12 @@ public class Mp3ParserTest {
assertEquals("Test Artist", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Test Title"));
- assertTrue(content.contains("Test Artist"));
- assertTrue(content.contains("Test Album"));
- assertTrue(content.contains("2008"));
- assertTrue(content.contains("Test Comment"));
- assertTrue(content.contains("Rock"));
+ assertContains("Test Title", content);
+ assertContains("Test Artist", content);
+ assertContains("Test Album", content);
+ assertContains("2008", content);
+ assertContains("Test Comment", content);
+ assertContains("Rock", content);
assertEquals("MPEG 3 Layer III Version 1", metadata.get("version"));
assertEquals("44100", metadata.get("samplerate"));
@@ -202,13 +202,13 @@ public class Mp3ParserTest {
assertEquals("Test Artist", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Test Title"));
- assertTrue(content.contains("Test Artist"));
- assertTrue(content.contains("Test Album"));
- assertTrue(content.contains("2008"));
- assertTrue(content.contains("Test Comment"));
- assertTrue(content.contains("Rock"));
- assertTrue(content.contains(", disc 1"));
+ assertContains("Test Title", content);
+ assertContains("Test Artist", content);
+ assertContains("Test Album", content);
+ assertContains("2008", content);
+ assertContains("Test Comment", content);
+ assertContains("Rock", content);
+ assertContains(", disc 1", content);
assertEquals("MPEG 3 Layer III Version 1", metadata.get("version"));
assertEquals("44100", metadata.get("samplerate"));
@@ -293,12 +293,12 @@ public class Mp3ParserTest {
assertEquals("Test Artist", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Test Title"));
- assertTrue(content.contains("Test Artist"));
- assertTrue(content.contains("Test Album"));
- assertTrue(content.contains("2008"));
- assertTrue(content.contains("Test Comment"));
- assertTrue(content.contains("Rock"));
+ assertContains("Test Title", content);
+ assertContains("Test Artist", content);
+ assertContains("Test Album", content);
+ assertContains("2008", content);
+ assertContains("Test Comment", content);
+ assertContains("Rock", content);
assertEquals("MPEG 3 Layer III Version 1", metadata.get("version"));
assertEquals("44100", metadata.get("samplerate"));
@@ -362,7 +362,7 @@ public class Mp3ParserTest {
assertEquals("Merzhin", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Plus loin vers l'ouest"));
+ assertContains("Plus loin vers l'ouest", content);
assertEquals("MPEG 3 Layer III Version 1", metadata.get("version"));
assertEquals("44100", metadata.get("samplerate"));
@@ -399,10 +399,10 @@ public class Mp3ParserTest {
assertEquals("The White Stripes", metadata.get(Metadata.AUTHOR));
String content = handler.toString();
- assertTrue(content.contains("Girl you have no faith in medicine"));
- assertTrue(content.contains("The White Stripes"));
- assertTrue(content.contains("Elephant"));
- assertTrue(content.contains("2003"));
+ assertContains("Girl you have no faith in medicine", content);
+ assertContains("The White Stripes", content);
+ assertContains("Elephant", content);
+ assertContains("2003", content);
// File lacks any audio frames, so we can't know these
assertEquals(null, metadata.get("version"));
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.mp4;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.InputStream;
@@ -67,12 +67,12 @@ public class MP4ParserTest {
// Check the textual contents
String content = handler.toString();
- assertTrue(content.contains("Test Title"));
- assertTrue(content.contains("Test Artist"));
- assertTrue(content.contains("Test Album"));
- assertTrue(content.contains("2008"));
- assertTrue(content.contains("Test Comment"));
- assertTrue(content.contains("Test Genre"));
+ assertContains("Test Title", content);
+ assertContains("Test Artist", content);
+ assertContains("Test Album", content);
+ assertContains("2008", content);
+ assertContains("Test Comment", content);
+ assertContains("Test Genre", content);
// Check XMPDM-typed audio properties
assertEquals("Test Album", metadata.get(XMPDM.ALBUM));
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -28,8 +28,8 @@ import org.apache.tika.sax.BodyContentHa
import org.junit.Test;
import org.xml.sax.ContentHandler;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
/**
* Test cases to exercise the {@link NetCDFParser}.
@@ -61,11 +61,11 @@ public class NetCDFParserTest {
"720 ppm stabilization experiment (SRESA1B)");
String content = handler.toString();
- assertTrue(content.contains("long_name = \"Surface area\""));
- assertTrue(content.contains("float area(lat=128, lon=256)"));
- assertTrue(content.contains("float lat(lat=128)"));
- assertTrue(content.contains("double lat_bnds(lat=128, bnds=2)"));
- assertTrue(content.contains("double lon_bnds(lon=256, bnds=2)"));
+ assertContains("long_name = \"Surface area\"", content);
+ assertContains("float area(lat=128, lon=256)", content);
+ assertContains("float lat(lat=128)", content);
+ assertContains("double lat_bnds(lat=128, bnds=2)", content);
+ assertContains("double lon_bnds(lon=256, bnds=2)", content);
}
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -62,11 +62,11 @@ public class ODFParserTest extends TikaT
metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("Tika is part of the Lucene project."));
- assertTrue(content.contains("Solr"));
- assertTrue(content.contains("one embedded"));
- assertTrue(content.contains("Rectangle Title"));
- assertTrue(content.contains("a blue background and dark border"));
+ assertContains("Tika is part of the Lucene project.", content);
+ assertContains("Solr", content);
+ assertContains("one embedded", content);
+ assertContains("Rectangle Title", content);
+ assertContains("a blue background and dark border", content);
} finally {
input.close();
}
@@ -346,7 +346,7 @@ public class ODFParserTest extends TikaT
metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("Tika is part of the Lucene project."));
+ assertContains("Tika is part of the Lucene project.", content);
} finally {
tis.close();
}
@@ -368,7 +368,7 @@ public class ODFParserTest extends TikaT
metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("primero hay que generar un par de claves"));
+ assertContains("primero hay que generar un par de claves", content);
} finally {
tis.close();
}
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -84,10 +84,10 @@ public class PDFParserTest extends TikaT
// assertEquals("Sat Sep 15 10:02:31 BST 2007", metadata.get(Metadata.CREATION_DATE));
// assertEquals("Sat Sep 15 10:02:31 BST 2007", metadata.get(Metadata.LAST_MODIFIED));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("Tika - Content Analysis Toolkit"));
- assertTrue(content.contains("incubator"));
- assertTrue(content.contains("Apache Software Foundation"));
+ assertContains("Apache Tika", content);
+ assertContains("Tika - Content Analysis Toolkit", content);
+ assertContains("incubator", content);
+ assertContains("Apache Software Foundation", content);
// testing how the end of one paragraph is separated from start of the next one
assertTrue("should have word boundary after headline",
!content.contains("ToolkitApache"));
@@ -137,7 +137,7 @@ public class PDFParserTest extends TikaT
assertEquals("Array Entry 1", metadata.getValues("Custom Array")[0]);
assertEquals("Array Entry 2", metadata.getValues("Custom Array")[1]);
- assertTrue(content.contains("Hello World!"));
+ assertContains("Hello World!", content);
}
/**
@@ -169,9 +169,9 @@ public class PDFParserTest extends TikaT
assertEquals("Rethinking the Financial Network, Speech by Andrew G Haldane, Executive Director, Financial Stability delivered at the Financial Student Association, Amsterdam on 28 April 2009", metadata.get(TikaCoreProperties.TITLE));
String content = handler.toString();
- assertTrue(content.contains("RETHINKING THE FINANCIAL NETWORK"));
- assertTrue(content.contains("On 16 November 2002"));
- assertTrue(content.contains("In many important respects"));
+ assertContains("RETHINKING THE FINANCIAL NETWORK", content);
+ assertContains("On 16 November 2002", content);
+ assertContains("In many important respects", content);
// Try again with an explicit empty password
@@ -200,9 +200,9 @@ public class PDFParserTest extends TikaT
assertEquals("Speeches by Andrew G Haldane", metadata.get(Metadata.SUBJECT));
assertEquals("Rethinking the Financial Network, Speech by Andrew G Haldane, Executive Director, Financial Stability delivered at the Financial Student Association, Amsterdam on 28 April 2009", metadata.get(TikaCoreProperties.TITLE));
- assertTrue(content.contains("RETHINKING THE FINANCIAL NETWORK"));
- assertTrue(content.contains("On 16 November 2002"));
- assertTrue(content.contains("In many important respects"));
+ assertContains("RETHINKING THE FINANCIAL NETWORK", content);
+ assertContains("On 16 November 2002", content);
+ assertContains("In many important respects", content);
}
@Test
@@ -212,7 +212,7 @@ public class PDFParserTest extends TikaT
"/test-documents/testPDFTwoTextBoxes.pdf");
String content = getText(stream, parser);
content = content.replaceAll("\\s+"," ");
- assertTrue(content.contains("Left column line 1 Left column line 2 Right column line 1 Right column line 2"));
+ assertContains("Left column line 1 Left column line 2 Right column line 1 Right column line 2", content);
}
@Test
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -125,7 +125,7 @@ public class RTFParserTest extends TikaT
File file = getResourceAsFile("/test-documents/testRTFTableCellSeparation.rtf");
String content = tika.parseToString(file);
content = content.replaceAll("\\s+"," ");
- assertTrue(content.contains("a b c d \u00E4 \u00EB \u00F6 \u00FC"));
+ assertContains("a b c d \u00E4 \u00EB \u00F6 \u00FC", content);
assertContains("a b c d \u00E4 \u00EB \u00F6 \u00FC", content);
}
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.txt;
+import static org.apache.tika.TikaTest.assertContains;
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;
@@ -59,10 +59,10 @@ public class TXTParserTest {
assertNull(metadata.get(Metadata.CONTENT_LANGUAGE));
assertNull(metadata.get(TikaCoreProperties.LANGUAGE));
- assertTrue(content.contains("Hello"));
- assertTrue(content.contains("World"));
- assertTrue(content.contains("autodetection"));
- assertTrue(content.contains("stream"));
+ assertContains("Hello", content);
+ assertContains("World", content);
+ assertContains("autodetection", content);
+ assertContains("stream", content);
}
@Test
@@ -77,7 +77,7 @@ public class TXTParserTest {
assertEquals("text/plain; charset=UTF-8", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated
- assertTrue(handler.toString().contains(text));
+ assertContains(text, handler.toString());
}
@Test
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -76,7 +76,7 @@ public class DcXMLParserTest extends Tik
assertTrue(metadata.get(TikaCoreProperties.RIGHTS).contains("testing chars"));
String content = handler.toString();
- assertTrue(content.contains("Tika test document"));
+ assertContains("Tika test document", content);
assertEquals("2000-12-01T00:00:00.000Z", metadata.get(TikaCoreProperties.CREATED));
} finally {
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=1651634&r1=1651633&r2=1651634&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 Wed Jan 14 12:16:41 2015
@@ -16,20 +16,21 @@
*/
package org.apache.tika.parser.xml;
+import static org.apache.tika.TikaTest.assertContains;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
import org.apache.tika.TikaTest.TrackingHandler;
import org.apache.tika.extractor.ContainerExtractor;
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.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
-import java.io.InputStream;
-
public class FictionBookParserTest {
@Test
@@ -38,10 +39,10 @@ public class FictionBookParserTest {
try {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
- new FictionBookParser().parse(input, handler, metadata);
+ new FictionBookParser().parse(input, handler, metadata, new ParseContext());
String content = handler.toString();
- assertTrue(content.contains("1812"));
+ assertContains("1812", content);
} finally {
input.close();
}