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 12:52:00 UTC
svn commit: r1651627 - in
/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg:
ArParserTest.java Bzip2ParserTest.java GzipParserTest.java
RarParserTest.java Seven7ParserTest.java TarParserTest.java
ZipParserTest.java
Author: nick
Date: Wed Jan 14 11:51:59 2015
New Revision: 1651627
URL: http://svn.apache.org/r1651627
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/pkg/ArParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
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=1651627&r1=1651626&r2=1651627&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 Wed Jan 14 11:51:59 2015
@@ -49,9 +49,9 @@ public class ArParserTest extends Abstra
assertEquals("application/x-archive",
metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("http://www.apache.org"));
+ assertContains("testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("http://www.apache.org", content);
stream = ArParserTest.class.getResourceAsStream(
"/test-documents/testARofSND.ar");
@@ -64,7 +64,7 @@ public class ArParserTest extends Abstra
assertEquals("application/x-archive",
metadata.get(Metadata.CONTENT_TYPE));
content = handler.toString();
- assertTrue(content.contains("testAU.au"));
+ assertContains("testAU.au", content);
}
/**
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=1651627&r1=1651626&r2=1651627&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 Wed Jan 14 11:51:59 2015
@@ -17,7 +17,6 @@
package org.apache.tika.parser.pkg;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.InputStream;
@@ -49,24 +48,24 @@ public class Bzip2ParserTest extends Abs
assertEquals("application/x-bzip2", metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("test-documents/testEXCEL.xls"));
- assertTrue(content.contains("Sample Excel Worksheet"));
- assertTrue(content.contains("test-documents/testHTML.html"));
- assertTrue(content.contains("Test Indexation Html"));
- assertTrue(content.contains("test-documents/testOpenOffice2.odt"));
- assertTrue(content.contains("This is a sample Open Office document"));
- assertTrue(content.contains("test-documents/testPDF.pdf"));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("test-documents/testPPT.ppt"));
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("test-documents/testRTF.rtf"));
- assertTrue(content.contains("indexation Word"));
- assertTrue(content.contains("test-documents/testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("test-documents/testWORD.doc"));
- assertTrue(content.contains("This is a sample Microsoft Word Document"));
- assertTrue(content.contains("test-documents/testXML.xml"));
- assertTrue(content.contains("Rida Benjelloun"));
+ assertContains("test-documents/testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("test-documents/testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("test-documents/testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("test-documents/testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("test-documents/testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("test-documents/testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("test-documents/testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("test-documents/testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("test-documents/testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
}
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=1651627&r1=1651626&r2=1651627&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 Wed Jan 14 11:51:59 2015
@@ -17,7 +17,6 @@
package org.apache.tika.parser.pkg;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.InputStream;
@@ -49,24 +48,24 @@ public class GzipParserTest extends Abst
assertEquals("application/gzip", metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("test-documents/testEXCEL.xls"));
- assertTrue(content.contains("Sample Excel Worksheet"));
- assertTrue(content.contains("test-documents/testHTML.html"));
- assertTrue(content.contains("Test Indexation Html"));
- assertTrue(content.contains("test-documents/testOpenOffice2.odt"));
- assertTrue(content.contains("This is a sample Open Office document"));
- assertTrue(content.contains("test-documents/testPDF.pdf"));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("test-documents/testPPT.ppt"));
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("test-documents/testRTF.rtf"));
- assertTrue(content.contains("indexation Word"));
- assertTrue(content.contains("test-documents/testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("test-documents/testWORD.doc"));
- assertTrue(content.contains("This is a sample Microsoft Word Document"));
- assertTrue(content.contains("test-documents/testXML.xml"));
- assertTrue(content.contains("Rida Benjelloun"));
+ assertContains("test-documents/testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("test-documents/testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("test-documents/testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("test-documents/testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("test-documents/testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("test-documents/testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("test-documents/testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("test-documents/testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("test-documents/testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
}
/**
@@ -116,7 +115,7 @@ public class GzipParserTest extends Abst
assertEquals("application/gzip", metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("Test SVG image"));
+ assertContains("Test SVG image", content);
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java?rev=1651627&r1=1651626&r2=1651627&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java Wed Jan 14 11:51:59 2015
@@ -51,24 +51,24 @@ public class RarParserTest extends Abstr
assertEquals("application/x-rar-compressed", metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("test-documents/testEXCEL.xls"));
- assertTrue(content.contains("Sample Excel Worksheet"));
- assertTrue(content.contains("test-documents/testHTML.html"));
- assertTrue(content.contains("Test Indexation Html"));
- assertTrue(content.contains("test-documents/testOpenOffice2.odt"));
- assertTrue(content.contains("This is a sample Open Office document"));
- assertTrue(content.contains("test-documents/testPDF.pdf"));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("test-documents/testPPT.ppt"));
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("test-documents/testRTF.rtf"));
- assertTrue(content.contains("indexation Word"));
- assertTrue(content.contains("test-documents/testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("test-documents/testWORD.doc"));
- assertTrue(content.contains("This is a sample Microsoft Word Document"));
- assertTrue(content.contains("test-documents/testXML.xml"));
- assertTrue(content.contains("Rida Benjelloun"));
+ assertContains("test-documents/testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("test-documents/testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("test-documents/testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("test-documents/testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("test-documents/testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("test-documents/testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("test-documents/testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("test-documents/testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("test-documents/testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
}
/**
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java?rev=1651627&r1=1651626&r2=1651627&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java Wed Jan 14 11:51:59 2015
@@ -58,24 +58,24 @@ public class Seven7ParserTest extends Ab
assertEquals(TYPE_7ZIP.toString(), metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("test-documents/testEXCEL.xls"));
- assertTrue(content.contains("Sample Excel Worksheet"));
- assertTrue(content.contains("test-documents/testHTML.html"));
- assertTrue(content.contains("Test Indexation Html"));
- assertTrue(content.contains("test-documents/testOpenOffice2.odt"));
- assertTrue(content.contains("This is a sample Open Office document"));
- assertTrue(content.contains("test-documents/testPDF.pdf"));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("test-documents/testPPT.ppt"));
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("test-documents/testRTF.rtf"));
- assertTrue(content.contains("indexation Word"));
- assertTrue(content.contains("test-documents/testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("test-documents/testWORD.doc"));
- assertTrue(content.contains("This is a sample Microsoft Word Document"));
- assertTrue(content.contains("test-documents/testXML.xml"));
- assertTrue(content.contains("Rida Benjelloun"));
+ assertContains("test-documents/testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("test-documents/testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("test-documents/testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("test-documents/testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("test-documents/testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("test-documents/testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("test-documents/testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("test-documents/testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("test-documents/testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
}
/**
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=1651627&r1=1651626&r2=1651627&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 Wed Jan 14 11:51:59 2015
@@ -51,24 +51,24 @@ public class TarParserTest extends Abstr
assertEquals("application/x-tar", metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("test-documents/testEXCEL.xls"));
- assertTrue(content.contains("Sample Excel Worksheet"));
- assertTrue(content.contains("test-documents/testHTML.html"));
- assertTrue(content.contains("Test Indexation Html"));
- assertTrue(content.contains("test-documents/testOpenOffice2.odt"));
- assertTrue(content.contains("This is a sample Open Office document"));
- assertTrue(content.contains("test-documents/testPDF.pdf"));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("test-documents/testPPT.ppt"));
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("test-documents/testRTF.rtf"));
- assertTrue(content.contains("indexation Word"));
- assertTrue(content.contains("test-documents/testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("test-documents/testWORD.doc"));
- assertTrue(content.contains("This is a sample Microsoft Word Document"));
- assertTrue(content.contains("test-documents/testXML.xml"));
- assertTrue(content.contains("Rida Benjelloun"));
+ assertContains("test-documents/testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("test-documents/testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("test-documents/testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("test-documents/testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("test-documents/testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("test-documents/testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("test-documents/testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("test-documents/testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("test-documents/testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
}
/**
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=1651627&r1=1651626&r2=1651627&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 Wed Jan 14 11:51:59 2015
@@ -60,24 +60,24 @@ public class ZipParserTest extends Abstr
assertEquals("application/zip", metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
- assertTrue(content.contains("testEXCEL.xls"));
- assertTrue(content.contains("Sample Excel Worksheet"));
- assertTrue(content.contains("testHTML.html"));
- assertTrue(content.contains("Test Indexation Html"));
- assertTrue(content.contains("testOpenOffice2.odt"));
- assertTrue(content.contains("This is a sample Open Office document"));
- assertTrue(content.contains("testPDF.pdf"));
- assertTrue(content.contains("Apache Tika"));
- assertTrue(content.contains("testPPT.ppt"));
- assertTrue(content.contains("Sample Powerpoint Slide"));
- assertTrue(content.contains("testRTF.rtf"));
- assertTrue(content.contains("indexation Word"));
- assertTrue(content.contains("testTXT.txt"));
- assertTrue(content.contains("Test d'indexation de Txt"));
- assertTrue(content.contains("testWORD.doc"));
- assertTrue(content.contains("This is a sample Microsoft Word Document"));
- assertTrue(content.contains("testXML.xml"));
- assertTrue(content.contains("Rida Benjelloun"));
+ assertContains("testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
}
/**
@@ -139,7 +139,7 @@ public class ZipParserTest extends Abstr
String content = new Tika().parseToString(
ZipParserTest.class.getResourceAsStream(
"/test-documents/moby.zip"));
- assertTrue(content.contains("README"));
+ assertContains("README", content);
}
private class GatherRelIDsDocumentExtractor implements EmbeddedDocumentExtractor {