You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by mo...@apache.org on 2012/02/05 14:09:43 UTC
svn commit: r1240716 - in
/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor: csv/
html/ microdata/ rdfa/
Author: mostarda
Date: Sun Feb 5 13:09:41 2012
New Revision: 1240716
URL: http://svn.apache.org/viewvc?rev=1240716&view=rev
Log:
Renamed assertExtracts to assertExtract. This commit is related to issue #ANY23-45.
Modified:
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/csv/CSVExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/microdata/MicrodataExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ExtractorTest.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFaExtractorTest.java
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/csv/CSVExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/csv/CSVExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/csv/CSVExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/csv/CSVExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -45,7 +45,7 @@ public class CSVExtractorTest extends Ab
@Test
public void testExtractionCommaSeparated() throws RepositoryException {
CSV csv = CSV.getInstance();
- assertExtracts("org/apache/any23/extractor/csv/test-comma.csv");
+ assertExtract("org/apache/any23/extractor/csv/test-comma.csv");
logger.debug(dumpModelToRDFXML());
assertModelNotEmpty();
@@ -58,7 +58,7 @@ public class CSVExtractorTest extends Ab
@Test
public void testExtractionSemicolonSeparated() throws RepositoryException {
CSV csv = CSV.getInstance();
- assertExtracts("org/apache/any23/extractor/csv/test-semicolon.csv");
+ assertExtract("org/apache/any23/extractor/csv/test-semicolon.csv");
logger.debug(dumpModelToRDFXML());
assertModelNotEmpty();
@@ -71,7 +71,7 @@ public class CSVExtractorTest extends Ab
@Test
public void testExtractionTabSeparated() throws RepositoryException {
CSV csv = CSV.getInstance();
- assertExtracts("org/apache/any23/extractor/csv/test-tab.csv");
+ assertExtract("org/apache/any23/extractor/csv/test-tab.csv");
logger.debug(dumpModelToRDFXML());
assertModelNotEmpty();
@@ -84,7 +84,7 @@ public class CSVExtractorTest extends Ab
@Test
public void testTypeManagement() throws RepositoryException {
CSV csv = CSV.getInstance();
- assertExtracts("org/apache/any23/extractor/csv/test-type.csv");
+ assertExtract("org/apache/any23/extractor/csv/test-type.csv");
logger.debug(dumpModelToRDFXML());
assertModelNotEmpty();
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AbstractExtractorTestCase.java Sun Feb 5 13:09:41 2012
@@ -177,7 +177,7 @@ public abstract class AbstractExtractorT
* @param resource resource name.
* @param assertNoIssues if <code>true</code>invokes {@link #assertNoIssues()} after the extraction.
*/
- protected void assertExtracts(String resource, boolean assertNoIssues) {
+ protected void assertExtract(String resource, boolean assertNoIssues) {
try {
extract(resource);
if(assertNoIssues) assertNoIssues();
@@ -194,8 +194,8 @@ public abstract class AbstractExtractorT
*
* @param resource
*/
- protected void assertExtracts(String resource) {
- assertExtracts(resource, true);
+ protected void assertExtract(String resource) {
+ assertExtract(resource, true);
}
/**
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -43,7 +43,7 @@ public class AdrExtractorTest extends Ab
@Test
public void testVCardMultiAddress() throws RepositoryException {
- assertExtracts("microformats/hcard/lastfm-adr-multi-address.html");
+ assertExtract("microformats/hcard/lastfm-adr-multi-address.html");
assertModelNotEmpty();
List<Resource> addresses = findSubjects(RDF.TYPE, vVCARD.Address);
for (Resource address : addresses) {
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -57,7 +57,7 @@ public class HCalendarExtractorTest exte
@Test
public void testOneVEvent() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example1.html");
+ assertExtract("microformats/hcalendar/example1.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
@@ -84,7 +84,7 @@ public class HCalendarExtractorTest exte
@Test
public void testTransparentEvent() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example2.html");
+ assertExtract("microformats/hcalendar/example2.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
@@ -112,7 +112,7 @@ public class HCalendarExtractorTest exte
@Test
public void testRepetitiveEvent() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example3.html");
+ assertExtract("microformats/hcalendar/example3.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
@@ -140,7 +140,7 @@ public class HCalendarExtractorTest exte
@Test
public void testThreeDayEvent() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example5.html");
+ assertExtract("microformats/hcalendar/example5.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
@@ -169,7 +169,7 @@ public class HCalendarExtractorTest exte
@Test
public void testHCalendarWithBudyInfo() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example5.5.html");
+ assertExtract("microformats/hcalendar/example5.5.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vjournal);
@@ -349,7 +349,7 @@ public class HCalendarExtractorTest exte
@Test
public void testFullHCalendarClass() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example5.3.html");
+ assertExtract("microformats/hcalendar/example5.3.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vevent);
@@ -357,7 +357,7 @@ public class HCalendarExtractorTest exte
@Test
public void testHCalendarClassWithTodo() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example5.4.html");
+ assertExtract("microformats/hcalendar/example5.4.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vtodo);
@@ -365,7 +365,7 @@ public class HCalendarExtractorTest exte
@Test
public void testHCalendarClassWithJournal() throws RepositoryException {
- assertExtracts("microformats/hcalendar/example5.5.html");
+ assertExtract("microformats/hcalendar/example5.5.html");
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertContains(null, RDF.TYPE, vjournal);
@@ -384,7 +384,7 @@ public class HCalendarExtractorTest exte
}
private void assertDefault(String name) throws RepositoryException {
- assertExtracts(name);
+ assertExtract(name);
assertModelNotEmpty();
assertContains(baseURI, RDF.TYPE, vcal);
assertStatementsSize(RDF.TYPE, vcal, 1);
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -49,7 +49,7 @@ public class HCardExtractorTest extends
@Test
public void testEMailNotUriReal() throws RepositoryException {
- assertExtracts("microformats/hcard/17-email-not-uri.html");
+ assertExtract("microformats/hcard/17-email-not-uri.html");
assertDefaultVCard();
assertJohn();
assertContains(vVCARD.email, RDFUtils.uri("mailto:john@example.com"));
@@ -57,7 +57,7 @@ public class HCardExtractorTest extends
@Test
public void testTel() throws RepositoryException {
- assertExtracts("microformats/hcard/21-tel.html");
+ assertExtract("microformats/hcard/21-tel.html");
assertDefaultVCard();
String[] tels = {
"+1.415.555.1231", "+1.415.555.1235",
@@ -77,7 +77,7 @@ public class HCardExtractorTest extends
@Test
public void testAbbrTitleEverything() throws RepositoryException {
- assertExtracts("microformats/hcard/23-abbr-title-everything.html");
+ assertExtract("microformats/hcard/23-abbr-title-everything.html");
assertDefaultVCard();
assertContains(vVCARD.fn, "John Doe");
@@ -122,7 +122,7 @@ public class HCardExtractorTest extends
@Test
public void testGeoAbbr() throws RepositoryException {
- assertExtracts("microformats/hcard/25-geo-abbr.html");
+ assertExtract("microformats/hcard/25-geo-abbr.html");
assertModelNotEmpty();
assertContains(vVCARD.fn, "Paradise");
assertContains(RDF.TYPE, vVCARD.Organization);
@@ -136,7 +136,7 @@ public class HCardExtractorTest extends
@Test
public void testAncestors() throws RepositoryException {
- assertExtracts("microformats/hcard/26-ancestors.html");
+ assertExtract("microformats/hcard/26-ancestors.html");
assertModelNotEmpty();
assertContains(vVCARD.fn, "John Doe");
@@ -183,7 +183,7 @@ public class HCardExtractorTest extends
@Test
public void testfnOrg() throws RepositoryException {
- assertExtracts("microformats/hcard/30-fn-org.html");
+ assertExtract("microformats/hcard/30-fn-org.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 4);
RepositoryResult<Statement> repositoryResult = getStatements(null, RDF.TYPE, vVCARD.VCard);
@@ -209,7 +209,7 @@ public class HCardExtractorTest extends
@Test
public void testInclude() throws RepositoryException {
- assertExtracts("microformats/hcard/31-include.html");
+ assertExtract("microformats/hcard/31-include.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 3);
assertStatementsSize(vVCARD.email, (Value) null, 3);
@@ -248,7 +248,7 @@ public class HCardExtractorTest extends
@Test
public void testHeader() throws RepositoryException {
- assertExtracts("microformats/hcard/32-header.html");
+ assertExtract("microformats/hcard/32-header.html");
assertModelNotEmpty();
// check fn, name, family, nick.
assertJohn();
@@ -291,7 +291,7 @@ public class HCardExtractorTest extends
@Test
public void testAreaFull() throws RepositoryException {
- assertExtracts("microformats/hcard/33-area.html");
+ assertExtract("microformats/hcard/33-area.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 5);
@@ -315,7 +315,7 @@ public class HCardExtractorTest extends
@Test
public void testCategories() throws RepositoryException {
- assertExtracts("microformats/hcard/36-categories.html");
+ assertExtract("microformats/hcard/36-categories.html");
assertModelNotEmpty();
assertContains(vVCARD.given_name, "Joe");
assertContains(vVCARD.given_name, "john");
@@ -340,7 +340,7 @@ public class HCardExtractorTest extends
@Test
public void testSingleton() throws RepositoryException {
// this tests probably tests that e just get the first fn and so on
- assertExtracts("microformats/hcard/37-singleton.html");
+ assertExtract("microformats/hcard/37-singleton.html");
assertModelNotEmpty();
assertStatementsSize(vVCARD.fn, (Value) null, 1);
assertContains(vVCARD.fn, "john doe 1");
@@ -375,7 +375,7 @@ public class HCardExtractorTest extends
@Test
public void testUidFull() throws RepositoryException {
- assertExtracts("microformats/hcard/38-uid.html");
+ assertExtract("microformats/hcard/38-uid.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 4);
RepositoryResult<Statement> statements = getStatements(null, RDF.TYPE, vVCARD.VCard);
@@ -411,7 +411,7 @@ public class HCardExtractorTest extends
@Test
public void testRomanianWikipedia() throws RepositoryException {
- assertExtracts("microformats/hcard/40-fn-inside-adr.html");
+ assertExtract("microformats/hcard/40-fn-inside-adr.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 1);
RepositoryResult<Statement> statements = getStatements(null, RDF.TYPE, vVCARD.VCard);
@@ -445,7 +445,7 @@ public class HCardExtractorTest extends
@Test
public void testBasic() throws RepositoryException {
- assertExtracts("microformats/hcard/01-tantek-basic.html");
+ assertExtract("microformats/hcard/01-tantek-basic.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vVCARD.VCard);
// assertContains(RDF.TYPE, vVCARD.Organization);
@@ -472,7 +472,7 @@ public class HCardExtractorTest extends
@Test
public void testMultipleclassNamesOnVCard() throws RepositoryException {
- assertExtracts("microformats/hcard/02-multiple-class-names-on-vcard.html");
+ assertExtract("microformats/hcard/02-multiple-class-names-on-vcard.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 4);
Resource name;
@@ -531,7 +531,7 @@ public class HCardExtractorTest extends
"Thomas"
};
List<String> NAMES = Arrays.asList(ns);
- assertExtracts("microformats/hcard/03-implied-n.html");
+ assertExtract("microformats/hcard/03-implied-n.html");
assertModelNotEmpty();
RepositoryResult<Statement> statements = getStatements(null, vVCARD.fn, null);
@@ -564,7 +564,7 @@ public class HCardExtractorTest extends
@Test
public void testIgnoreUnknowns() throws RepositoryException {
- assertExtracts("microformats/hcard/04-ignore-unknowns.html");
+ assertExtract("microformats/hcard/04-ignore-unknowns.html");
assertDefaultVCard();
assertContains(vVCARD.fn, "Ryan King");
assertContains(vVCARD.n, (Resource) null);
@@ -575,7 +575,7 @@ public class HCardExtractorTest extends
@Test
public void testMailto1() throws RepositoryException {
- assertExtracts("microformats/hcard/05-mailto-1.html");
+ assertExtract("microformats/hcard/05-mailto-1.html");
assertDefaultVCard();
assertContains(vVCARD.fn, "Ryan King");
assertContains(RDF.TYPE, vVCARD.Name);
@@ -591,7 +591,7 @@ public class HCardExtractorTest extends
@Test
public void testMailto2() throws RepositoryException {
- assertExtracts("microformats/hcard/06-mailto-2.html");
+ assertExtract("microformats/hcard/06-mailto-2.html");
assertDefaultVCard();
assertContains(vVCARD.fn, "Brian Suda");
@@ -605,7 +605,7 @@ public class HCardExtractorTest extends
@Test
public void testRelativeUrl() throws RepositoryException {
- assertExtracts("microformats/hcard/07-relative-url.html");
+ assertExtract("microformats/hcard/07-relative-url.html");
assertDefaultVCard();
assertJohn();
assertContains( vVCARD.url, RDFUtils.uri(baseURI + "home/blah") );
@@ -613,7 +613,7 @@ public class HCardExtractorTest extends
@Test
public void testRelativeUrlBase() throws RepositoryException {
- assertExtracts("microformats/hcard/08-relative-url-base.html");
+ assertExtract("microformats/hcard/08-relative-url-base.html");
assertDefaultVCard();
assertContains(vVCARD.url, RDFUtils.uri(baseURI + "home/blah"));
assertJohn();
@@ -621,7 +621,7 @@ public class HCardExtractorTest extends
@Test
public void testRelativeUrlXmlBase1() throws RepositoryException {
- assertExtracts("microformats/hcard/09-relative-url-xmlbase-1.html");
+ assertExtract("microformats/hcard/09-relative-url-xmlbase-1.html");
assertDefaultVCard();
assertContains(vVCARD.url, RDFUtils.uri((baseURI + "home/blah")));
assertJohn();
@@ -629,7 +629,7 @@ public class HCardExtractorTest extends
@Test
public void testRelativeUrlXmlBase2() throws RepositoryException {
- assertExtracts("microformats/hcard/10-relative-url-xmlbase-2.html");
+ assertExtract("microformats/hcard/10-relative-url-xmlbase-2.html");
assertDefaultVCard();
assertContains(vVCARD.url, RDFUtils.uri((baseURI + "home/blah")));
assertJohn();
@@ -637,7 +637,7 @@ public class HCardExtractorTest extends
@Test
public void testMultipleUrls() throws RepositoryException {
- assertExtracts("microformats/hcard/11-multiple-urls.html");
+ 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")));
@@ -647,14 +647,14 @@ public class HCardExtractorTest extends
@Test
public void testImageSrc() throws RepositoryException {
- assertExtracts("microformats/hcard/12-img-src-url.html");
+ assertExtract("microformats/hcard/12-img-src-url.html");
assertDefaultVCard();
assertJohn();
}
@Test
public void testPhotoLogo() throws RepositoryException {
- assertExtracts("microformats/hcard/13-photo-logo.html");
+ assertExtract("microformats/hcard/13-photo-logo.html");
assertDefaultVCard();
assertContains(vVCARD.photo, RDFUtils.uri(("http://example.org/picture1.png")));
assertContains(vVCARD.photo, RDFUtils.uri(("http://example.org/picture2.png")));
@@ -665,7 +665,7 @@ public class HCardExtractorTest extends
@Test
public void testImgSrcDataUrl() throws RepositoryException {
- assertExtracts("microformats/hcard/14-img-src-data-url.html");
+ assertExtract("microformats/hcard/14-img-src-data-url.html");
assertDefaultVCard();
Resource data = RDFUtils.uri(
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAABGdBTUEAAK/"
@@ -693,7 +693,7 @@ public class HCardExtractorTest extends
@Test
public void testHonorificAdditionalSingle() throws RepositoryException {
- assertExtracts("microformats/hcard/15-honorific-additional-single.html");
+ assertExtract("microformats/hcard/15-honorific-additional-single.html");
assertDefaultVCard();
assertContains(vVCARD.fn, "Mr. John Maurice Doe, Ph.D.");
@@ -707,7 +707,7 @@ public class HCardExtractorTest extends
@Test
public void testHonorificAdditionalMultiple() throws RepositoryException {
- assertExtracts("microformats/hcard/16-honorific-additional-multiple.html");
+ assertExtract("microformats/hcard/16-honorific-additional-multiple.html");
assertDefaultVCard();
assertContains(vVCARD.honorific_prefix, "Mr.");
assertContains(vVCARD.honorific_prefix, "Dr.");
@@ -728,7 +728,7 @@ public class HCardExtractorTest extends
@Test
public void testEMailNotUri() throws RepositoryException {
- assertExtracts("microformats/hcard/17-email-not-uri.html");
+ assertExtract("microformats/hcard/17-email-not-uri.html");
assertDefaultVCard();
assertJohn();
assertContains( vVCARD.email, RDFUtils.uri("mailto:john@example.com") );
@@ -736,14 +736,14 @@ public class HCardExtractorTest extends
@Test
public void testObjectDataHttpUri() throws RepositoryException {
- assertExtracts("microformats/hcard/18-object-data-http-uri.html");
+ assertExtract("microformats/hcard/18-object-data-http-uri.html");
assertDefaultVCard();
assertJohn();
}
@Test
public void testObjectDataDataUri() throws RepositoryException {
- assertExtracts("microformats/hcard/19-object-data-data-uri.html");
+ assertExtract("microformats/hcard/19-object-data-data-uri.html");
assertDefaultVCard();
assertJohn();
@@ -753,7 +753,7 @@ public class HCardExtractorTest extends
@Test
public void testImgAlt() throws RepositoryException {
- assertExtracts("microformats/hcard/20-image-alt.html");
+ assertExtract("microformats/hcard/20-image-alt.html");
assertDefaultVCard();
Resource uri = RDFUtils.uri("http://example.com/foo.png");
assertContains(vVCARD.photo, uri);
@@ -763,7 +763,7 @@ public class HCardExtractorTest extends
@Test
public void testAdr() throws RepositoryException {
- assertExtracts("microformats/hcard/22-adr.html");
+ assertExtract("microformats/hcard/22-adr.html");
assertDefaultVCard();
assertJohn();
assertStatementsSize(RDF.TYPE, vVCARD.Address, 0);
@@ -771,7 +771,7 @@ public class HCardExtractorTest extends
@Test
public void testBirthDayDate() throws RepositoryException {
- assertExtracts("microformats/hcard/27-bday-date.html");
+ assertExtract("microformats/hcard/27-bday-date.html");
assertModelNotEmpty();
assertContains(vVCARD.fn , "john doe");
assertContains(vVCARD.given_name , "john");
@@ -781,7 +781,7 @@ public class HCardExtractorTest extends
@Test
public void testBirthDayDateTime() throws RepositoryException {
- assertExtracts("microformats/hcard/28-bday-datetime.html");
+ assertExtract("microformats/hcard/28-bday-datetime.html");
assertModelNotEmpty();
assertContains(vVCARD.fn , "john doe");
assertContains(vVCARD.given_name , "john");
@@ -791,7 +791,7 @@ public class HCardExtractorTest extends
@Test
public void testBirthDayDateTimeTimeZone() throws RepositoryException {
- assertExtracts("microformats/hcard/29-bday-datetime-timezone.html");
+ assertExtract("microformats/hcard/29-bday-datetime-timezone.html");
assertModelNotEmpty();
assertContains(vVCARD.fn, "john doe");
assertContains(vVCARD.given_name, "john");
@@ -801,7 +801,7 @@ public class HCardExtractorTest extends
@Test
public void testArea() throws RepositoryException {
- assertExtracts("microformats/hcard/33-area.html");
+ assertExtract("microformats/hcard/33-area.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 5);
RepositoryResult<Statement> statements = getStatements(null, RDF.TYPE, vVCARD.VCard);
@@ -841,7 +841,7 @@ public class HCardExtractorTest extends
public void testNotes() throws RepositoryException {
final String[] NOTES = {"Note 1", "Note 3", "Note 4 with a ; and a , to be escaped"};
- assertExtracts("microformats/hcard/34-notes.html");
+ assertExtract("microformats/hcard/34-notes.html");
assertModelNotEmpty();
RepositoryResult<Statement> statements = getStatements(null, RDF.TYPE, vVCARD.VCard);
try {
@@ -862,7 +862,7 @@ public class HCardExtractorTest extends
@Test
public void testIncludePattern() throws RepositoryException {
- assertExtracts("microformats/hcard/35-include-pattern.html");
+ assertExtract("microformats/hcard/35-include-pattern.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 3);
@@ -907,7 +907,7 @@ public class HCardExtractorTest extends
@Test
public void testUid() throws RepositoryException {
- assertExtracts("microformats/hcard/38-uid.html");
+ assertExtract("microformats/hcard/38-uid.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 4);
RepositoryResult<Statement> iter = getStatements(null, RDF.TYPE, vVCARD.VCard);
@@ -928,7 +928,7 @@ public class HCardExtractorTest extends
@Test
public void testIgnoreChildren() throws RepositoryException {
- assertExtracts("microformats/hcard/41-ignore-children.html");
+ assertExtract("microformats/hcard/41-ignore-children.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 1);
assertContains(vVCARD.fn, "Melanie Kl\u00f6\u00df");
@@ -948,7 +948,7 @@ public class HCardExtractorTest extends
*/
@Test
public void testCumulativeHNames() throws RepositoryException {
- assertExtracts("microformats/hcard/linkedin-michelemostarda.html");
+ assertExtract("microformats/hcard/linkedin-michelemostarda.html");
assertModelNotEmpty();
assertStatementsSize(vVCARD.given_name, "Michele" , 7);
assertStatementsSize(vVCARD.family_name, "Mostarda", 7);
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -51,13 +51,13 @@ public class HListingExtractorTest exten
@Test
public void testNoMicroformats() throws RepositoryException {
- assertExtracts("html/html-without-uf.html");
+ assertExtract("html/html-without-uf.html");
assertModelEmpty();
}
@Test
public void testListingWithouthContent() throws RepositoryException {
- assertExtracts("microformats/hlisting/empty.html");
+ assertExtract("microformats/hlisting/empty.html");
assertModelNotEmpty();
logger.debug(dumpModelToRDFXML());
assertStatementsSize(null, null, null, 4);
@@ -65,14 +65,14 @@ public class HListingExtractorTest exten
@Test
public void testSingleAction() throws RepositoryException {
- assertExtracts("microformats/hlisting/single-action.html");
+ assertExtract("microformats/hlisting/single-action.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
}
@Test
public void testMultipleActions() throws RepositoryException {
- assertExtracts("microformats/hlisting/multiple-actions.html");
+ assertExtract("microformats/hlisting/multiple-actions.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.action, vHLISTING.sell);
@@ -80,7 +80,7 @@ public class HListingExtractorTest exten
@Test
public void testMultipleActionsNested() throws RepositoryException {
- assertExtracts("microformats/hlisting/multiple-actions-nested.html");
+ assertExtract("microformats/hlisting/multiple-actions-nested.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.action, vHLISTING.sell);
@@ -89,14 +89,14 @@ public class HListingExtractorTest exten
@Test
public void testActionsOutside() throws RepositoryException {
- assertExtracts("microformats/hlisting/single-action-outside.html");
+ assertExtract("microformats/hlisting/single-action-outside.html");
assertModelNotEmpty();
assertNotContains(vHLISTING.action, vHLISTING.offer);
}
@Test
public void testListerFn() throws RepositoryException {
- assertExtracts("microformats/hlisting/actions-lister-fn.html");
+ assertExtract("microformats/hlisting/actions-lister-fn.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(RDF.TYPE, vHLISTING.Lister);
@@ -105,7 +105,7 @@ public class HListingExtractorTest exten
@Test
public void testListerFnTel() throws RepositoryException {
- assertExtracts("microformats/hlisting/actions-lister-fn-tel.html");
+ assertExtract("microformats/hlisting/actions-lister-fn-tel.html");
assertModelNotEmpty();
assertContains(vHLISTING.action , vHLISTING.offer);
@@ -116,7 +116,7 @@ public class HListingExtractorTest exten
@Test
public void testItemFn() throws RepositoryException {
- assertExtracts("microformats/hlisting/item-fn.html");
+ assertExtract("microformats/hlisting/item-fn.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Item);
assertContains(vHLISTING.itemName, "Parking space");
@@ -124,7 +124,7 @@ public class HListingExtractorTest exten
@Test
public void testItemFnUrl() throws RepositoryException {
- assertExtracts("microformats/hlisting/item-fn-url.html");
+ assertExtract("microformats/hlisting/item-fn-url.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Item);
assertContains(vHLISTING.itemUrl, RDFUtils.uri("http://item.com/"));
@@ -133,7 +133,7 @@ public class HListingExtractorTest exten
@Test
public void testItemPhotoImg() throws RepositoryException {
- assertExtracts("microformats/hlisting/item-fn-url-photo-img.html");
+ assertExtract("microformats/hlisting/item-fn-url-photo-img.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Item);
assertContains(vHLISTING.itemUrl, RDFUtils.uri("http://item.com/"));
@@ -143,7 +143,7 @@ public class HListingExtractorTest exten
@Test
public void testItemPhotoHref() throws RepositoryException {
- assertExtracts("microformats/hlisting/item-fn-photo-href.html");
+ assertExtract("microformats/hlisting/item-fn-photo-href.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Item);
assertContains(vHLISTING.itemName, "Parking space");
@@ -152,7 +152,7 @@ public class HListingExtractorTest exten
@Test
public void testKelkoo() throws RepositoryException {
- assertExtracts("microformats/hlisting/kelkoo.html");
+ assertExtract("microformats/hlisting/kelkoo.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Listing);
@@ -181,7 +181,7 @@ public class HListingExtractorTest exten
@Test
public void testKelkooFull() throws RepositoryException {
- assertExtracts("microformats/hlisting/kelkoo-full.html");
+ assertExtract("microformats/hlisting/kelkoo-full.html");
assertModelNotEmpty();
assertContains(RDF.TYPE, vHLISTING.Listing);
assertContains(RDF.TYPE, vHLISTING.Item);
@@ -229,7 +229,7 @@ public class HListingExtractorTest exten
@Test
public void testListerURL() throws RepositoryException {
- assertExtracts("microformats/hlisting/actions-lister-url.html");
+ assertExtract("microformats/hlisting/actions-lister-url.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.listerName, "John Broker");
@@ -239,7 +239,7 @@ public class HListingExtractorTest exten
@Test
public void testListerEmail() throws RepositoryException {
- assertExtracts("microformats/hlisting/actions-lister-email.html");
+ assertExtract("microformats/hlisting/actions-lister-email.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.listerName, "John Broker");
@@ -249,7 +249,7 @@ public class HListingExtractorTest exten
@Test
public void testListerEmailHref() throws RepositoryException {
- assertExtracts("microformats/hlisting/actions-lister-email-href.html");
+ assertExtract("microformats/hlisting/actions-lister-email-href.html");
assertModelNotEmpty();
assertContains(vHLISTING.action, vHLISTING.offer);
assertContains(RDF.TYPE, vHLISTING.Lister);
@@ -259,7 +259,7 @@ public class HListingExtractorTest exten
@Test
public void testDtListed() throws RepositoryException {
- assertExtracts("microformats/hlisting/dtlisted-dtexpired.html");
+ assertExtract("microformats/hlisting/dtlisted-dtexpired.html");
assertModelNotEmpty();
assertNotContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.dtlisted, "2006-02-02");
@@ -267,7 +267,7 @@ public class HListingExtractorTest exten
@Test
public void testDtExpired() throws RepositoryException {
- assertExtracts("microformats/hlisting/dtlisted-dtexpired.html");
+ assertExtract("microformats/hlisting/dtlisted-dtexpired.html");
assertModelNotEmpty();
assertNotContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.dtexpired, "2006-04-01");
@@ -275,14 +275,14 @@ public class HListingExtractorTest exten
@Test
public void testSummary() throws RepositoryException {
- assertExtracts("microformats/hlisting/summary.html");
+ assertExtract("microformats/hlisting/summary.html");
assertModelNotEmpty();
assertContains(vHLISTING.summary, "summary stuff");
}
@Test
public void testDtListedAndExpired() throws RepositoryException {
- assertExtracts("microformats/hlisting/dtlisted-dtexpired.html");
+ assertExtract("microformats/hlisting/dtlisted-dtexpired.html");
assertModelNotEmpty();
assertNotContains(vHLISTING.action, vHLISTING.offer);
assertContains(vHLISTING.dtlisted, "2006-02-02");
@@ -291,14 +291,14 @@ public class HListingExtractorTest exten
@Test
public void testPrice() throws RepositoryException {
- assertExtracts("microformats/hlisting/price.html");
+ assertExtract("microformats/hlisting/price.html");
assertModelNotEmpty();
assertContains(vHLISTING.price, "$215/qtr");
}
@Test
public void testPriceAndDt() throws RepositoryException {
- assertExtracts("microformats/hlisting/dtlisted-dtexpired.html");
+ assertExtract("microformats/hlisting/dtlisted-dtexpired.html");
assertModelNotEmpty();
assertContains(vHLISTING.price, "$215/qtr");
assertContains(vHLISTING.dtlisted, "2006-02-02");
@@ -307,7 +307,7 @@ public class HListingExtractorTest exten
@Test
public void testPermalink() throws RepositoryException {
- assertExtracts("microformats/hlisting/summary-bookmark.html");
+ assertExtract("microformats/hlisting/summary-bookmark.html");
assertModelNotEmpty();
assertContains(vHLISTING.permalink, "http://livre.com/book");
assertContains(vHLISTING.listerUrl, RDFUtils.uri("http://livre.com/author"));
@@ -315,7 +315,7 @@ public class HListingExtractorTest exten
@Test
public void testComplexDescription() throws RepositoryException {
- assertExtracts("microformats/hlisting/description-complex.html");
+ assertExtract("microformats/hlisting/description-complex.html");
assertModelNotEmpty();
assertContains(vHLISTING.description,
"BenQ today introduced two new additions to its renowned bus... + Show details");
@@ -323,7 +323,7 @@ public class HListingExtractorTest exten
@Test
public void testDescription() throws RepositoryException {
- assertExtracts("microformats/hlisting/description.html");
+ assertExtract("microformats/hlisting/description.html");
assertModelNotEmpty();
assertContains(vHLISTING.description, "bla bla bla");
}
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -41,13 +41,13 @@ public class HRecipeExtractorTest extend
@Test
public void testNoMicroformats() throws RepositoryException {
- assertExtracts("html/html-without-uf.html");
+ assertExtract("html/html-without-uf.html");
assertModelEmpty();
}
@Test
public void testExtraction() throws RepositoryException {
- assertExtracts("microformats/hrecipe/01-spec.html");
+ assertExtract("microformats/hrecipe/01-spec.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vHRECIPE.Recipe , 1);
assertStatementsSize(RDF.TYPE, vHRECIPE.Ingredient, 3);
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -56,13 +56,13 @@ public class HResumeExtractorTest extend
@Test
public void testNoMicroformats() throws RepositoryException {
- assertExtracts("html/html-without-uf.html");
+ assertExtract("html/html-without-uf.html");
assertModelEmpty();
}
@Test
public void testLinkedIn() throws RepositoryException {
- assertExtracts("microformats/hresume/steveganz.html");
+ assertExtract("microformats/hresume/steveganz.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vFOAF.Person, 1);
@@ -92,7 +92,7 @@ public class HResumeExtractorTest extend
@Test
public void testLinkedInComplete() throws RepositoryException {
- assertExtracts("microformats/hresume/steveganz.html");
+ assertExtract("microformats/hresume/steveganz.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vFOAF.Person, 1);
@@ -139,7 +139,7 @@ public class HResumeExtractorTest extend
@Test
public void testAnt() throws RepositoryException {
- assertExtracts("microformats/hresume/ant.html");
+ assertExtract("microformats/hresume/ant.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vFOAF.Person, 1);
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -53,13 +53,13 @@ public class HReviewExtractorTest extend
@Test
public void testNoMicroformats() throws RepositoryException {
- assertExtracts("html/html-without-uf.html");
+ assertExtract("html/html-without-uf.html");
assertModelEmpty();
}
@Test
public void test01Basic() throws RepositoryException {
- assertExtracts("microformats/hreview/01-spec.html");
+ assertExtract("microformats/hreview/01-spec.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vREVIEW.Review, 1);
@@ -110,7 +110,7 @@ public class HReviewExtractorTest extend
@Test
public void test02RatedTags() throws RepositoryException {
- assertExtracts("microformats/hreview/02-spec-2.html");
+ assertExtract("microformats/hreview/02-spec-2.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vREVIEW.Review, 1);
@@ -166,7 +166,7 @@ public class HReviewExtractorTest extend
@Test
public void test03NoHcardForItem() throws RepositoryException {
- assertExtracts("microformats/hreview/03-spec-3.html");
+ assertExtract("microformats/hreview/03-spec-3.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vREVIEW.Review, 1);
@@ -219,7 +219,7 @@ public class HReviewExtractorTest extend
@Test
public void test04NoHcardForItem() throws RepositoryException {
- assertExtracts("microformats/hreview/04-spec-4.html");
+ assertExtract("microformats/hreview/04-spec-4.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vREVIEW.Review, 1);
@@ -278,7 +278,7 @@ public class HReviewExtractorTest extend
*/
@Test
public void testCaseSensitiveness() throws RepositoryException {
- assertExtracts("microformats/hreview/05-spec.html");
+ assertExtract("microformats/hreview/05-spec.html");
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vREVIEW.Review, 1);
// reviewer, no item
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HTMLMetaExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -38,7 +38,7 @@ public class HTMLMetaExtractorTest exten
@Test
public void testExtractPageMeta() throws RepositoryException {
- assertExtracts("html/html-head-meta-extractor.html");
+ assertExtract("html/html-head-meta-extractor.html");
assertModelNotEmpty();
assertStatementsSize(null, null, null, 7);
assertContains(
@@ -87,7 +87,7 @@ public class HTMLMetaExtractorTest exten
@Test
public void testNoMeta() throws RepositoryException {
- assertExtracts("html/html-head-link-extractor.html");
+ assertExtract("html/html-head-link-extractor.html");
assertModelEmpty();
}
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HeadLinkExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -38,7 +38,7 @@ public class HeadLinkExtractorTest exten
@Test
public void testLinkExtraction() throws RepositoryException {
- assertExtracts("html/html-head-link-extractor.html");
+ 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");
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/LicenseExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -49,28 +49,28 @@ public class LicenseExtractorTest extend
@Test
public void testOnlyCc() throws RepositoryException {
- assertExtracts("microformats/license/ccBy.html");
+ assertExtract("microformats/license/ccBy.html");
assertContains(baseURI, vXHTML.license, ccBy);
assertNotContains(baseURI, vXHTML.license, apache);
}
@Test
public void testOnlyApache() throws RepositoryException {
- assertExtracts("microformats/license/apache.html");
+ assertExtract("microformats/license/apache.html");
assertNotContains(baseURI, vXHTML.license, ccBy);
assertContains(baseURI, vXHTML.license, apache);
}
@Test
public void testMultipleLicenses() throws RepositoryException {
- assertExtracts("microformats/license/multiple.html");
+ assertExtract("microformats/license/multiple.html");
assertContains(baseURI, vXHTML.license, ccBy);
assertContains(baseURI, vXHTML.license, apache);
}
@Test
public void testMultipleEmptyHref() throws RepositoryException {
- assertExtracts("microformats/license/multiple-empty-href.html", false);
+ assertExtract("microformats/license/multiple-empty-href.html", false);
assertNotContains(baseURI, vXHTML.license, "");
assertContains(baseURI, vXHTML.license, apache);
@@ -83,13 +83,13 @@ public class LicenseExtractorTest extend
@Test
public void testEmpty() throws RepositoryException {
- assertExtracts("microformats/license/empty.html");
+ assertExtract("microformats/license/empty.html");
assertModelEmpty();
}
@Test
public void testMixedCaseTitleTag() throws RepositoryException {
- assertExtracts("microformats/license/multiple-mixed-case.html");
+ assertExtract("microformats/license/multiple-mixed-case.html");
assertContains(baseURI, vXHTML.license, ccBy);
assertContains(baseURI, vXHTML.license, apache);
}
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java Sun Feb 5 13:09:41 2012
@@ -74,7 +74,7 @@ public class RDFMergerTest extends Abstr
@Test
public void test01XFNFoaf() throws RepositoryException {
- assertExtracts("mixed/01-xfn-foaf.html", false);
+ assertExtract("mixed/01-xfn-foaf.html", false);
assertModelNotEmpty();
assertStatementsSize(RDF.TYPE, vVCARD.VCard, 1);
Resource vcard = findExactlyOneBlankSubject(RDF.TYPE, vVCARD.VCard);
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/SpeciesExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -47,7 +47,7 @@ public class SpeciesExtractorTest extend
*/
@Test
public void testSpeciesMicroformatExtractOverTaxoBox() throws RepositoryException {
- assertExtracts("microformats/species/species-example-2.html");
+ assertExtract("microformats/species/species-example-2.html");
assertModelNotEmpty();
logger.debug(dumpModelToRDFXML());
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -42,25 +42,25 @@ public class TitleExtractorTest extends
@Test
public void testExtractPageTitle() throws RepositoryException {
- assertExtracts("microformats/xfn/simple-me.html");
+ assertExtract("microformats/xfn/simple-me.html");
assertContains(baseURI, vDCTERMS.title, helloLiteral);
}
@Test
public void testStripSpacesFromTitle() throws RepositoryException {
- assertExtracts("microformats/xfn/strip-spaces.html");
+ assertExtract("microformats/xfn/strip-spaces.html");
assertContains(baseURI, vDCTERMS.title, helloLiteral);
}
@Test
public void testNoPageTitle() throws RepositoryException {
- assertExtracts("microformats/xfn/tagsoup.html");
+ assertExtract("microformats/xfn/tagsoup.html");
assertModelEmpty();
}
@Test
public void testMixedCaseTitleTag() throws RepositoryException {
- assertExtracts("microformats/xfn/mixed-case.html");
+ assertExtract("microformats/xfn/mixed-case.html");
assertContains(baseURI, vDCTERMS.title, helloLiteral);
}
@@ -71,7 +71,7 @@ public class TitleExtractorTest extends
*/
@Test
public void testTitleWithDefaultLanguage() throws RepositoryException {
- assertExtracts("html/default-language.html");
+ 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));
}
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TurtleHTMLExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -50,7 +50,7 @@ public class TurtleHTMLExtractorTest ext
*/
@Test
public void testExtraction() throws IOException, ExtractionException, RepositoryException {
- assertExtracts("html/html-turtle.html");
+ assertExtract("html/html-turtle.html");
logger.debug( dumpModelToRDFXML() );
assertStatementsSize( null, (Value) null, 10);
}
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/XFNExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -52,30 +52,30 @@ public class XFNExtractorTest extends Ab
@Test
public void testNoMicroformats() throws RepositoryException {
- assertExtracts("html/html-without-uf.html");
+ assertExtract("html/html-without-uf.html");
assertModelEmpty();
}
@Test
public void testLinkWithoutRel() throws RepositoryException {
- assertExtracts("microformats/xfn/no-rel.html");
+ assertExtract("microformats/xfn/no-rel.html");
assertModelEmpty();
}
@Test
public void testNoXFNRel() throws RepositoryException {
- assertExtracts("microformats/xfn/no-valid-rel.html");
+ assertExtract("microformats/xfn/no-valid-rel.html");
assertModelEmpty();
}
@Test
public void testDetectPresenceOfXFN() throws RepositoryException {
- assertExtracts("microformats/xfn/simple-me.html");
+ assertExtract("microformats/xfn/simple-me.html");
}
@Test
public void testSimpleMeLink() throws RepositoryException {
- assertExtracts("microformats/xfn/simple-me.html");
+ assertExtract("microformats/xfn/simple-me.html");
Resource person = findExactlyOneBlankSubject(RDF.TYPE, vFOAF.Person);
assertContains(person, vXFN.mePage, baseURI);
assertContains(person, vXFN.mePage, bobsHomepage);
@@ -83,20 +83,20 @@ public class XFNExtractorTest extends Ab
@Test
public void testRelativeURIisResolvedAgainstBase() throws RepositoryException {
- assertExtracts("microformats/xfn/with-relative-uri.html");
+ assertExtract("microformats/xfn/with-relative-uri.html");
assertContains(null, vXFN.mePage, RDFUtils.uri("http://bob.example.com/foo"));
}
@Test
public void testParseTagSoup() throws RepositoryException {
- assertExtracts("microformats/xfn/tagsoup.html");
+ assertExtract("microformats/xfn/tagsoup.html");
Resource person = findExactlyOneBlankSubject(RDF.TYPE, vFOAF.Person);
assertContains(person, vXFN.mePage, baseURI);
}
@Test
public void testSimpleFriend() throws RepositoryException {
- assertExtracts("microformats/xfn/simple-friend.html");
+ assertExtract("microformats/xfn/simple-friend.html");
Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseURI);
Resource alice = findExactlyOneBlankSubject(vXFN.mePage, alicesHomepage);
assertContains(bob, RDF.TYPE, vFOAF.Person);
@@ -108,7 +108,7 @@ public class XFNExtractorTest extends Ab
@Test
public void testFriendAndSweetheart() throws RepositoryException {
- assertExtracts("microformats/xfn/multiple-rel.html");
+ assertExtract("microformats/xfn/multiple-rel.html");
Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseURI);
Resource alice = findExactlyOneBlankSubject(vXFN.mePage, alicesHomepage);
assertContains(bob, vXFN.friend, alice);
@@ -120,7 +120,7 @@ public class XFNExtractorTest extends Ab
@Test
public void testMultipleFriends() throws RepositoryException {
- assertExtracts("microformats/xfn/multiple-friends.html");
+ assertExtract("microformats/xfn/multiple-friends.html");
Resource bob = findExactlyOneBlankSubject(vXFN.mePage, baseURI);
Resource alice = findExactlyOneBlankSubject(vXFN.mePage, alicesHomepage);
Resource charlie = findExactlyOneBlankSubject(vXFN.mePage, charliesHomepage);
@@ -133,31 +133,31 @@ public class XFNExtractorTest extends Ab
@Test
public void testSomeLinksWithoutRel() throws RepositoryException {
- assertExtracts("microformats/xfn/some-links-without-rel.html");
+ assertExtract("microformats/xfn/some-links-without-rel.html");
assertNotContains(null, null, alicesHomepage);
assertContains (null, null, charliesHomepage);
}
@Test
public void testForSomeReasonICantBeMyOwnSweetheart() throws RepositoryException {
- assertExtracts("microformats/xfn/me-and-sweetheart.html");
+ assertExtract("microformats/xfn/me-and-sweetheart.html");
assertModelEmpty();
}
@Test
public void testIgnoreExtraSpacesInRel() throws RepositoryException {
- assertExtracts("microformats/xfn/strip-spaces.html");
+ assertExtract("microformats/xfn/strip-spaces.html");
assertContains(null, vXFN.mePage, baseURI);
}
@Test
public void testMixedCaseATag() throws RepositoryException {
- assertExtracts("microformats/xfn/mixed-case.html");
+ assertExtract("microformats/xfn/mixed-case.html");
assertContains(null, vXFN.mePage, baseURI);
}
@Test
public void testUpcaseHREF() throws RepositoryException {
- assertExtracts("microformats/xfn/upcase-href.html");
+ assertExtract("microformats/xfn/upcase-href.html");
assertContains(null, vXFN.mePage, baseURI);
}
}
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/microdata/MicrodataExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/microdata/MicrodataExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/microdata/MicrodataExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/microdata/MicrodataExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -162,7 +162,7 @@ public class MicrodataExtractorTest exte
private void extractAndVerifyAgainstNQuads(String actual, String expected)
throws RepositoryException, RDFHandlerException, IOException, RDFParseException {
- assertExtracts("microdata/" + actual);
+ assertExtract("microdata/" + actual);
assertModelNotEmpty();
logger.debug( dumpModelToNQuads() );
List<Statement> expectedStatements = loadResultStatement("microdata/" + expected);
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java Sun Feb 5 13:09:41 2012
@@ -45,7 +45,7 @@ public abstract class AbstractRDFaExtrac
*/
@Test
public void testBasic() throws RepositoryException {
- assertExtracts("html/rdfa/basic.html");
+ assertExtract("html/rdfa/basic.html");
System.out.println( dumpModelToNQuads() );
assertContains(null, vDCTERMS.creator, RDFUtils.literal("Alice", "en") );
assertContains(null, vDCTERMS.title , RDFUtils.literal("The trouble with Bob", "en") );
@@ -62,7 +62,7 @@ public abstract class AbstractRDFaExtrac
*/
@Test
public void testRDFa11CURIEs() throws RepositoryException {
- assertExtracts("html/rdfa/rdfa-11-curies.html");
+ assertExtract("html/rdfa/rdfa-11-curies.html");
assertModelNotEmpty();
assertContains(
RDFUtils.uri("http://dbpedia.org/resource/Albert_Einstein"),
@@ -109,7 +109,7 @@ public abstract class AbstractRDFaExtrac
*/
@Test
public void testEmptyDatatypeDeclarationWithInnerXMLTags() throws RepositoryException {
- assertExtracts("html/rdfa/null-datatype-test.html");
+ assertExtract("html/rdfa/null-datatype-test.html");
logger.debug(dumpModelToRDFXML());
assertContains(
@@ -129,7 +129,7 @@ public abstract class AbstractRDFaExtrac
*/
@Test
public void testDrupalTestPage() throws RepositoryException {
- assertExtracts("html/rdfa/drupal-test-frontpage.html");
+ assertExtract("html/rdfa/drupal-test-frontpage.html");
logger.debug(dumpModelToTurtle());
assertContains(
RDFUtils.uri("http://bob.example.com/node/3"),
@@ -145,7 +145,7 @@ public abstract class AbstractRDFaExtrac
*/
@Test
public void testIncompleteTripleManagement() throws RepositoryException {
- assertExtracts("html/rdfa/incomplete-triples.html");
+ assertExtract("html/rdfa/incomplete-triples.html");
logger.debug(dumpModelToTurtle());
assertContains(
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -48,7 +48,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testObjectResourceConversion() throws RepositoryException {
- assertExtracts("html/rdfa/object-resource-test.html");
+ assertExtract("html/rdfa/object-resource-test.html");
logger.debug(dumpModelToTurtle());
assertContains(
null,
@@ -67,7 +67,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testExplicitDatatypeDeclaration() throws RepositoryException {
- assertExtracts("html/rdfa/xmlliteral-datatype-test.html");
+ assertExtract("html/rdfa/xmlliteral-datatype-test.html");
logger.debug(dumpModelToTurtle());
Literal literal = RDFUtils.literal(
@@ -88,7 +88,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testRelWithHref() throws RepositoryException {
- assertExtracts("html/rdfa/rel-href.html");
+ assertExtract("html/rdfa/rel-href.html");
logger.debug(dumpModelToTurtle());
assertContains(
@@ -110,7 +110,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testRelRevSupport() throws RepositoryException {
- assertExtracts("html/rdfa/rel-rev.html");
+ assertExtract("html/rdfa/rel-rev.html");
logger.debug(dumpModelToTurtle());
assertContains(
@@ -132,7 +132,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testVocabSupport() throws RepositoryException {
- assertExtracts("html/rdfa/vocab.html");
+ assertExtract("html/rdfa/vocab.html");
logger.debug(dumpModelToTurtle());
assertContains(
@@ -152,7 +152,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testTolerantParsing() {
- assertExtracts("html/rdfa/oreilly-invalid-datatype.html", false);
+ assertExtract("html/rdfa/oreilly-invalid-datatype.html", false);
assertError(ErrorReporter.ErrorLevel.WARN, ".*Cannot map prefix \'mailto\'.*");
}
@@ -170,7 +170,7 @@ public class RDFa11ExtractorTest extends
throws RepositoryException, RDFHandlerException, IOException, RDFParseException {
final int EXPECTED_STATEMENTS = 33;
- assertExtracts("html/rdfa/goodrelations-rdfa10.html");
+ assertExtract("html/rdfa/goodrelations-rdfa10.html");
logger.debug(dumpModelToNQuads());
Assert.assertEquals(EXPECTED_STATEMENTS, dumpAsListOfStatements().size());
@@ -191,7 +191,7 @@ public class RDFa11ExtractorTest extends
throws RepositoryException, RDFHandlerException, IOException, RDFParseException {
final int EXPECTED_STATEMENTS = 33;
- assertExtracts("html/rdfa/goodrelations-rdfa11.html");
+ assertExtract("html/rdfa/goodrelations-rdfa11.html");
logger.debug(dumpHumanReadableTriples());
Assert.assertEquals(EXPECTED_STATEMENTS, dumpAsListOfStatements().size());
@@ -208,7 +208,7 @@ public class RDFa11ExtractorTest extends
*/
@Test
public void testOpenGraphStructuredProperties() throws IOException, ExtractionException, RepositoryException {
- assertExtracts("html/rdfa/opengraph-structured-properties.html");
+ assertExtract("html/rdfa/opengraph-structured-properties.html");
logger.info( dumpHumanReadableTriples() );
Assert.assertEquals(8, getStatementsSize(null, null, null) );
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFaExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFaExtractorTest.java?rev=1240716&r1=1240715&r2=1240716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFaExtractorTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/RDFaExtractorTest.java Sun Feb 5 13:09:41 2012
@@ -48,14 +48,14 @@ public class RDFaExtractorTest extends A
throws RepositoryException, RDFHandlerException, IOException, RDFParseException {
final int EXPECTED_STATEMENTS = 31;
- assertExtracts("html/rdfa/goodrelations-rdfa10.html");
+ assertExtract("html/rdfa/goodrelations-rdfa10.html");
logger.debug("Model 1 " + dumpHumanReadableTriples());
Assert.assertEquals(EXPECTED_STATEMENTS, dumpAsListOfStatements().size());
List<Statement> rdfa10Stmts = dumpAsListOfStatements();
//assertContainsModel("/html/rdfa/goodrelations-rdfa10-expected.nq");
- assertExtracts("html/rdfa/goodrelations-rdfa11.html");
+ assertExtract("html/rdfa/goodrelations-rdfa11.html");
logger.debug("Model 2 " + dumpHumanReadableTriples());
Assert.assertTrue(dumpAsListOfStatements().size() >= EXPECTED_STATEMENTS);
@@ -69,7 +69,7 @@ public class RDFaExtractorTest extends A
*/
@Test
public void testTolerantParsing() {
- assertExtracts("html/rdfa/oreilly-invalid-datatype.html");
+ assertExtract("html/rdfa/oreilly-invalid-datatype.html");
}
@Override