diff options
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | libt/hamcrest-core-1.3.jar | bin | 0 -> 45024 bytes | |||
| -rw-r--r-- | libt/junit-4.11.jar | bin | 0 -> 245039 bytes | |||
| -rw-r--r-- | libt/junit-4.7.jar | bin | 232354 -> 0 bytes | |||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | test/net/yacy/document/ParserTest.java | 10 | ||||
| -rw-r--r-- | test/net/yacy/document/parser/htmlParserTest.java | 2 |
7 files changed, 6 insertions, 10 deletions
@@ -439,7 +439,7 @@ <target name="compileTest" depends="compile" description="run unittests"> <javac srcdir="${test}" destdir="${test}" debug="true" debuglevel="lines,vars,source" - source="${javacSource}" target="${javacTarget}"> + source="${javacSource}" target="${javacTarget}" encoding="UTF-8"> <classpath> <pathelement location="${build}"/> <pathelement location="${htroot}"/> diff --git a/libt/hamcrest-core-1.3.jar b/libt/hamcrest-core-1.3.jar Binary files differnew file mode 100644 index 000000000..9d5fe16e3 --- /dev/null +++ b/libt/hamcrest-core-1.3.jar diff --git a/libt/junit-4.11.jar b/libt/junit-4.11.jar Binary files differnew file mode 100644 index 000000000..aaf744484 --- /dev/null +++ b/libt/junit-4.11.jar diff --git a/libt/junit-4.7.jar b/libt/junit-4.7.jar Binary files differdeleted file mode 100644 index 700ad6952..000000000 --- a/libt/junit-4.7.jar +++ /dev/null @@ -291,7 +291,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>4.11</version> <scope>test</scope> </dependency> diff --git a/test/net/yacy/document/ParserTest.java b/test/net/yacy/document/ParserTest.java index aa0dcf161..171022bc8 100644 --- a/test/net/yacy/document/ParserTest.java +++ b/test/net/yacy/document/ParserTest.java @@ -1,8 +1,5 @@ package net.yacy.document; -import static org.junit.Assert.assertThat; -import static org.junit.matchers.JUnitMatchers.containsString; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -16,7 +13,8 @@ import net.yacy.document.parser.docParser; import net.yacy.document.parser.odtParser; import net.yacy.document.parser.ooxmlParser; import net.yacy.document.parser.pdfParser; - +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertThat; import org.junit.Test; @@ -88,7 +86,7 @@ public class ParserTest { } catch (final InterruptedException ex) {} } } - + @Test public void testpdfParsers() throws FileNotFoundException, Parser.Failure, MalformedURLException, UnsupportedEncodingException, IOException { final String[][] testFiles = new String[][] { // meaning: filename in test/parsertest, mimetype, title, creator, description, @@ -110,7 +108,7 @@ public class ParserTest { int c; while( (c = content.read()) != -1 ) str.append((char)c); - + System.out.println("Parsed " + filename + ": " + str); assertThat(str.toString(), containsString("In München steht ein Hofbräuhaus, dort gibt es Bier in Maßkrügen")); assertThat(doc.dc_title(), containsString(testFile[2])); diff --git a/test/net/yacy/document/parser/htmlParserTest.java b/test/net/yacy/document/parser/htmlParserTest.java index beece1948..67c1034ba 100644 --- a/test/net/yacy/document/parser/htmlParserTest.java +++ b/test/net/yacy/document/parser/htmlParserTest.java @@ -6,8 +6,6 @@ import java.io.FileNotFoundException; import java.net.MalformedURLException; import java.nio.charset.Charset; import java.util.List; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; import junit.framework.TestCase; import net.yacy.cora.document.id.AnchorURL; import net.yacy.document.Document; |
