You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by ha...@apache.org on 2018/07/09 19:52:13 UTC
any23 git commit: resolved mockito deprecation warnings
Repository: any23
Updated Branches:
refs/heads/master eb5bd0939 -> 0789cdbb2
resolved mockito deprecation warnings
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/0789cdbb
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/0789cdbb
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/0789cdbb
Branch: refs/heads/master
Commit: 0789cdbb2162542a97df746bcef7bc2ba1133d39
Parents: eb5bd09
Author: Hans <fi...@gmail.com>
Authored: Mon Jul 9 14:26:49 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Mon Jul 9 14:40:51 2018 -0500
----------------------------------------------------------------------
.../htmlscraper/HTMLScraperExtractorTest.java | 19 +++++++------------
.../plugin/officescraper/ExcelExtractorTest.java | 16 +++++++---------
2 files changed, 14 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/0789cdbb/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java
----------------------------------------------------------------------
diff --git a/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java b/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java
index 7465ade..4d7b0f3 100644
--- a/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java
+++ b/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java
@@ -25,9 +25,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
import org.eclipse.rdf4j.model.IRI;
-import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import java.io.IOException;
@@ -35,7 +33,8 @@ import java.io.InputStream;
import java.util.Arrays;
import java.util.HashSet;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -61,7 +60,7 @@ public class HTMLScraperExtractorTest {
@Test
public void testGetExtractors() {
final String[] extractors = extractor.getTextExtractors();
- Assert.assertEquals( new HashSet<String>(Arrays.asList(extractors)).size(), 4 );
+ Assert.assertEquals( new HashSet<>(Arrays.asList(extractors)).size(), 4 );
}
@Test
@@ -76,17 +75,13 @@ public class HTMLScraperExtractorTest {
extractor.run(ExtractionParameters.newDefault(), extractionContext, is, extractionResult);
verify(extractionResult).writeTriple(
- eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_DE_PROPERTY) , (Value) Matchers.anyObject())
- ;
+ eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_DE_PROPERTY), any());
verify(extractionResult).writeTriple(
- eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_AE_PROPERTY) , (Value) Matchers.anyObject())
- ;
+ eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_AE_PROPERTY), any());
verify(extractionResult).writeTriple(
- eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_LCE_PROPERTY) , (Value) Matchers.anyObject())
- ;
+ eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_LCE_PROPERTY), any());
verify(extractionResult).writeTriple(
- eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_CE_PROPERTY) , (Value) Matchers.anyObject())
- ;
+ eq(pageIRI), eq(HTMLScraperExtractor.PAGE_CONTENT_CE_PROPERTY), any());
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/0789cdbb/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java
----------------------------------------------------------------------
diff --git a/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java b/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java
index f970889..86a16fe 100644
--- a/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java
+++ b/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java
@@ -33,9 +33,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.IRI;
-import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -110,22 +108,22 @@ public class ExcelExtractorTest {
private void verifyPredicateOccurrence(TripleHandler mock, IRI predicate, int occurrence)
throws TripleHandlerException {
Mockito.verify( mock, Mockito.times(occurrence)).receiveTriple(
- Mockito.<Resource>anyObject(),
+ Mockito.any(),
Mockito.eq(predicate),
- Mockito.<Value>anyObject(),
- Mockito.<IRI>any(),
- Mockito.<ExtractionContext>anyObject()
+ Mockito.any(),
+ Mockito.any(),
+ Mockito.any()
);
}
private void verifyTypeOccurrence(TripleHandler mock, IRI type, int occurrence)
throws TripleHandlerException {
Mockito.verify( mock, Mockito.times(occurrence)).receiveTriple(
- Mockito.<Resource>anyObject(),
+ Mockito.any(),
Mockito.eq(RDF.TYPE),
Mockito.eq(type),
- Mockito.<IRI>any(),
- Mockito.<ExtractionContext>anyObject()
+ Mockito.any(),
+ Mockito.any()
);
}