replace org.junit.Assert.assertThat by

org.hamcrest.MatcherAssert.assertThat from hamcrest 2.2 to avoid
deprecation-warning

3 files changed, 14 insertions, 8 deletions

diff --git a/test/java/net/yacy/document/ParserTest.java b/test/java/net/yacy/document/ParserTest.java
index c78ca12f9..9bf49969b 100644
--- a/test/java/net/yacy/document/ParserTest.java
+++ b/test/java/net/yacy/document/ParserTest.java
@@ -1,5 +1,8 @@
 package net.yacy.document;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -8,14 +11,14 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+
+import org.junit.Test;
+
 import net.yacy.cora.document.id.AnchorURL;
 import net.yacy.document.parser.docParser;
 import net.yacy.document.parser.odtParser;
 import net.yacy.document.parser.pdfParser;
 import net.yacy.document.parser.pptParser;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
-import org.junit.Test;
 
 
 public class ParserTest {
diff --git a/test/java/net/yacy/document/parser/ooxmlParserTest.java b/test/java/net/yacy/document/parser/ooxmlParserTest.java
index 953747394..f5cf79e47 100644
--- a/test/java/net/yacy/document/parser/ooxmlParserTest.java
+++ b/test/java/net/yacy/document/parser/ooxmlParserTest.java
@@ -23,9 +23,9 @@
 package net.yacy.document.parser;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
diff --git a/test/java/net/yacy/document/parser/xlsParserTest.java b/test/java/net/yacy/document/parser/xlsParserTest.java
index 804776379..1d719ddd7 100644
--- a/test/java/net/yacy/document/parser/xlsParserTest.java
+++ b/test/java/net/yacy/document/parser/xlsParserTest.java
@@ -1,17 +1,20 @@
 package net.yacy.document.parser;

 

+import static org.hamcrest.CoreMatchers.containsString;

+import static org.hamcrest.MatcherAssert.assertThat;

+

 import java.io.File;

 import java.io.FileInputStream;

 import java.io.IOException;

 import java.io.InputStreamReader;

 import java.io.Reader;

+

+import org.junit.Test;

+

 import net.yacy.cora.document.id.AnchorURL;

 import net.yacy.document.AbstractParser;

 import net.yacy.document.Document;

 import net.yacy.document.VocabularyScraper;

-import static org.hamcrest.CoreMatchers.containsString;

-import org.junit.Test;

-import static org.junit.Assert.*;

 

 public class xlsParserTest {