You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by an...@apache.org on 2017/01/13 22:25:43 UTC
[04/25] any23 git commit: ANY23-276 : Convert from Sesame to RDF4J
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java b/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java
index e528171..855a88c 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java
@@ -19,6 +19,8 @@ package org.apache.any23.extractor.html;
import org.apache.any23.AbstractAny23TestBase;
import org.apache.any23.extractor.IssueReport;
+import org.apache.any23.extractor.IssueReport.Issue;
+import org.apache.any23.extractor.IssueReport.IssueLevel;
import org.apache.any23.extractor.ExtractionException;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.SingleDocumentExtraction;
@@ -29,22 +31,22 @@ import org.apache.any23.writer.RepositoryWriter;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.Rio;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
import java.io.IOException;
import java.io.StringWriter;
@@ -63,10 +65,10 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
/**
* Base test document.
*/
- protected static URI baseURI = RDFUtils.uri("http://bob.example.com/"); // TODO:
+ protected static IRI baseIRI = RDFUtils.iri("http://bob.example.com/"); // TODO:
// change
// base
- // URI
+ // IRI
// string.
/**
@@ -182,7 +184,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
protected void extract(String resource) throws ExtractionException,
IOException {
SingleDocumentExtraction ex = new SingleDocumentExtraction(
- new HTMLFixture(copyResourceToTempFile(resource)).getOpener(baseURI
+ new HTMLFixture(copyResourceToTempFile(resource)).getOpener(baseIRI
.toString()), getExtractorFactory(),
new RepositoryWriter(conn));
ex.setMIMETypeDetector(null);
@@ -231,7 +233,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertContains(URI p, Resource o) throws RepositoryException {
+ protected void assertContains(IRI p, Resource o) throws RepositoryException {
assertContains(null, p, o);
}
@@ -245,7 +247,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertContains(URI p, String o) throws RepositoryException {
+ protected void assertContains(IRI p, String o) throws RepositoryException {
assertContains(null, p, RDFUtils.literal(o));
}
@@ -259,7 +261,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertNotContains(URI p, Resource o)
+ protected void assertNotContains(IRI p, Resource o)
throws RepositoryException {
assertNotContains(null, p, o);
}
@@ -276,7 +278,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertContains(Resource s, URI p, Value o)
+ protected void assertContains(Resource s, IRI p, Value o)
throws RepositoryException {
Assert.assertTrue(
getFailedExtractionMessage()
@@ -296,7 +298,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertNotContains(Resource s, URI p, String o)
+ protected void assertNotContains(Resource s, IRI p, String o)
throws RepositoryException {
Assert.assertFalse(getFailedExtractionMessage(),
conn.hasStatement(s, p, RDFUtils.literal(o), false));
@@ -314,7 +316,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertNotContains(Resource s, URI p, Resource o)
+ protected void assertNotContains(Resource s, IRI p, Resource o)
throws RepositoryException {
Assert.assertFalse(getFailedExtractionMessage(),
conn.hasStatement(s, p, o, false));
@@ -341,7 +343,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* object.
* @throws RepositoryException
*/
- protected void assertNotContains(Resource s, URI p, Literal o)
+ protected void assertNotContains(Resource s, IRI p, Literal o)
throws RepositoryException {
Assert.assertFalse(getFailedExtractionMessage(),
conn.hasStatement(s, p, o, false));
@@ -363,9 +365,15 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
for (Map.Entry<String, Collection<IssueReport.Issue>> entry : report
.getExtractorToIssues().entrySet()) {
if (entry.getValue().size() > 0) {
- Assert.fail("Unexpected issue for extractor " + entry.getKey()
+ System.out.println("Unexpected issue for extractor " + entry.getKey()
+ " : " + entry.getValue());
}
+ for(Issue nextIssue : entry.getValue()) {
+ if(nextIssue.getLevel() == IssueLevel.ERROR || nextIssue.getLevel() == IssueLevel.FATAL) {
+ Assert.fail("Unexpected issue for extractor " + entry.getKey()
+ + " : " + entry.getValue());
+ }
+ }
}
}
@@ -443,7 +451,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* expected matches.
* @throws RepositoryException
*/
- protected void assertStatementsSize(Resource s, URI p, Value o, int expected)
+ protected void assertStatementsSize(Resource s, IRI p, Value o, int expected)
throws RDFHandlerException, RepositoryException {
int statementsSize = getStatementsSize(s, p, o);
if (statementsSize != expected) {
@@ -466,7 +474,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* expected matches.
* @throws RepositoryException
*/
- protected void assertStatementsSize(URI p, Value o, int expected)
+ protected void assertStatementsSize(IRI p, Value o, int expected)
throws RDFHandlerException, RepositoryException {
assertStatementsSize(null, p, o, expected);
}
@@ -483,7 +491,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* expected matches.
* @throws RepositoryException
*/
- protected void assertStatementsSize(URI p, String o, int expected)
+ protected void assertStatementsSize(IRI p, String o, int expected)
throws RDFHandlerException, RepositoryException {
assertStatementsSize(p, o == null ? null : RDFUtils.literal(o),
expected);
@@ -498,7 +506,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* predicate.
* @throws RepositoryException
*/
- protected void assertNotFound(Resource s, URI p) throws RepositoryException {
+ protected void assertNotFound(Resource s, IRI p) throws RepositoryException {
RepositoryResult<Statement> statements = conn.getStatements(s, p, null,
true);
try {
@@ -519,7 +527,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return the matching blank subject.
* @throws RepositoryException
*/
- protected Resource findExactlyOneBlankSubject(URI p, Value o)
+ protected Resource findExactlyOneBlankSubject(IRI p, Value o)
throws RepositoryException {
RepositoryResult<Statement> it = conn.getStatements(null, p, o, false);
try {
@@ -546,7 +554,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return the matching object.
* @throws RepositoryException
*/
- protected Value findExactlyOneObject(Resource s, URI p)
+ protected Value findExactlyOneObject(Resource s, IRI p)
throws RepositoryException {
RepositoryResult<Statement> it = conn.getStatements(s, p, null, false);
try {
@@ -567,7 +575,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return list of matching subjects.
* @throws RepositoryException
*/
- protected List<Resource> findSubjects(URI p, Value o)
+ protected List<Resource> findSubjects(IRI p, Value o)
throws RepositoryException {
RepositoryResult<Statement> it = conn.getStatements(null, p, o, false);
List<Resource> subjects = new ArrayList<Resource>();
@@ -593,7 +601,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return list of matching objects.
* @throws RepositoryException
*/
- protected List<Value> findObjects(Resource s, URI p)
+ protected List<Value> findObjects(Resource s, IRI p)
throws RepositoryException {
RepositoryResult<Statement> it = conn.getStatements(s, p, null, false);
List<Value> objects = new ArrayList<Value>();
@@ -620,7 +628,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return matching object.
* @throws org.openrdf.repository.RepositoryException
*/
- protected Value findObject(Resource s, URI p) throws RepositoryException {
+ protected Value findObject(Resource s, IRI p) throws RepositoryException {
RepositoryResult<Statement> statements = conn.getStatements(s, p, null,
true);
try {
@@ -643,7 +651,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return matching object.
* @throws RepositoryException
*/
- protected Resource findObjectAsResource(Resource s, URI p)
+ protected Resource findObjectAsResource(Resource s, IRI p)
throws RepositoryException {
final Value v = findObject(s, p);
try {
@@ -666,7 +674,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return matching object.
* @throws RepositoryException
*/
- protected String findObjectAsLiteral(Resource s, URI p)
+ protected String findObjectAsLiteral(Resource s, IRI p)
throws RepositoryException {
return findObject(s, p).stringValue();
}
@@ -780,7 +788,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* literal content.
* @throws RepositoryException
*/
- protected void assertContains(Resource s, URI p, String l)
+ protected void assertContains(Resource s, IRI p, String l)
throws RepositoryException {
assertContains(s, p, RDFUtils.literal(l));
}
@@ -799,7 +807,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* literal language.
* @throws RepositoryException
*/
- protected void assertContains(Resource s, URI p, String l, String lang)
+ protected void assertContains(Resource s, IRI p, String l, String lang)
throws RepositoryException {
assertContains(s, p, RDFUtils.literal(l, lang));
}
@@ -816,7 +824,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return list of statements.
* @throws RepositoryException
*/
- protected RepositoryResult<Statement> getStatements(Resource s, URI p,
+ protected RepositoryResult<Statement> getStatements(Resource s, IRI p,
Value o) throws RepositoryException {
return conn.getStatements(s, p, o, false);
}
@@ -833,7 +841,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
* @return number of matches.
* @throws RepositoryException
*/
- protected int getStatementsSize(Resource s, URI p, Value o)
+ protected int getStatementsSize(Resource s, IRI p, Value o)
throws RepositoryException {
RepositoryResult<Statement> result = getStatements(s, p, o);
int count = 0;
@@ -849,7 +857,7 @@ public abstract class AbstractExtractorTestCase extends AbstractAny23TestBase {
}
private String getFailedExtractionMessage() throws RepositoryException {
- return "Assertion failed! Extracted triples:\n" + dumpModelToTurtle();
+ return "Assertion failed! Extracted triples:\n" + dumpModelToNQuads();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
index d32a9f6..d6e37b0 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
@@ -21,9 +21,9 @@ import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.vocab.VCard;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryException;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractorTest.java
index a49d680..70baa30 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractorTest.java
@@ -16,11 +16,8 @@
*/
package org.apache.any23.extractor.html;
-import static org.junit.Assert.*;
-
import org.apache.any23.extractor.ExtractorFactory;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
/**
* @author lmcgibbn
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
index 56d4fa1..9b2e379 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
@@ -24,13 +24,12 @@ import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.vocab.ICAL;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryResult;
import java.io.IOException;
@@ -46,10 +45,10 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
private static final ICAL vICAL = ICAL.getInstance();
private static final SINDICE vSINDICE = SINDICE.getInstance();
- private final static URI vcal = vICAL.Vcalendar;
- private final static URI vevent = vICAL.Vevent;
- private final static URI vjournal = vICAL.Vjournal;
- private final static URI vtodo = vICAL.Vtodo;
+ private final static IRI vcal = vICAL.Vcalendar;
+ private final static IRI vevent = vICAL.Vevent;
+ private final static IRI vjournal = vICAL.Vjournal;
+ private final static IRI vtodo = vICAL.Vtodo;
protected ExtractorFactory<?> getExtractorFactory() {
return new HCalendarExtractorFactory();
@@ -59,7 +58,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testOneVEvent() throws Exception {
assertExtract("/microformats/hcalendar/example1.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
RepositoryResult<Statement> result = getStatements(null, RDF.TYPE,
vevent);
@@ -90,7 +89,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testTransparentEvent() throws Exception {
assertExtract("/microformats/hcalendar/example2.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
RepositoryResult<Statement> result = getStatements(null, RDF.TYPE,
vevent);
@@ -123,7 +122,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testRepetitiveEvent() throws Exception {
assertExtract("/microformats/hcalendar/example3.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
RepositoryResult<Statement> result = getStatements(null, RDF.TYPE,
vevent);
@@ -155,7 +154,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testThreeDayEvent() throws Exception {
assertExtract("/microformats/hcalendar/example5.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
RepositoryResult<Statement> result = getStatements(null, RDF.TYPE,
vevent);
@@ -189,7 +188,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testHCalendarWithBudyInfo() throws Exception {
assertExtract("/microformats/hcalendar/example5.5.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vjournal);
}
@@ -231,7 +230,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(event, vICAL.dtend, "2005-10-08");
assertContains(event, vICAL.summary, "Web 2.0 Conference");
assertContains(event, vICAL.url,
- RDFUtils.uri("http://www.web2con.com/"));
+ RDFUtils.iri("http://www.web2con.com/"));
assertContains(event, vICAL.location, "Argent Hotel, San Francisco, CA");
}
@@ -243,7 +242,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(event, vICAL.summary,
"Bad Movie Night - Gigli (blame mike spiegelman)");
assertContains(event, vICAL.url,
- RDFUtils.uri(baseURI + "squidlist/calendar/12279/2006/1/15"));
+ RDFUtils.iri(baseIRI + "squidlist/calendar/12279/2006/1/15"));
}
@Test
@@ -263,7 +262,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(event, vICAL.dtend, "2005-10-08");
assertContains(event, vICAL.summary, "Web 2.0 Conference");
assertContains(event, vICAL.url,
- RDFUtils.uri("http://www.web2con.com/"));
+ RDFUtils.iri("http://www.web2con.com/"));
assertContains(event, vICAL.location, "Argent Hotel, San Francisco, CA");
}
@@ -276,7 +275,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(event, vICAL.summary,
"O'Reilly Emerging Technology Conference");
assertContains(event, vICAL.url,
- RDFUtils.uri("http://conferences.oreillynet.com/et2006/"));
+ RDFUtils.iri("http://conferences.oreillynet.com/et2006/"));
assertContains(event, vICAL.location,
"Manchester Grand Hyatt in San Diego, CA");
}
@@ -309,7 +308,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(
event,
vICAL.url,
- RDFUtils.uri("http://www.laughingsquid.com/squidlist/calendar/12377/2006/1/25"));
+ RDFUtils.iri("http://www.laughingsquid.com/squidlist/calendar/12377/2006/1/25"));
assertContains(event, vICAL.summary,
"Art Reception for Tom Schultz and Felix Macnee");
}
@@ -321,8 +320,8 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(
event,
vICAL.url,
- RDFUtils.uri("http://dps1.travelocity.com/dparcobrand.ctl?smls=Y&Service=YHOE&.intl=us&aln_name=AA&flt_num="
- + "1655&dep_arp_name=&arr_arp_name=&dep_dt_dy_1=23&dep_dt_mn_1=Jan&dep_dt_yr_1=2006&dep_tm_1=9:00am"));
+ RDFUtils.iri("http://dps1.travelocity.com/dparcobrand.ctl?smls=Y&Service=YHOE&.intl=us&aln_name=AA&flt_num="
+ + "1655&dep_arp_name=&arr_arp_name=&dep_dt_dy_1=23&dep_dt_mn_1=Jan&dep_dt_yr_1=2006&dep_tm_1=9:00am"));
assertContains(event, vICAL.summary, "ORD-SFO/AA 1655");
}
@@ -334,7 +333,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
assertContains(event, vICAL.dtend, "2005-10-08");
assertContains(event, vICAL.summary, "Web 2.0 Conference");
assertContains(event, vICAL.url,
- RDFUtils.uri("http://www.web2con.com/"));
+ RDFUtils.iri("http://www.web2con.com/"));
assertContains(event, vICAL.location, "Argent Hotel, San Francisco, CA");
}
@@ -389,7 +388,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testFullHCalendarClass() throws Exception {
assertExtract("/microformats/hcalendar/example5.3.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
}
@@ -397,7 +396,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testHCalendarClassWithTodo() throws Exception {
assertExtract("/microformats/hcalendar/example5.4.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vtodo);
}
@@ -405,7 +404,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
public void testHCalendarClassWithJournal() throws Exception {
assertExtract("/microformats/hcalendar/example5.5.html");
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vjournal);
}
@@ -424,7 +423,7 @@ public class HCalendarExtractorTest extends AbstractExtractorTestCase {
private void assertDefault(String name) throws Exception {
assertExtract(name);
assertModelNotEmpty();
- assertContains(baseURI, RDF.TYPE, vcal);
+ assertContains(baseIRI, RDF.TYPE, vcal);
assertStatementsSize(RDF.TYPE, vcal, 1);
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
index e3323a8..c505bb8 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
@@ -25,12 +25,11 @@ import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.vocab.VCard;
import org.junit.Ignore;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryResult;
import java.io.IOException;
import java.util.Arrays;
@@ -52,7 +51,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertExtract("/microformats/hcard/17-email-not-uri.html");
assertDefaultVCard();
assertJohn();
- assertContains(vVCARD.email, RDFUtils.uri("mailto:john@example.com"));
+ assertContains(vVCARD.email, RDFUtils.iri("mailto:john@example.com"));
}
@Test
@@ -64,9 +63,9 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
"+1.415.555.1239", "+1.415.555.1240", "+1.415.555.1241",
"+1.415.555.1242", "+1.415.555.1243" };
for (String tel : tels) {
- assertContains(vVCARD.tel, RDFUtils.uri("tel:" + tel));
+ assertContains(vVCARD.tel, RDFUtils.iri("tel:" + tel));
}
- Resource telResource = RDFUtils.uri("tel:+14155551233");
+ Resource telResource = RDFUtils.iri("tel:+14155551233");
assertContains(vVCARD.fax, telResource);
assertContains(vVCARD.workTel, telResource);
assertContains(vVCARD.homeTel, telResource);
@@ -90,7 +89,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertContains(vVCARD.role, "Chief");
assertContains(vVCARD.tz, "-0700");
assertContains(vVCARD.bday, "2006-04-04");
- assertContains(vVCARD.tel, RDFUtils.uri("tel:415.555.1234"));
+ assertContains(vVCARD.tel, RDFUtils.iri("tel:415.555.1234"));
assertContains(vVCARD.uid, "abcdefghijklmnopqrstuvwxyz");
assertContains(vVCARD.class_, "public");
assertContains(vVCARD.note, "this is a note");
@@ -148,7 +147,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertContains(vVCARD.organization_name, "Intellicorp");
assertContains(vVCARD.organization_unit, "Intelligence");
- assertContains(vVCARD.tel, RDFUtils.uri("tel:415.555.1234"));
+ assertContains(vVCARD.tel, RDFUtils.iri("tel:415.555.1234"));
assertContains(vVCARD.uid, "abcdefghijklmnopqrstuvwxyz");
assertContains(vVCARD.note, "this is a note");
assertContains(vVCARD.class_, "public");
@@ -250,7 +249,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
RepositoryResult<Statement> statements = getStatements(null, RDF.TYPE,
vVCARD.VCard);
try {
- Resource example = RDFUtils.uri("http://example.org/");
+ Resource example = RDFUtils.iri("http://example.org/");
while (statements.hasNext()) {
Resource card = statements.next().getSubject();
Assert.assertNotNull(findObject(card, vVCARD.fn));
@@ -460,7 +459,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
Resource org = findExactlyOneBlankSubject(vVCARD.organization_name,
RDFUtils.literal("Technorati"));
Assert.assertNotNull(org);
- assertContains(person, vVCARD.url, RDFUtils.uri("http://tantek.com/"));
+ assertContains(person, vVCARD.url, RDFUtils.iri("http://tantek.com/"));
assertContains(person, vVCARD.n, (Resource) null);
assertContains(person, vVCARD.org, (Resource) null);
}
@@ -551,7 +550,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertContains(vVCARD.fn, "Ryan King");
assertContains(RDF.TYPE, vVCARD.Name);
- assertContains(vVCARD.email, RDFUtils.uri("mailto:ryan@technorati.com"));
+ assertContains(vVCARD.email, RDFUtils.iri("mailto:ryan@technorati.com"));
assertContains(vVCARD.given_name, "Ryan");
assertContains(vVCARD.family_name, "King");
@@ -563,7 +562,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertDefaultVCard();
assertContains(vVCARD.fn, "Brian Suda");
- assertContains(vVCARD.email, RDFUtils.uri("mailto:brian@example.com"));
+ assertContains(vVCARD.email, RDFUtils.iri("mailto:brian@example.com"));
assertContains(vVCARD.given_name, "Brian");
assertContains(vVCARD.family_name, "Suda");
}
@@ -573,14 +572,14 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertExtract("/microformats/hcard/07-relative-url.html");
assertDefaultVCard();
assertJohn();
- assertContains(vVCARD.url, RDFUtils.uri(baseURI + "home/blah"));
+ assertContains(vVCARD.url, RDFUtils.iri(baseIRI + "home/blah"));
}
@Test
public void testRelativeUrlBase() throws Exception {
assertExtract("/microformats/hcard/08-relative-url-base.html");
assertDefaultVCard();
- assertContains(vVCARD.url, RDFUtils.uri(baseURI + "home/blah"));
+ assertContains(vVCARD.url, RDFUtils.iri(baseIRI + "home/blah"));
assertJohn();
}
@@ -588,7 +587,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
public void testRelativeUrlXmlBase1() throws Exception {
assertExtract("/microformats/hcard/09-relative-url-xmlbase-1.html");
assertDefaultVCard();
- assertContains(vVCARD.url, RDFUtils.uri((baseURI + "home/blah")));
+ assertContains(vVCARD.url, RDFUtils.iri((baseIRI + "home/blah")));
assertJohn();
}
@@ -596,7 +595,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
public void testRelativeUrlXmlBase2() throws Exception {
assertExtract("/microformats/hcard/10-relative-url-xmlbase-2.html");
assertDefaultVCard();
- assertContains(vVCARD.url, RDFUtils.uri((baseURI + "home/blah")));
+ assertContains(vVCARD.url, RDFUtils.iri((baseIRI + "home/blah")));
assertJohn();
}
@@ -604,8 +603,8 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
public void testMultipleUrls() throws Exception {
assertExtract("/microformats/hcard/11-multiple-urls.html");
assertDefaultVCard();
- assertContains(vVCARD.url, RDFUtils.uri(("http://example.com/foo")));
- assertContains(vVCARD.url, RDFUtils.uri(("http://example.com/bar")));
+ assertContains(vVCARD.url, RDFUtils.iri(("http://example.com/foo")));
+ assertContains(vVCARD.url, RDFUtils.iri(("http://example.com/bar")));
assertJohn();
}
@@ -622,13 +621,13 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertExtract("/microformats/hcard/13-photo-logo.html");
assertDefaultVCard();
assertContains(vVCARD.photo,
- RDFUtils.uri(("http://example.org/picture1.png")));
+ RDFUtils.iri(("http://example.org/picture1.png")));
assertContains(vVCARD.photo,
- RDFUtils.uri(("http://example.org/picture2.png")));
+ RDFUtils.iri(("http://example.org/picture2.png")));
assertContains(vVCARD.logo,
- RDFUtils.uri(("http://example.org/picture1.png")));
+ RDFUtils.iri(("http://example.org/picture1.png")));
assertContains(vVCARD.logo,
- RDFUtils.uri(("http://example.org/picture2.png")));
+ RDFUtils.iri(("http://example.org/picture2.png")));
assertJohn();
}
@@ -636,23 +635,22 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
public void testImgSrcDataUrl() throws Exception {
assertExtract("/microformats/hcard/14-img-src-data-url.html");
assertDefaultVCard();
- Resource data = RDFUtils
- .uri("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAABGdBTUEAAK/"
- + "INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASUExURf///8zMzJmZmWZmZ"
- + "jMzMwAAAPOPemkAAAM1SURBVHjaYmBgYGBkYQUBFkYWFiCPCchixQAMCCZAACF0MAMVM4K4TFh0IGsBCC"
- + "AkOxhYmBnAAKaHhZkZmxaAAGJgYIbpYGBihGgBWsTMzMwE4jIhaWGAYoAAYmCECDExYAcwGxkg5oNIgAB"
- + "igDqLARdgZmGB2wICrKwAAcSA3xKgIxlZ0PwCEEAMBCxhgHoWSQtAADFAAxgfYEJ1GEAAQbQw4tUCsocB"
- + "YQVAADEgu4uRkREeUCwszEwwLhOKLQABhNDCBA4aSDgwwhIAJKqYUPwCEEAMUK/AUwnc9aywJMCI7DAgA"
- + "AggBohZ8JTBhGIJzCoWZL8ABBCYidAB8RUjWppkYUG2BSCAGMDqEMZiswUtXgACiAHsFYixTMywGGLGpgU"
- + "WYgABxAA2mQkWCMyMqFoYmdD8ACQAAogBHJHMrCxg1cyIiICmCkYWDFsAAgiihYmZCewFFpR0BfI3LLch+"
- + "QUggBiQ0iQjEyMDmh54qCBlUIAAYsCRJsElADQvgWKTlRGeKwECiAF3XgGmMEYQYADZzcoA9z5AAMG9RQC"
- + "AtEC9DxBADFiyFyMjVi0wABBAWLQwQdIiuhYGWJIACCBg+KKUJ9BoBRdS2LQALQMIIGDQIEmwAO1kYcVWH"
- + "CDZAhBAqFqYmOAxj2YNtAwDAYAAYmDEiBYWzHKKkRERYiwAAYSphZEZwxZGZiZQVEJTJkAAMTCyokc7M5o"
- + "ORlC5wcoEjxeAAAJqQXU0UB6W5WFmABMtEzMi1wEEEFAbE0YyAUuzMMEsYQalMkQSBQggUDmNPU3C9IA4L"
- + "CxI+QUggEBiKOU8yExgqccCL3chnkPKlQABhGo6ejHBDKmdUHMlQAAhhQvQaGZGkBIkjcAMywLmI+VKgAB"
- + "CSowsTJhZkhlWXiBpAQggYBqBZl9GVOdBcz0LZqEEEEAMqLULMBLg1THWog9IAwQQA0qiZcRW5aPbAhBAD"
- + "Cg1El4tMAAQQAxoiZYZXnTh1AIQQAzo2QlYpDDjcBgrxGEAAcSAJTthswmiBUwDBBC2GpkZJTaRvQ+mAQK"
- + "IAUuuxdZWQvILQABBmSxMjBj5EpcWgACCMoFOYYSpZyHQHgMIMACt2hmoVEikCQAAAABJRU5ErkJggg==");
+ Resource data = RDFUtils.iri("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAABGdBTUEAAK/"
+ + "INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASUExURf///8zMzJmZmWZmZ"
+ + "jMzMwAAAPOPemkAAAM1SURBVHjaYmBgYGBkYQUBFkYWFiCPCchixQAMCCZAACF0MAMVM4K4TFh0IGsBCC"
+ + "AkOxhYmBnAAKaHhZkZmxaAAGJgYIbpYGBihGgBWsTMzMwE4jIhaWGAYoAAYmCECDExYAcwGxkg5oNIgAB"
+ + "igDqLARdgZmGB2wICrKwAAcSA3xKgIxlZ0PwCEEAMBCxhgHoWSQtAADFAAxgfYEJ1GEAAQbQw4tUCsocB"
+ + "YQVAADEgu4uRkREeUCwszEwwLhOKLQABhNDCBA4aSDgwwhIAJKqYUPwCEEAMUK/AUwnc9aywJMCI7DAgA"
+ + "AggBohZ8JTBhGIJzCoWZL8ABBCYidAB8RUjWppkYUG2BSCAGMDqEMZiswUtXgACiAHsFYixTMywGGLGpgU"
+ + "WYgABxAA2mQkWCMyMqFoYmdD8ACQAAogBHJHMrCxg1cyIiICmCkYWDFsAAgiihYmZCewFFpR0BfI3LLch+"
+ + "QUggBiQ0iQjEyMDmh54qCBlUIAAYsCRJsElADQvgWKTlRGeKwECiAF3XgGmMEYQYADZzcoA9z5AAMG9RQC"
+ + "AtEC9DxBADFiyFyMjVi0wABBAWLQwQdIiuhYGWJIACCBg+KKUJ9BoBRdS2LQALQMIIGDQIEmwAO1kYcVWH"
+ + "CDZAhBAqFqYmOAxj2YNtAwDAYAAYmDEiBYWzHKKkRERYiwAAYSphZEZwxZGZiZQVEJTJkAAMTCyokc7M5o"
+ + "ORlC5wcoEjxeAAAJqQXU0UB6W5WFmABMtEzMi1wEEEFAbE0YyAUuzMMEsYQalMkQSBQggUDmNPU3C9IA4L"
+ + "CxI+QUggEBiKOU8yExgqccCL3chnkPKlQABhGo6ejHBDKmdUHMlQAAhhQvQaGZGkBIkjcAMywLmI+VKgAB"
+ + "CSowsTJhZkhlWXiBpAQggYBqBZl9GVOdBcz0LZqEEEEAMqLULMBLg1THWog9IAwQQA0qiZcRW5aPbAhBAD"
+ + "Cg1El4tMAAQQAxoiZYZXnTh1AIQQAzo2QlYpDDjcBgrxGEAAcSAJTthswmiBUwDBBC2GpkZJTaRvQ+mAQK"
+ + "IAUuuxdZWQvILQABBmSxMjBj5EpcWgACCMoFOYYSpZyHQHgMIMACt2hmoVEikCQAAAABJRU5ErkJggg==");
assertContains(vVCARD.photo, data);
assertContains(vVCARD.logo, data);
@@ -697,7 +695,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertExtract("/microformats/hcard/17-email-not-uri.html");
assertDefaultVCard();
assertJohn();
- assertContains(vVCARD.email, RDFUtils.uri("mailto:john@example.com"));
+ assertContains(vVCARD.email, RDFUtils.iri("mailto:john@example.com"));
}
@Test
@@ -722,7 +720,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
public void testImgAlt() throws Exception {
assertExtract("/microformats/hcard/20-image-alt.html");
assertDefaultVCard();
- Resource uri = RDFUtils.uri("http://example.com/foo.png");
+ Resource uri = RDFUtils.iri("http://example.com/foo.png");
assertContains(vVCARD.photo, uri);
assertContains(vVCARD.logo, uri);
assertJohn();
@@ -909,7 +907,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 1);
assertContains(vVCARD.fn, "Melanie Kl\u00f6\u00df");
- assertContains(vVCARD.email, RDFUtils.uri("mailto:mkloes@gmail.com"));
+ assertContains(vVCARD.email, RDFUtils.iri("mailto:mkloes@gmail.com"));
assertContains(vVCARD.adr, (Resource) null);
assertNotContains(null, vVCARD.postal_code, "53127");
assertNotContains(null, vVCARD.locality, "Bonn");
@@ -942,7 +940,7 @@ public class HCardExtractorTest extends AbstractExtractorTestCase {
@Test
public void testInfiniteLoop() throws IOException, ExtractionException {
assertExtract("/microformats/hcard/infinite-loop.html", false);
- assertIssue(IssueReport.IssueLevel.Warning,
+ assertIssue(IssueReport.IssueLevel.WARNING,
".*Current node tries to include an ancestor node.*");
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
index 84b5d88..815d220 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
@@ -24,9 +24,8 @@ import org.apache.any23.vocab.HListing;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
import org.junit.Ignore;
-import org.openrdf.model.Resource;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,7 +126,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertExtract("/microformats/hlisting/item-fn-url.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Item);
- assertContains(vHLISTING.itemUrl, RDFUtils.uri("http://item.com/"));
+ assertContains(vHLISTING.itemUrl, RDFUtils.iri("http://item.com/"));
assertContains(vHLISTING.itemName, "Parking space");
}
@@ -136,10 +135,10 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertExtract("/microformats/hlisting/item-fn-url-photo-img.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Item);
- assertContains(vHLISTING.itemUrl, RDFUtils.uri("http://item.com/"));
+ assertContains(vHLISTING.itemUrl, RDFUtils.iri("http://item.com/"));
assertContains(vHLISTING.itemName, "Parking space");
assertContains(vHLISTING.itemPhoto,
- RDFUtils.uri(baseURI.stringValue() + "photo.jpg"));
+ RDFUtils.iri(baseIRI.stringValue() + "photo.jpg"));
}
@Test
@@ -149,7 +148,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(RDF.TYPE, vHLISTING.Item);
assertContains(vHLISTING.itemName, "Parking space");
assertContains(vHLISTING.itemPhoto,
- RDFUtils.uri(baseURI.stringValue() + "pic.jpg"));
+ RDFUtils.iri(baseIRI.stringValue() + "pic.jpg"));
}
@Ignore("ANY23-159: Error with nodes and markup extracted from HListingExtractorTest.testKelkoo & testKelkooFull")
@@ -170,20 +169,20 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(
vHLISTING.listerUrl,
- RDFUtils.uri(baseURI.stringValue()
- + "m-4621623-pc-world-business.html"));
+ RDFUtils.iri(baseIRI.stringValue()
+ + "m-4621623-pc-world-business.html"));
assertContains(vHLISTING.listerOrg, "PC World Business");
assertContains(
vHLISTING.listerLogo,
- RDFUtils.uri(baseURI.stringValue()
- + "data/merchantlogos/4621623/pcworld.gif"));
+ RDFUtils.iri(baseIRI.stringValue()
+ + "data/merchantlogos/4621623/pcworld.gif"));
assertContains(vHLISTING.listerName, "PC World Business");
assertContains(
vHLISTING.itemPhoto,
- RDFUtils.uri("http://img.kelkoo.com/uk/medium/675/496/00117250662929509422269096808645163496675.jpg"));
+ RDFUtils.iri("http://img.kelkoo.com/uk/medium/675/496/00117250662929509422269096808645163496675.jpg"));
assertContains(vHLISTING.price, "\u00A3480.17");
}
@@ -197,7 +196,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(RDF.TYPE, vHLISTING.Item);
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.itemUrl,
- RDFUtils.uri("http://bob.example.com/"));
+ RDFUtils.iri("http://bob.example.com/"));
assertContains(RDF.TYPE, vHLISTING.Lister);
assertContains(vHLISTING.itemName,
@@ -209,23 +208,23 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(
vHLISTING.itemPhoto,
- RDFUtils.uri("http://img.kelkoo.com/uk/medium/657/449/00162475823966154731749844283942320449657.jpg"));
+ RDFUtils.iri("http://img.kelkoo.com/uk/medium/657/449/00162475823966154731749844283942320449657.jpg"));
assertContains(
vHLISTING.itemPhoto,
- RDFUtils.uri("http://img.kelkoo.com/uk/medium/545/091/00154244199719224091151116421737036091545.jpg"));
+ RDFUtils.iri("http://img.kelkoo.com/uk/medium/545/091/00154244199719224091151116421737036091545.jpg"));
assertContains(
vHLISTING.itemPhoto,
- RDFUtils.uri("http://img.kelkoo.com/uk/medium/018/426/00156227992563192632349212375692442426018.jpg"));
+ RDFUtils.iri("http://img.kelkoo.com/uk/medium/018/426/00156227992563192632349212375692442426018.jpg"));
assertContains(
vHLISTING.listerLogo,
- RDFUtils.uri("http://bob.example.com/data/merchantlogos/6957423/socksfox.gif"));
+ RDFUtils.iri("http://bob.example.com/data/merchantlogos/6957423/socksfox.gif"));
assertContains(
vHLISTING.listerLogo,
- RDFUtils.uri("http://bob.example.com/data/merchantlogos/3590723/mytightsnew.gif"));
+ RDFUtils.iri("http://bob.example.com/data/merchantlogos/3590723/mytightsnew.gif"));
assertContains(
vHLISTING.listerLogo,
- RDFUtils.uri("http://bob.example.com/data/merchantlogos/2977501/pleaseonlinelogo88x311.gif"));
+ RDFUtils.iri("http://bob.example.com/data/merchantlogos/2977501/pleaseonlinelogo88x311.gif"));
assertContains(vHLISTING.listerName, "Socks Fox");
assertContains(vHLISTING.listerName, "My Tights");
@@ -236,12 +235,12 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(vHLISTING.listerName, "Tightsplease");
assertContains(vHLISTING.listerUrl,
- RDFUtils.uri("http://bob.example.com/m-6957423-socks-fox.html"));
+ RDFUtils.iri("http://bob.example.com/m-6957423-socks-fox.html"));
assertContains(vHLISTING.listerUrl,
- RDFUtils.uri("http://bob.example.com/m-3590723-my-tights.html"));
+ RDFUtils.iri("http://bob.example.com/m-3590723-my-tights.html"));
assertContains(
vHLISTING.listerUrl,
- RDFUtils.uri("http://bob.example.com/m-2977501-tightsplease.html"));
+ RDFUtils.iri("http://bob.example.com/m-2977501-tightsplease.html"));
assertContains(vHLISTING.price, "\u00A380");
assertContains(vHLISTING.price, "\u00A347.95");
@@ -255,7 +254,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.listerName, "John Broker");
assertContains(RDF.TYPE, vHLISTING.Lister);
- assertContains(vHLISTING.listerUrl, RDFUtils.uri("http://homepage.com"));
+ assertContains(vHLISTING.listerUrl, RDFUtils.iri("http://homepage.com"));
}
@Test
@@ -265,7 +264,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.listerName, "John Broker");
assertContains(RDF.TYPE, vHLISTING.Lister);
- assertContains(vFOAF.mbox, RDFUtils.uri("mailto:info@commerce.net"));
+ assertContains(vFOAF.mbox, RDFUtils.iri("mailto:info@commerce.net"));
}
@Test
@@ -275,7 +274,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(RDF.TYPE, vHLISTING.Lister);
assertContains(vHLISTING.listerName, "John Broker");
- assertContains(vFOAF.mbox, RDFUtils.uri("mailto:info@commerce.net"));
+ assertContains(vFOAF.mbox, RDFUtils.iri("mailto:info@commerce.net"));
}
@Test
@@ -332,7 +331,7 @@ public class HListingExtractorTest extends AbstractExtractorTestCase {
assertModelNotEmpty();
assertContains(vHLISTING.permalink, "http://livre.com/book");
assertContains(vHLISTING.listerUrl,
- RDFUtils.uri("http://livre.com/author"));
+ RDFUtils.iri("http://livre.com/author"));
}
@Test
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
index 5a171bc..8bf9f16 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
@@ -21,8 +21,7 @@ import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.vocab.HRecipe;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
/**
* Test case for {@link HRecipeExtractor}.
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
index 5c1020d..6b9fe7a 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
@@ -24,12 +24,11 @@ import org.apache.any23.vocab.SINDICE;
import org.apache.any23.vocab.VCard;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
index e078df5..53b715c 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
@@ -24,12 +24,12 @@ import org.apache.any23.vocab.Review;
import org.apache.any23.vocab.SINDICE;
import org.apache.any23.vocab.VCard;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -207,11 +207,11 @@ public class HReviewExtractorTest extends AbstractExtractorTestCase {
assertContains(
reviewSubject,
vVCARD.url,
- RDFUtils.uri("http://www.amazon.com/exec/obidos/ASIN/B000089CJI/"));
+ RDFUtils.iri("http://www.amazon.com/exec/obidos/ASIN/B000089CJI/"));
assertContains(
reviewSubject,
vVCARD.photo,
- RDFUtils.uri("http://images.amazon.com/images/P/B000089CJI.01._SCTHUMBZZZ_.jpg"));
+ RDFUtils.iri("http://images.amazon.com/images/P/B000089CJI.01._SCTHUMBZZZ_.jpg"));
}
} finally {
reviewSubjects.close();
@@ -267,7 +267,7 @@ public class HReviewExtractorTest extends AbstractExtractorTestCase {
assertContains(
reviewSubject,
vVCARD.url,
- RDFUtils.uri("http://www.imdb.com/title/tt0299977/"));
+ RDFUtils.iri("http://www.imdb.com/title/tt0299977/"));
}
} finally {
@@ -330,7 +330,7 @@ public class HReviewExtractorTest extends AbstractExtractorTestCase {
assertContains(
reviewSubject,
vVCARD.url,
- RDFUtils.uri("http://www.imdb.com/title/tt0299977/"));
+ RDFUtils.iri("http://www.imdb.com/title/tt0299977/"));
}
} finally {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HTMLFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HTMLFixture.java b/core/src/test/java/org/apache/any23/extractor/html/HTMLFixture.java
index 1c68f1e..69ef6c7 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HTMLFixture.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HTMLFixture.java
@@ -43,8 +43,8 @@ public class HTMLFixture {
return file;
}
- public DocumentSource getOpener(String baseURI) {
- return new FileDocumentSource(getFile(), baseURI);
+ public DocumentSource getOpener(String baseIRI) {
+ return new FileDocumentSource(getFile(), baseIRI);
}
/**
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java
index 854360c..48cdd77 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java
@@ -20,8 +20,7 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
/**
* Reference Test class for the {@link HTMLMetaExtractor} extractor.
@@ -41,26 +40,26 @@ public class HTMLMetaExtractorTest extends AbstractExtractorTestCase {
assertExtract("/html/html-head-meta-extractor.html");
assertModelNotEmpty();
assertStatementsSize(null, null, null, 10);
- assertContains(new URIImpl("http://bob.example.com/"), new URIImpl(
+ assertContains(SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"), SimpleValueFactory.getInstance().createIRI(
"http://purl.org/dc/elements/1.1/title"), "XHTML+RDFa example",
"en");
- assertContains(new URIImpl("http://bob.example.com/"), new URIImpl(
+ assertContains(SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"), SimpleValueFactory.getInstance().createIRI(
"http://purl.org/dc/elements/1.1/language"), "en", "en");
- assertContains(new URIImpl("http://bob.example.com/"), new URIImpl(
+ assertContains(SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"), SimpleValueFactory.getInstance().createIRI(
"http://purl.org/dc/elements/1.1/subject"),
"XHTML+RDFa, semantic web", "en");
- assertContains(new URIImpl("http://bob.example.com/"), new URIImpl(
+ assertContains(SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"), SimpleValueFactory.getInstance().createIRI(
"http://purl.org/dc/elements/1.1/format"),
"application/xhtml+xml", "en");
assertContains(
- new URIImpl("http://bob.example.com/"),
- new URIImpl("http://purl.org/dc/elements/1.1/description"),
+ SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"),
+ SimpleValueFactory.getInstance().createIRI("http://purl.org/dc/elements/1.1/description"),
"Example for Extensible Hypertext Markup Language + Resource Description Framework \u2013 in \u2013 attributes.",
"en");
- assertContains(new URIImpl("http://bob.example.com/"), new URIImpl(
+ assertContains(SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"), SimpleValueFactory.getInstance().createIRI(
vSINDICE.NAMESPACE.toString() + "robots"), "index, follow",
"en");
- assertContains(new URIImpl("http://bob.example.com/"), new URIImpl(
+ assertContains(SimpleValueFactory.getInstance().createIRI("http://bob.example.com/"), SimpleValueFactory.getInstance().createIRI(
vSINDICE.NAMESPACE.toString() + "content-language"), "en", "en");
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java
index 88c8095..6745352 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java
@@ -19,10 +19,10 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
import org.junit.Test;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.repository.RepositoryException;
/**
* Test case for {@link HeadLinkExtractor}
@@ -40,23 +40,23 @@ public class HeadLinkExtractorTest extends AbstractExtractorTestCase {
public void testLinkExtraction() throws RepositoryException {
assertExtract("/html/html-head-link-extractor.html");
assertModelNotEmpty();
- final ValueFactory valueFactory = new ValueFactoryImpl();
- final URI externalLinkURI = valueFactory.createURI("http://www.myexperiment.org/workflows/16.rdf");
+ final ValueFactory valueFactory = SimpleValueFactory.getInstance();
+ final IRI externalLinkIRI = valueFactory.createIRI("http://www.myexperiment.org/workflows/16.rdf");
assertContains(
- AbstractExtractorTestCase.baseURI,
- valueFactory.createURI("http://www.w3.org/1999/xhtml/vocab#alternate"),
- externalLinkURI
+ AbstractExtractorTestCase.baseIRI,
+ valueFactory.createIRI("http://www.w3.org/1999/xhtml/vocab#alternate"),
+ externalLinkIRI
);
assertContains(
- externalLinkURI,
- valueFactory.createURI("http://purl.org/dc/terms/title"),
+ externalLinkIRI,
+ valueFactory.createIRI("http://purl.org/dc/terms/title"),
valueFactory.createLiteral("RDF+XML")
);
assertContains(
- externalLinkURI,
- valueFactory.createURI("http://purl.org/dc/terms/format"),
+ externalLinkIRI,
+ valueFactory.createIRI("http://purl.org/dc/terms/format"),
valueFactory.createLiteral("application/rdf+xml")
);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java
index a651ba0..3bf2a65 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java
@@ -24,8 +24,8 @@ import org.apache.any23.vocab.SINDICE;
import org.apache.any23.vocab.XHTML;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.model.URI;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.repository.RepositoryException;
import java.util.Collection;
@@ -39,9 +39,9 @@ public class LicenseExtractorTest extends AbstractExtractorTestCase {
private static final SINDICE vSINDICE = SINDICE.getInstance();
private static final XHTML vXHTML = XHTML.getInstance();
- private URI ccBy = RDFUtils.uri("http://creativecommons.org/licenses/by/2.0/");
+ private IRI ccBy = RDFUtils.iri("http://creativecommons.org/licenses/by/2.0/");
- private URI apache = RDFUtils.uri("http://www.apache.org/licenses/LICENSE-2.0");
+ private IRI apache = RDFUtils.iri("http://www.apache.org/licenses/LICENSE-2.0");
public ExtractorFactory<?> getExtractorFactory() {
return new LicenseExtractorFactory();
@@ -50,35 +50,35 @@ public class LicenseExtractorTest extends AbstractExtractorTestCase {
@Test
public void testOnlyCc() throws RepositoryException {
assertExtract("/microformats/license/ccBy.html");
- assertContains(baseURI, vXHTML.license, ccBy);
- assertNotContains(baseURI, vXHTML.license, apache);
+ assertContains(baseIRI, vXHTML.license, ccBy);
+ assertNotContains(baseIRI, vXHTML.license, apache);
}
@Test
public void testOnlyApache() throws RepositoryException {
assertExtract("/microformats/license/apache.html");
- assertNotContains(baseURI, vXHTML.license, ccBy);
- assertContains(baseURI, vXHTML.license, apache);
+ assertNotContains(baseIRI, vXHTML.license, ccBy);
+ assertContains(baseIRI, vXHTML.license, apache);
}
@Test
public void testMultipleLicenses() throws RepositoryException {
assertExtract("/microformats/license/multiple.html");
- assertContains(baseURI, vXHTML.license, ccBy);
- assertContains(baseURI, vXHTML.license, apache);
+ assertContains(baseIRI, vXHTML.license, ccBy);
+ assertContains(baseIRI, vXHTML.license, apache);
}
@Test
public void testMultipleEmptyHref() throws RepositoryException {
assertExtract("/microformats/license/multiple-empty-href.html", false);
- assertNotContains(baseURI, vXHTML.license, "");
- assertContains(baseURI, vXHTML.license, apache);
+ assertNotContains(baseIRI, vXHTML.license, "");
+ assertContains(baseIRI, vXHTML.license, apache);
final Collection<IssueReport.Issue> errors = getIssues();
Assert.assertEquals(1, errors.size());
IssueReport.Issue error = errors.iterator().next();
Assert.assertTrue(error.getMessage().contains("Invalid license link detected"));
- Assert.assertEquals(IssueReport.IssueLevel.Warning, error.getLevel());
+ Assert.assertEquals(IssueReport.IssueLevel.WARNING, error.getLevel());
}
@Test
@@ -90,8 +90,8 @@ public class LicenseExtractorTest extends AbstractExtractorTestCase {
@Test
public void testMixedCaseTitleTag() throws RepositoryException {
assertExtract("/microformats/license/multiple-mixed-case.html");
- assertContains(baseURI, vXHTML.license, ccBy);
- assertContains(baseURI, vXHTML.license, apache);
+ assertContains(baseIRI, vXHTML.license, ccBy);
+ assertContains(baseIRI, vXHTML.license, apache);
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java b/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
index bce8bb1..78f4881 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
@@ -29,18 +29,16 @@ import org.apache.any23.vocab.Review;
import org.apache.any23.vocab.VCard;
import org.apache.any23.writer.RepositoryWriter;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
import org.w3c.dom.Document;
import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@@ -114,7 +112,7 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
assertContains(vVCARD.role, "Chief");
assertContains(vVCARD.tz, "-0700");
assertContains(vVCARD.bday, "2006-04-04");
- assertContains(vVCARD.tel, RDFUtils.uri("tel:415.555.1234"));
+ assertContains(vVCARD.tel, RDFUtils.iri("tel:415.555.1234"));
assertContains(vVCARD.uid, "abcdefghijklmnopqrstuvwxyz");
assertContains(vVCARD.class_, "public");
assertContains(vVCARD.note, "this is a note");
@@ -221,7 +219,7 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
assertContains(vVCARD.organization_name, "Intellicorp");
assertContains(vVCARD.organization_unit, "Intelligence");
- assertContains(vVCARD.tel, RDFUtils.uri("tel:415.555.1234"));
+ assertContains(vVCARD.tel, RDFUtils.iri("tel:415.555.1234"));
assertContains(vVCARD.uid, "abcdefghijklmnopqrstuvwxyz");
assertContains(vVCARD.note, "this is a note");
assertContains(vVCARD.class_, "public");
@@ -400,11 +398,11 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
assertContains(
subject,
vVCARD.url,
- RDFUtils.uri("http://www.amazon.com/exec/obidos/ASIN/B000089CJI/"));
+ RDFUtils.iri("http://www.amazon.com/exec/obidos/ASIN/B000089CJI/"));
assertContains(
subject,
vVCARD.photo,
- RDFUtils.uri("http://images.amazon.com/images/P/B000089CJI.01._SCTHUMBZZZ_.jpg"));
+ RDFUtils.iri("http://images.amazon.com/images/P/B000089CJI.01._SCTHUMBZZZ_.jpg"));
}
} finally {
@@ -418,7 +416,7 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
}
assertContains(vVCARD.fn, "Adam Rifkin");
- assertContains(vVCARD.url, RDFUtils.uri("http://ifindkarma.com/blog/"));
+ assertContains(vVCARD.url, RDFUtils.iri("http://ifindkarma.com/blog/"));
}
@Override
@@ -428,19 +426,19 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
InputStream input = new BufferedInputStream(this.getClass()
.getResourceAsStream(filename));
- Document document = new TagSoupParser(input, baseURI.stringValue())
+ Document document = new TagSoupParser(input, baseIRI.stringValue())
.getDOM();
HCardExtractor hCardExtractor = new HCardExtractorFactory()
.createExtractor();
ExtractionContext hcExtractionContext = new ExtractionContext(
- hCardExtractor.getDescription().getExtractorName(), baseURI);
+ hCardExtractor.getDescription().getExtractorName(), baseIRI);
hCardExtractor.run(ExtractionParameters.newDefault(),
hcExtractionContext, document, new ExtractionResultImpl(
hcExtractionContext, hCardExtractor,
new RepositoryWriter(getConnection())));
XFNExtractor xfnExtractor = new XFNExtractorFactory().createExtractor();
ExtractionContext xfnExtractionContext = new ExtractionContext(
- xfnExtractor.getDescription().getExtractorName(), baseURI);
+ xfnExtractor.getDescription().getExtractorName(), baseIRI);
xfnExtractor.run(ExtractionParameters.newDefault(),
xfnExtractionContext, document, new ExtractionResultImpl(
xfnExtractionContext, hCardExtractor,
@@ -453,12 +451,12 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
InputStream input = new BufferedInputStream(this.getClass()
.getResourceAsStream(filename));
- Document document = new TagSoupParser(input, baseURI.stringValue())
+ Document document = new TagSoupParser(input, baseIRI.stringValue())
.getDOM();
HCardExtractor hCardExtractor = new HCardExtractorFactory()
.createExtractor();
ExtractionContext hCardExtractionContext = new ExtractionContext(
- hCardExtractor.getDescription().getExtractorName(), baseURI);
+ hCardExtractor.getDescription().getExtractorName(), baseIRI);
hCardExtractor.run(ExtractionParameters.newDefault(),
hCardExtractionContext, document, new ExtractionResultImpl(
hCardExtractionContext, hCardExtractor,
@@ -466,7 +464,7 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
GeoExtractor geoExtractor = new GeoExtractorFactory().createExtractor();
ExtractionContext geoExtractionContext = new ExtractionContext(
- geoExtractor.getDescription().getExtractorName(), baseURI);
+ geoExtractor.getDescription().getExtractorName(), baseIRI);
geoExtractor.run(ExtractionParameters.newDefault(),
geoExtractionContext, document, new ExtractionResultImpl(
geoExtractionContext, geoExtractor,
@@ -474,7 +472,7 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
AdrExtractor adrExtractor = new AdrExtractorFactory().createExtractor();
ExtractionContext adrExtractionContext = new ExtractionContext(
- adrExtractor.getDescription().getExtractorName(), baseURI);
+ adrExtractor.getDescription().getExtractorName(), baseIRI);
adrExtractor.run(ExtractionParameters.newDefault(),
adrExtractionContext, document, new ExtractionResultImpl(
adrExtractionContext, adrExtractor,
@@ -487,12 +485,12 @@ public class RDFMergerTest extends AbstractExtractorTestCase {
extractHCardAndRelated(filename);
InputStream input = new BufferedInputStream(this.getClass()
.getResourceAsStream(filename));
- Document document = new TagSoupParser(input, baseURI.stringValue())
+ Document document = new TagSoupParser(input, baseIRI.stringValue())
.getDOM();
HReviewExtractor hReviewExtractor = new HReviewExtractorFactory()
.createExtractor();
ExtractionContext hreviewExtractionContext = new ExtractionContext(
- hReviewExtractor.getDescription().getExtractorName(), baseURI);
+ hReviewExtractor.getDescription().getExtractorName(), baseIRI);
hReviewExtractor.run(ExtractionParameters.newDefault(),
hreviewExtractionContext, document, new ExtractionResultImpl(
hreviewExtractionContext, hReviewExtractor,
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java
index 0334bda..56ff2f2 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.vocab.WO;
import org.junit.Test;
-import org.openrdf.model.Value;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.repository.RepositoryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/TagSoupParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/TagSoupParserTest.java b/core/src/test/java/org/apache/any23/extractor/html/TagSoupParserTest.java
index 21f20c7..bd0a8a8 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/TagSoupParserTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/TagSoupParserTest.java
@@ -21,7 +21,7 @@ import org.apache.any23.extractor.ExtractionException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -30,8 +30,6 @@ import org.w3c.dom.NodeList;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
index 8aeffa3..fc29ba7 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
@@ -22,8 +22,8 @@ import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.vocab.DCTerms;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
-import org.openrdf.model.Literal;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.repository.RepositoryException;
/**
* Reference Test class for the {@link TitleExtractor} extractor.
@@ -44,13 +44,13 @@ public class TitleExtractorTest extends AbstractExtractorTestCase {
@Test
public void testExtractPageTitle() throws RepositoryException {
assertExtract("/microformats/xfn/simple-me.html");
- assertContains(baseURI, vDCTERMS.title, helloLiteral);
+ assertContains(baseIRI, vDCTERMS.title, helloLiteral);
}
@Test
public void testStripSpacesFromTitle() throws RepositoryException {
assertExtract("/microformats/xfn/strip-spaces.html");
- assertContains(baseURI, vDCTERMS.title, helloLiteral);
+ assertContains(baseIRI, vDCTERMS.title, helloLiteral);
}
@Test
@@ -62,7 +62,7 @@ public class TitleExtractorTest extends AbstractExtractorTestCase {
@Test
public void testMixedCaseTitleTag() throws RepositoryException {
assertExtract("/microformats/xfn/mixed-case.html");
- assertContains(baseURI, vDCTERMS.title, helloLiteral);
+ assertContains(baseIRI, vDCTERMS.title, helloLiteral);
}
/**
@@ -73,8 +73,8 @@ public class TitleExtractorTest extends AbstractExtractorTestCase {
@Test
public void testTitleWithDefaultLanguage() throws RepositoryException {
assertExtract("/html/default-language.html");
- assertContains (baseURI, vDCTERMS.title, RDFUtils.literal("Welcome to mydomain.net", "en"));
- assertNotContains(baseURI, vDCTERMS.title, RDFUtils.literal("Welcome to mydomain.net",(String) null));
+ assertContains (baseIRI, vDCTERMS.title, RDFUtils.literal("Welcome to mydomain.net", "en"));
+ assertNotContains(baseIRI, vDCTERMS.title, RDFUtils.literal("Welcome to mydomain.net",(String) null));
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java
index 7984458..ab2b977 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java
@@ -17,11 +17,10 @@
package org.apache.any23.extractor.html;
-import org.apache.any23.extractor.ExtractionException;
import org.apache.any23.extractor.ExtractorFactory;
import org.junit.Test;
-import org.openrdf.model.Value;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.repository.RepositoryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java
index bd29fe7..699c591 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java
@@ -24,10 +24,10 @@ import org.apache.any23.vocab.SINDICE;
import org.apache.any23.vocab.XFN;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryException;
/**
*
@@ -40,11 +40,11 @@ public class XFNExtractorTest extends AbstractExtractorTestCase {
private static final SINDICE vSINDICE = SINDICE.getInstance();
private static final XFN vXFN = XFN.getInstance();
- private final static URI bobsHomepage = baseURI;
+ private final static IRI bobsHomepage = baseIRI;
- private final static URI alicesHomepage = RDFUtils.uri("http://alice.example.com/");
+ private final static IRI alicesHomepage = RDFUtils.iri("http://alice.example.com/");
- private final static URI charliesHomepage = RDFUtils.uri("http://charlie.example.com/");
+ private final static IRI charliesHomepage = RDFUtils.iri("http://charlie.example.com/");
protected ExtractorFactory<?> getExtractorFactory() {
return new XFNExtractorFactory();
@@ -77,58 +77,58 @@ public class XFNExtractorTest extends AbstractExtractorTestCase {
public void testSimpleMeLink() throws RepositoryException {
assertExtract("/microformats/xfn/simple-me.html");
Resource person = findExactlyOneBlankSubject(RDF.TYPE, vFOAF.Person);
- assertContains(person, vXFN.mePage, baseURI);
+ assertContains(person, vXFN.mePage, baseIRI);
assertContains(person, vXFN.mePage, bobsHomepage);
}
@Test
- public void testRelativeURIisResolvedAgainstBase() throws RepositoryException {
+ public void testRelativeIRIisResolvedAgainstBase() throws RepositoryException {
assertExtract("/microformats/xfn/with-relative-uri.html");
- assertContains(null, vXFN.mePage, RDFUtils.uri("http://bob.example.com/foo"));
+ assertContains(null, vXFN.mePage, RDFUtils.iri("http://bob.example.com/foo"));
}
@Test
public void testParseTagSoup() throws RepositoryException {
assertExtract("/microformats/xfn/tagsoup.html");
Resource person = findExactlyOneBlankSubject(RDF.TYPE, vFOAF.Person);
- assertContains(person, vXFN.mePage, baseURI);
+ assertContains(person, vXFN.mePage, baseIRI);
}
@Test
public void testSimpleFriend() throws RepositoryException {
assertExtract("/microformats/xfn/simple-friend.html");
- Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseURI);
+ Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseIRI);
Resource alice = findExactlyOneBlankSubject(vXFN.mePage, alicesHomepage);
assertContains(bob, RDF.TYPE, vFOAF.Person);
assertContains(alice, RDF.TYPE, vFOAF.Person);
Assert.assertFalse(alice.equals(bob));
assertContains(bob, vXFN.friend, alice);
- assertContains(baseURI, vXFN.getExtendedProperty("friend"), alicesHomepage);
+ assertContains(baseIRI, vXFN.getExtendedProperty("friend"), alicesHomepage);
}
@Test
public void testFriendAndSweetheart() throws RepositoryException {
assertExtract("/microformats/xfn/multiple-rel.html");
- Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseURI);
+ Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseIRI);
Resource alice = findExactlyOneBlankSubject(vXFN.mePage, alicesHomepage);
assertContains(bob, vXFN.friend, alice);
- assertContains(baseURI, vXFN.getExtendedProperty("friend"), alicesHomepage);
+ assertContains(baseIRI, vXFN.getExtendedProperty("friend"), alicesHomepage);
assertContains(bob, vXFN.sweetheart, alice);
- assertContains(baseURI, vXFN.getExtendedProperty("sweetheart"), alicesHomepage);
+ assertContains(baseIRI, vXFN.getExtendedProperty("sweetheart"), alicesHomepage);
}
@Test
public void testMultipleFriends() throws RepositoryException {
assertExtract("/microformats/xfn/multiple-friends.html");
- Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseURI);
+ Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseIRI);
Resource alice = findExactlyOneBlankSubject(vXFN.mePage, alicesHomepage);
Resource charlie = findExactlyOneBlankSubject(vXFN.mePage, charliesHomepage);
assertContains(bob, vXFN.friend, alice);
- assertContains(baseURI, vXFN.getExtendedProperty("friend"), alicesHomepage);
+ assertContains(baseIRI, vXFN.getExtendedProperty("friend"), alicesHomepage);
assertContains(bob, vXFN.friend, charlie);
- assertContains(baseURI, vXFN.getExtendedProperty("friend"), charliesHomepage);
+ assertContains(baseIRI, vXFN.getExtendedProperty("friend"), charliesHomepage);
}
@Test
@@ -147,17 +147,17 @@ public class XFNExtractorTest extends AbstractExtractorTestCase {
@Test
public void testIgnoreExtraSpacesInRel() throws RepositoryException {
assertExtract("/microformats/xfn/strip-spaces.html");
- assertContains(null, vXFN.mePage, baseURI);
+ assertContains(null, vXFN.mePage, baseIRI);
}
@Test
public void testMixedCaseATag() throws RepositoryException {
assertExtract("/microformats/xfn/mixed-case.html");
- assertContains(null, vXFN.mePage, baseURI);
+ assertContains(null, vXFN.mePage, baseIRI);
}
@Test
public void testUpcaseHREF() throws RepositoryException {
assertExtract("/microformats/xfn/upcase-href.html");
- assertContains(null, vXFN.mePage, baseURI);
+ assertContains(null, vXFN.mePage, baseIRI);
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HAdrExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HAdrExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HAdrExtractorTest.java
index e857105..afdf065 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HAdrExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HAdrExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HAdrExtractorTest extends AbstractExtractorTestCase {
protected ExtractorFactory<?> getExtractorFactory() {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HCardExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HCardExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HCardExtractorTest.java
index 9c9dc06..0422ffa 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HCardExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HCardExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HCardExtractorTest extends AbstractExtractorTestCase {
protected ExtractorFactory<?> getExtractorFactory() {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEntryExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEntryExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEntryExtractorTest.java
index 96f3a6e..3fa5723 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEntryExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEntryExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HEntryExtractorTest extends AbstractExtractorTestCase {
protected ExtractorFactory<?> getExtractorFactory() {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEventExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEventExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEventExtractorTest.java
index 70b212e..aa81cca 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEventExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HEventExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HEventExtractorTest extends AbstractExtractorTestCase {
protected ExtractorFactory<?> getExtractorFactory() {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HGeoExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HGeoExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HGeoExtractorTest.java
index 0d29fda..a5be13f 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HGeoExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HGeoExtractorTest.java
@@ -20,15 +20,9 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.apache.any23.extractor.html.microformats2.HGeoExtractorFactory;
-import org.apache.any23.vocab.VCard;
-import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.model.Resource;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
-
-import java.util.List;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HGeoExtractorTest extends AbstractExtractorTestCase {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HItemExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HItemExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HItemExtractorTest.java
index 8163890..024e4d3 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HItemExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HItemExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HItemExtractorTest extends AbstractExtractorTestCase {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/test/java/org/apache/any23/extractor/html/microformats2/HProductExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HProductExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HProductExtractorTest.java
index 49c1755..1ba153c 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/microformats2/HProductExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/microformats2/HProductExtractorTest.java
@@ -20,8 +20,8 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.junit.Test;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
public class HProductExtractorTest extends AbstractExtractorTestCase {
protected ExtractorFactory<?> getExtractorFactory() {