abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1372029 [3/17] - in /abdera/java/trunk: ./ parser/src/test/java/org/apache/abdera/test/parser/stax/ parser/src/test/resources/ parser/src/test/resources/feedvalidator.org/ parser/src/test/resources/feedvalidator.org/testcases/ parser/src/t...
Date Sat, 11 Aug 2012 21:15:47 GMT
Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java?rev=1372029&r1=1372028&r2=1372029&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java Sat Aug 11 21:15:23 2012
@@ -59,14 +59,6 @@ public class FeedValidatorTest extends B
 
     private static IRI baseURI = null;
 
-    private static <T extends Element> Document<T> get(IRI uri) {
-        try {
-            return parse(uri);
-        } catch (Exception e) {
-        }
-        return null;
-    }
-
     @BeforeClass
     public static void setUp() throws Exception {
         baseURI = new IRI("http://feedvalidator.org/testcases/atom/");
@@ -77,9 +69,7 @@ public class FeedValidatorTest extends B
 
         // http://feedvalidator.org/testcases/atom/1.1/brief-noerror.xml
         IRI uri = baseURI.resolve("1.1/brief-noerror.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         Text title = feed.getTitleElement();
@@ -162,9 +152,7 @@ public class FeedValidatorTest extends B
 
         // http://feedvalidator.org/testcases/atom/1.1/extensive-noerror.xml
         IRI uri = baseURI.resolve("1.1/extensive-noerror.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         assertNotNull(feed.getTitleElement());
@@ -259,10 +247,7 @@ public class FeedValidatorTest extends B
     public void testSection12MissingNamespace() throws Exception {
         // http://feedvalidator.org/testcases/atom/1.2/missing-namespace.xml
         IRI uri = baseURI.resolve("1.2/missing-namespace.xml");
-        Document<?> doc = null;
-        doc = get(uri);
-        if (doc == null)
-            return;
+        Document<?> doc = parse(uri);
         assertFalse(doc.getRoot() instanceof Feed);
     }
 
@@ -270,9 +255,7 @@ public class FeedValidatorTest extends B
     public void testSection12PrefixedNamespace() throws Exception {
         // http://feedvalidator.org/testcases/atom/1.2/prefixed-namespace.xml
         IRI uri = baseURI.resolve("1.2/prefixed-namespace.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         assert (feed.getQName().getPrefix().equals("atom"));
@@ -282,10 +265,7 @@ public class FeedValidatorTest extends B
     public void testSection12WrongNamespaceCase() throws Exception {
         // http://feedvalidator.org/testcases/atom/1.2/wrong-namespace-case.xml
         IRI uri = baseURI.resolve("1.2/wrong-namespace-case.xml");
-        Document<?> doc = null;
-        doc = get(uri);
-        if (doc == null)
-            return;
+        Document<?> doc = parse(uri);
         assertFalse(doc.getRoot() instanceof Feed);
     }
 
@@ -293,10 +273,7 @@ public class FeedValidatorTest extends B
     public void testSection12WrongNamespace() throws Exception {
         // http://feedvalidator.org/testcases/atom/1.2/wrong-namespace.xml
         IRI uri = baseURI.resolve("1.2/wrong-namespace.xml");
-        Document<?> doc = null;
-        doc = get(uri);
-        if (doc == null)
-            return;
+        Document<?> doc = parse(uri);
         assertFalse(doc.getRoot() instanceof Feed);
     }
 
@@ -304,9 +281,7 @@ public class FeedValidatorTest extends B
     public void testSection2BriefEntry() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/brief-entry-noerror.xml
         IRI uri = baseURI.resolve("2/brief-entry-noerror.xml");
-        Document<Entry> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Entry> doc = parse(uri);
         Entry entry = doc.getRoot();
         assertNotNull(entry);
         assertNotNull(entry.getTitleElement());
@@ -326,9 +301,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetAttrOrder() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-attr-order.xml
         IRI uri = baseURI.resolve("2/infoset-attr-order.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         List<Link> links = feed.getLinks(Link.REL_ALTERNATE);
@@ -343,9 +316,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetCDATA() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-cdata.xml
         IRI uri = baseURI.resolve("2/infoset-cdata.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         List<Entry> entries = feed.getEntries();
         for (Entry entry : entries) {
@@ -362,9 +333,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetCharRef() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-char-ref.xml
         IRI uri = baseURI.resolve("2/infoset-char-ref.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         List<Entry> entries = feed.getEntries();
         for (Entry entry : entries) {
@@ -380,9 +349,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetElementWhitespace() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-element-whitespace.xml
         IRI uri = baseURI.resolve("2/infoset-element-whitespace.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         Link link = feed.getAlternateLink();
@@ -394,9 +361,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetEmpty1() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-empty1.xml
         IRI uri = baseURI.resolve("2/infoset-empty1.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         Entry entry = feed.getEntries().get(0);
@@ -407,9 +372,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetEmpty2() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-empty2.xml
         IRI uri = baseURI.resolve("2/infoset-empty2.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         Entry entry = feed.getEntries().get(0);
@@ -420,9 +383,7 @@ public class FeedValidatorTest extends B
     public void testSection2InfosetSingleQuote() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/infoset-quote-single.xml
         IRI uri = baseURI.resolve("2/infoset-quote-single.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://example.org/"), doc.getRoot().getAlternateLink().getResolvedHref());
     }
 
@@ -430,9 +391,7 @@ public class FeedValidatorTest extends B
     public void testSection2InvalidXmlBase() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/invalid-xml-base.xml
         IRI uri = baseURI.resolve("2/invalid-xml-base.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         try {
             feed.getBaseUri();
@@ -445,9 +404,7 @@ public class FeedValidatorTest extends B
     public void testSection2InvalidXmlLang() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/invalid-xml-lang.xml
         IRI uri = baseURI.resolve("2/invalid-xml-lang.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertFalse(java.util.Locale.US.equals(doc.getRoot().getLocale()));
     }
 
@@ -455,9 +412,7 @@ public class FeedValidatorTest extends B
     public void testSection2Iri() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/iri.xml
         IRI uri = baseURI.resolve("2/iri.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -470,9 +425,7 @@ public class FeedValidatorTest extends B
     public void testSection2XmlBaseAmbiguous() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/xml-base-ambiguous.xml
         IRI uri = baseURI.resolve("2/xml-base-ambiguous.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://example.org/"), doc.getRoot().getAlternateLink().getResolvedHref());
     }
 
@@ -480,9 +433,7 @@ public class FeedValidatorTest extends B
     public void testSection2XmlBaseElemEqDoc() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/xml-base-elem-eq-doc.xml
         IRI uri = baseURI.resolve("2/xml-base-elem-eq-doc.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals(new IRI("http://www.feedvalidator.org/2003/12/13/atom03"), entry.getAlternateLink()
             .getResolvedHref());
@@ -492,9 +443,7 @@ public class FeedValidatorTest extends B
     public void testSection2XmlBaseElemNeDoc() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/xml-base-elem-ne-doc.xml
         IRI uri = baseURI.resolve("2/xml-base-elem-ne-doc.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://www.feedvalidator.org/testcases/atom/2/xml-base-elem-ne-doc.xml"), doc.getRoot()
             .getSelfLink().getResolvedHref());
     }
@@ -503,9 +452,7 @@ public class FeedValidatorTest extends B
     public void xtestSection2XmlBase() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/xml-base.xml
         IRI uri = baseURI.resolve("2/xml-base.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -519,9 +466,7 @@ public class FeedValidatorTest extends B
     public void testSection2XmlLangBlank() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/xml-lang-blank.xml
         IRI uri = baseURI.resolve("2/xml-lang-blank.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getLocale());
     }
 
@@ -529,9 +474,7 @@ public class FeedValidatorTest extends B
     public void testSection2XmlLang() throws Exception {
         // http://feedvalidator.org/testcases/atom/2/xml-lang.xml
         IRI uri = baseURI.resolve("2/xml-lang.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -543,9 +486,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsAuthorUri() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-author-uri.xml
         IRI uri = baseURI.resolve("3/ws-author-uri.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -561,9 +502,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsCategoryScheme() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-category-scheme.xml
         IRI uri = baseURI.resolve("3/ws-category-scheme.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -585,9 +524,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsContentSrc() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-content-src.xml
         IRI uri = baseURI.resolve("3/ws-content-src.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -608,9 +545,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsEntryId() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-entry-id.xml
         IRI uri = baseURI.resolve("3/ws-entry-id.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -631,9 +566,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsEntryPublished() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-entry-published.xml
         IRI uri = baseURI.resolve("3/ws-entry-published.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -652,9 +585,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsEntryUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-entry-updated.xml
         IRI uri = baseURI.resolve("3/ws-entry-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -673,9 +604,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsFeedIcon() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-feed-icon.xml
         IRI uri = baseURI.resolve("3/ws-feed-icon.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -690,9 +619,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsFeedId() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-feed-id.xml
         IRI uri = baseURI.resolve("3/ws-feed-id.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -707,9 +634,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsFeedLogo() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-feed-logo.xml
         IRI uri = baseURI.resolve("3/ws-feed-logo.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -724,9 +649,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsFeedUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-feed-updated.xml
         IRI uri = baseURI.resolve("3/ws-feed-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -741,9 +664,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsGeneratorUri() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-generator-uri.xml
         IRI uri = baseURI.resolve("3/ws-generator-uri.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -760,9 +681,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsLinkHref() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-link-href.xml
         IRI uri = baseURI.resolve("3/ws-link-href.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -780,9 +699,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsLinkRel() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-link-rel.xml
         IRI uri = baseURI.resolve("3/ws-link-rel.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getAlternateLink());
     }
 
@@ -790,9 +707,7 @@ public class FeedValidatorTest extends B
     public void testSection3WsXmlBase() throws Exception {
         // http://feedvalidator.org/testcases/atom/3/ws-xml-base.xml
         IRI uri = baseURI.resolve("3/ws-xml-base.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -810,9 +725,7 @@ public class FeedValidatorTest extends B
     public void testSection311SummaryTypeMime() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1/summary_type_mime.xml
         IRI uri = baseURI.resolve("3.1.1/summary_type_mime.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -827,9 +740,7 @@ public class FeedValidatorTest extends B
     public void testSection3111EscapedText() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.1/escaped_text.xml
         IRI uri = baseURI.resolve("3.1.1.1/escaped_text.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -847,9 +758,7 @@ public class FeedValidatorTest extends B
     public void testSection3111ExampleTextTitle() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.1/example_text_title.xml
         IRI uri = baseURI.resolve("3.1.1.1/example_text_title.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -867,9 +776,7 @@ public class FeedValidatorTest extends B
     public void testSection3111SummaryTypeMime() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.1/summary_type_mime.xml
         IRI uri = baseURI.resolve("3.1.1.1/summary_type_mime.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -884,9 +791,7 @@ public class FeedValidatorTest extends B
     public void testSection3112ExampleHtmlTitle() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.2/example_html_title.xml
         IRI uri = baseURI.resolve("3.1.1.2/example_html_title.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -903,9 +808,7 @@ public class FeedValidatorTest extends B
     public void testSection3112InvalidHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.2/invalid_html.xml
         IRI uri = baseURI.resolve("3.1.1.2/invalid_html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("<a", entry.getSummary().trim());
     }
@@ -914,9 +817,7 @@ public class FeedValidatorTest extends B
     public void testSection3112TextWithEscapedHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.2/text_with_escaped_html.xml
         IRI uri = baseURI.resolve("3.1.1.2/text_with_escaped_html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("So I was reading <a href=\"http://example.com/\">example.com</a> the other day, it's really interesting.",
                      entry.getSummary().trim());
@@ -926,9 +827,7 @@ public class FeedValidatorTest extends B
     public void testSection3112ValidHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.2/valid_html.xml
         IRI uri = baseURI.resolve("3.1.1.2/valid_html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("<h3>Heading</h3>", entry.getSummary().trim());
 
@@ -938,9 +837,7 @@ public class FeedValidatorTest extends B
     public void testSection3113ExampleXhtmlSummary1() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.3/example_xhtml_summary1.xml
         IRI uri = baseURI.resolve("3.1.1.3/example_xhtml_summary1.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -958,9 +855,7 @@ public class FeedValidatorTest extends B
     public void testSection3113ExampleXhtmlSummary2() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.3/example_xhtml_summary2.xml
         IRI uri = baseURI.resolve("3.1.1.3/example_xhtml_summary2.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -978,9 +873,7 @@ public class FeedValidatorTest extends B
     public void testSection3113ExampleXhtmlSummary3() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.3/example_xhtml_summary3.xml
         IRI uri = baseURI.resolve("3.1.1.3/example_xhtml_summary3.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -998,9 +891,7 @@ public class FeedValidatorTest extends B
     public void testSection3113MissingXhtmlDiv() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.3/missing_xhtml_div.xml
         IRI uri = baseURI.resolve("3.1.1.3/missing_xhtml_div.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1018,9 +909,7 @@ public class FeedValidatorTest extends B
     public void testSection3113XhtmlNamedEntity() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.1.1.3/xhtml_named_entity.xml
         IRI uri = baseURI.resolve("3.1.1.3/xhtml_named_entity.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Feed feed = doc.getRoot();
         assertNotNull(feed);
         try {
@@ -1040,9 +929,7 @@ public class FeedValidatorTest extends B
     public void testSection321MultipleNames() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.1/multiple-names.xml
         IRI uri = baseURI.resolve("3.2.1/multiple-names.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("George Washington", doc.getRoot().getContributors().get(0).getName());
     }
 
@@ -1050,9 +937,7 @@ public class FeedValidatorTest extends B
     public void testSection321NoName() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.1/no-name.xml
         IRI uri = baseURI.resolve("3.2.1/no-name.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getContributors().get(0).getName());
     }
 
@@ -1060,9 +945,7 @@ public class FeedValidatorTest extends B
     public void testSection322InvalidUri() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.2/invalid-uri.xml
         IRI uri = baseURI.resolve("3.2.2/invalid-uri.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1080,9 +963,7 @@ public class FeedValidatorTest extends B
     public void testSection322MultipleUris() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.2/multiple-uris.xml
         IRI uri = baseURI.resolve("3.2.2/multiple-uris.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://example.com/~jane/"), doc.getRoot().getContributors().get(0).getUri());
     }
 
@@ -1090,9 +971,7 @@ public class FeedValidatorTest extends B
     public void testSection322RelativeRef() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.2/relative-ref.xml
         IRI uri = baseURI.resolve("3.2.2/relative-ref.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1107,9 +986,7 @@ public class FeedValidatorTest extends B
     public void testSection323EmailRss20Style() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.3/email-rss20-style.xml
         IRI uri = baseURI.resolve("3.2.3/email-rss20-style.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1127,9 +1004,7 @@ public class FeedValidatorTest extends B
     public void testSection323EmailWithName() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.3/email-with-name.xml
         IRI uri = baseURI.resolve("3.2.3/email-with-name.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1147,9 +1022,7 @@ public class FeedValidatorTest extends B
     public void testSection323EmailWithPlus() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.3/email-with-plus.xml
         IRI uri = baseURI.resolve("3.2.3/email-with-plus.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1163,9 +1036,7 @@ public class FeedValidatorTest extends B
     public void testSection323InvalidEmail() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.3/invalid-email.xml
         IRI uri = baseURI.resolve("3.2.3/invalid-email.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1183,9 +1054,7 @@ public class FeedValidatorTest extends B
     public void testSection323MultipleEmails() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.2.3/multiple-emails.xml
         IRI uri = baseURI.resolve("3.2.3/multiple-emails.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("jane@example.com", doc.getRoot().getContributors().get(0).getEmail());
     }
 
@@ -1193,9 +1062,7 @@ public class FeedValidatorTest extends B
     public void testSection33DuplicateUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/duplicate-updated.xml
         IRI uri = baseURI.resolve("3.3/duplicate-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-12-13T18:30:02Z");
         for (Entry entry : doc.getRoot().getEntries()) {
             Date date = entry.getUpdated();
@@ -1207,9 +1074,7 @@ public class FeedValidatorTest extends B
     public void testSection33LowercaseUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/lowercase-updated.xml
         IRI uri = baseURI.resolve("3.3/lowercase-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1224,9 +1089,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedBadDay() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_bad_day.xml
         IRI uri = baseURI.resolve("3.3/published_bad_day.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-07-32T15:51:30-05:00");
         assertEquals(d, doc.getRoot().getEntries().get(0).getPublished());
     }
@@ -1235,9 +1098,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedBadDay2() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_bad_day2.xml
         IRI uri = baseURI.resolve("3.3/published_bad_day2.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         // this is an invalid date, but we don't care because we're not doing
         // validation. Better run those feeds through the feed validator :-)
         Date d = AtomDate.parse("2003-06-31T15:51:30-05:00");
@@ -1248,9 +1109,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedBadHours() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_bad_hours.xml
         IRI uri = baseURI.resolve("3.3/published_bad_hours.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-07-01T25:51:30-05:00");
         assertEquals(d, doc.getRoot().getEntries().get(0).getPublished());
     }
@@ -1259,9 +1118,7 @@ public class FeedValidatorTest extends B
     public void testSecton33PublishedBadMinutes() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_bad_minutes.xml
         IRI uri = baseURI.resolve("3.3/published_bad_minutes.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-07-01T01:61:30-05:00");
         assertEquals(d, doc.getRoot().getEntries().get(0).getPublished());
     }
@@ -1270,9 +1127,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedBadMonth() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_bad_month.xml
         IRI uri = baseURI.resolve("3.3/published_bad_month.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-13-01T15:51:30-05:00");
         assertEquals(d, doc.getRoot().getEntries().get(0).getPublished());
     }
@@ -1281,9 +1136,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedBadSeconds() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_bad_seconds.xml
         IRI uri = baseURI.resolve("3.3/published_bad_seconds.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-07-01T01:55:61-05:00");
         assertEquals(d, doc.getRoot().getEntries().get(0).getPublished());
     }
@@ -1292,9 +1145,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedDateOnly() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_date_only.xml
         IRI uri = baseURI.resolve("3.3/published_date_only.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1312,9 +1163,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedExtraSpaces() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_extra_spaces.xml
         IRI uri = baseURI.resolve("3.3/published_extra_spaces.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1332,9 +1181,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedExtraSpaces2() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_extra_spaces2.xml
         IRI uri = baseURI.resolve("3.3/published_extra_spaces2.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1352,9 +1199,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedExtraSpaces3() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_extra_spaces3.xml
         IRI uri = baseURI.resolve("3.3/published_extra_spaces3.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1372,9 +1217,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedExtraSpaces4() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_extra_spaces4.xml
         IRI uri = baseURI.resolve("3.3/published_extra_spaces4.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1392,9 +1235,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedExtraSpaces5() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_extra_spaces5.xml
         IRI uri = baseURI.resolve("3.3/published_extra_spaces5.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1412,9 +1253,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedFractionalSecond() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_fractional_second.xml
         IRI uri = baseURI.resolve("3.3/published_fractional_second.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1428,9 +1267,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedHoursMinutes() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_hours_minutes.xml
         IRI uri = baseURI.resolve("3.3/published_hours_minutes.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1448,9 +1285,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedNoColons() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_no_colons.xml
         IRI uri = baseURI.resolve("3.3/published_no_colons.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1468,9 +1303,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedNoHyphens() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_no_hyphens.xml
         IRI uri = baseURI.resolve("3.3/published_no_hyphens.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1488,9 +1321,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedNoT() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_no_t.xml
         IRI uri = baseURI.resolve("3.3/published_no_t.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1508,9 +1339,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedNoTimezoneColon() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_no_timezone_colon.xml
         IRI uri = baseURI.resolve("3.3/published_no_timezone_colon.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1528,9 +1357,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedNoYear() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_no_year.xml
         IRI uri = baseURI.resolve("3.3/published_no_year.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1548,9 +1375,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedSeconds() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_seconds.xml
         IRI uri = baseURI.resolve("3.3/published_seconds.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1564,9 +1389,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedUtc() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_utc.xml
         IRI uri = baseURI.resolve("3.3/published_utc.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1580,9 +1403,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedWrongFormat() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_wrong_format.xml
         IRI uri = baseURI.resolve("3.3/published_wrong_format.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1600,9 +1421,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedYearAndMonth() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_year_and_month.xml
         IRI uri = baseURI.resolve("3.3/published_year_and_month.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1620,9 +1439,7 @@ public class FeedValidatorTest extends B
     public void testSection33PublishedYearOnly() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/published_year_only.xml
         IRI uri = baseURI.resolve("3.3/published_year_only.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1640,9 +1457,7 @@ public class FeedValidatorTest extends B
     public void testSection33UpdatedExample2() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/updated-example2.xml
         IRI uri = baseURI.resolve("3.3/updated-example2.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1656,9 +1471,7 @@ public class FeedValidatorTest extends B
     public void testSection33UpdatedExample3() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/updated-example3.xml
         IRI uri = baseURI.resolve("3.3/updated-example3.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1672,9 +1485,7 @@ public class FeedValidatorTest extends B
     public void testSection33UpdatedExample4() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/updated-example4.xml
         IRI uri = baseURI.resolve("3.3/updated-example4.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1688,9 +1499,7 @@ public class FeedValidatorTest extends B
     public void testSection33UpdatedFuture() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/updated-future.xml
         IRI uri = baseURI.resolve("3.3/updated-future.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2103-12-13T18:30:02Z");
         assertEquals(d, doc.getRoot().getEntries().get(0).getUpdated());
     }
@@ -1699,9 +1508,7 @@ public class FeedValidatorTest extends B
     public void testSection33UpdatedPast() throws Exception {
         // http://feedvalidator.org/testcases/atom/3.3/updated-past.xml
         IRI uri = baseURI.resolve("3.3/updated-past.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("0103-12-13T18:30:02Z");
         assertEquals(d, doc.getRoot().getEntries().get(0).getUpdated());
     }
@@ -1710,9 +1517,7 @@ public class FeedValidatorTest extends B
     public void testSection411AuthorAtEntryOnly() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/author-at-entry-only.xml
         IRI uri = baseURI.resolve("4.1.1/author-at-entry-only.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1726,9 +1531,7 @@ public class FeedValidatorTest extends B
     public void testSection411AuthorAtFeedAndEntry() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/author-at-feed-and-entry.xml
         IRI uri = baseURI.resolve("4.1.1/author-at-feed-and-entry.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1743,9 +1546,7 @@ public class FeedValidatorTest extends B
     public void testSection411AuthorAtFeedOnly() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/author-at-feed-only.xml
         IRI uri = baseURI.resolve("4.1.1/author-at-feed-only.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1760,9 +1561,7 @@ public class FeedValidatorTest extends B
     public void testSection411AuthorlessWithNoEntries() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/authorless-with-no-entries.xml
         IRI uri = baseURI.resolve("4.1.1/authorless-with-no-entries.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1773,9 +1572,7 @@ public class FeedValidatorTest extends B
     public void testSection411AuthorlessWithOneEntry() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/authorless-with-one-entry.xml
         IRI uri = baseURI.resolve("4.1.1/authorless-with-one-entry.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1790,9 +1587,7 @@ public class FeedValidatorTest extends B
     public void testSection411DuplicateEntries() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/duplicate-entries.xml
         IRI uri = baseURI.resolve("4.1.1/duplicate-entries.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry e1 = doc.getRoot().getEntries().get(0);
         Entry e2 = doc.getRoot().getEntries().get(1);
         assertEquals(e1.getId(), e2.getId());
@@ -1803,9 +1598,7 @@ public class FeedValidatorTest extends B
     public void testSection411LinkRelFull() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/link-rel-full.xml
         IRI uri = baseURI.resolve("4.1.1/link-rel-full.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Link link = doc.getRoot().getLink("http://xmlns.com/foaf/0.1/");
         assertNotNull(link);
         assertEquals(new IRI("http://example.org/foaf"), link.getResolvedHref());
@@ -1815,9 +1608,7 @@ public class FeedValidatorTest extends B
     public void testSection411MisplacedMetadata() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/misplaced-metadata.xml
         IRI uri = baseURI.resolve("4.1.1/misplaced-metadata.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6"), doc.getRoot().getId());
     }
 
@@ -1825,9 +1616,7 @@ public class FeedValidatorTest extends B
     public void testSection411MissingId() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/missing-id.xml
         IRI uri = baseURI.resolve("4.1.1/missing-id.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getId());
     }
 
@@ -1835,9 +1624,7 @@ public class FeedValidatorTest extends B
     public void testSection411MissingSelf() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/missing-self.xml
         IRI uri = baseURI.resolve("4.1.1/missing-self.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getSelfLink());
     }
 
@@ -1845,9 +1632,7 @@ public class FeedValidatorTest extends B
     public void testSection411MissingTitles() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/missing-titles.xml
         IRI uri = baseURI.resolve("4.1.1/missing-titles.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getTitle());
     }
 
@@ -1855,9 +1640,7 @@ public class FeedValidatorTest extends B
     public void testSection411MissingUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/missing-updated.xml
         IRI uri = baseURI.resolve("4.1.1/missing-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertNull(doc.getRoot().getUpdated());
     }
 
@@ -1865,9 +1648,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleAlternatesDiffering() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-alternates-differing.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-alternates-differing.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1879,9 +1660,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleAlternatesMatching() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-alternates-matching.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-alternates-matching.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://example.org/front-page.html"), doc.getRoot().getAlternateLink().getResolvedHref());
     }
 
@@ -1889,9 +1668,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleAuthors() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-authors.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-authors.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1903,9 +1680,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleCategories() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-categories.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-categories.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1917,9 +1692,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleContributors() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-contributors.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-contributors.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -1931,9 +1704,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleGenerators() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-generators.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-generators.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Generator g = doc.getRoot().getGenerator();
         assertEquals(new IRI("http://www.example.com/"), g.getResolvedUri());
         assertEquals("Example Toolkit", g.getText().trim());
@@ -1943,9 +1714,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleIcons() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-icons.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-icons.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://feedvalidator.org/big.icon"), doc.getRoot().getIcon());
     }
 
@@ -1953,9 +1722,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleIds() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-ids.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-ids.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6"), doc.getRoot().getId());
     }
 
@@ -1963,9 +1730,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleLogos() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-logos.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-logos.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("http://feedvalidator.org/small.jpg"), doc.getRoot().getLogo());
     }
 
@@ -1973,9 +1738,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleRelatedMatching() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-related-matching.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-related-matching.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         List<Link> links = doc.getRoot().getLinks("related");
         assertEquals(2, links.size());
         assertEquals(new IRI("http://example.org/front-page.html"), links.get(0).getResolvedHref());
@@ -1986,9 +1749,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleRights() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-rights.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-rights.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("Public Domain", doc.getRoot().getRights());
     }
 
@@ -1996,9 +1757,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleSubtitles() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-subtitles.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-subtitles.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("A unique feed, just like all the others", doc.getRoot().getSubtitle());
     }
 
@@ -2006,9 +1765,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleTitles() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-titles.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-titles.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("Example Feed", doc.getRoot().getTitle());
     }
 
@@ -2016,9 +1773,7 @@ public class FeedValidatorTest extends B
     public void testSection411MultipleUpdateds() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/multiple-updateds.xml
         IRI uri = baseURI.resolve("4.1.1/multiple-updateds.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-12-13T18:30:02Z");
         assertEquals(d, doc.getRoot().getUpdated());
     }
@@ -2027,9 +1782,7 @@ public class FeedValidatorTest extends B
     public void testSection411ZeroEntries() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1/zero-entries.xml
         IRI uri = baseURI.resolve("4.1.1/zero-entries.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2040,9 +1793,7 @@ public class FeedValidatorTest extends B
     public void testSection4111ContentSrc() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1.1/content-src.xml
         IRI uri = baseURI.resolve("4.1.1.1/content-src.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2057,9 +1808,7 @@ public class FeedValidatorTest extends B
     public void testSection4111EmptyContent() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1.1/empty-content.xml
         IRI uri = baseURI.resolve("4.1.1.1/empty-content.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("", doc.getRoot().getEntries().get(0).getContent());
     }
 
@@ -2067,9 +1816,7 @@ public class FeedValidatorTest extends B
     public void testSection4111EmptyTitle() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1.1/empty-title.xml
         IRI uri = baseURI.resolve("4.1.1.1/empty-title.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals("", doc.getRoot().getEntries().get(0).getTitle());
     }
 
@@ -2077,9 +1824,7 @@ public class FeedValidatorTest extends B
     public void testSection4111NoContentOrSummary() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.1.1/no-content-or-summary.xml
         IRI uri = baseURI.resolve("4.1.1.1/no-content-or-summary.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getContent());
         assertNull(entry.getSummary());
@@ -2089,9 +1834,7 @@ public class FeedValidatorTest extends B
     public void testSection412AlternateNoContent() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/alternate-no-content.xml
         IRI uri = baseURI.resolve("4.1.2/alternate-no-content.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2106,9 +1849,7 @@ public class FeedValidatorTest extends B
     public void testSection412ContentBase64NoSummary() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/content-base64-no-summary.xml
         IRI uri = baseURI.resolve("4.1.2/content-base64-no-summary.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2132,9 +1873,7 @@ public class FeedValidatorTest extends B
     public void testSection412ContentNoAlternate() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/content-no-alternate.xml
         IRI uri = baseURI.resolve("4.1.2/content-no-alternate.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2149,9 +1888,7 @@ public class FeedValidatorTest extends B
     public void testSection412ContentSrcNoSummary() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/content-src-no-summary.xml
         IRI uri = baseURI.resolve("4.1.2/content-src-no-summary.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getSummary());
         assertEquals(new IRI("http://example.org/2003/12/13/atom03"), entry.getContentElement().getResolvedSrc());
@@ -2161,9 +1898,7 @@ public class FeedValidatorTest extends B
     public void testSection412EntrySourceAuthor() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/entry-source-author.xml
         IRI uri = baseURI.resolve("4.1.2/entry-source-author.xml");
-        Document<Entry> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Entry> doc = parse(uri);
         Entry entry = doc.getRoot();
         assertNotNull(entry);
         assertNotNull(entry.getSource());
@@ -2174,9 +1909,7 @@ public class FeedValidatorTest extends B
     public void testSection412LinkFullUri() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/link-full-uri.xml
         IRI uri = baseURI.resolve("4.1.2/link-full-uri.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2191,9 +1924,7 @@ public class FeedValidatorTest extends B
     public void testSection412LinkSameRelDifferentTypes() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/link-same-rel-different-types.xml
         IRI uri = baseURI.resolve("4.1.2/link-same-rel-different-types.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2208,9 +1939,7 @@ public class FeedValidatorTest extends B
     public void testSection412LinkSameRelTypeDifferentHreflang() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/link-same-rel-type-different-hreflang.xml
         IRI uri = baseURI.resolve("4.1.2/link-same-rel-type-different-hreflang.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         List<Link> links = doc.getRoot().getEntries().get(0).getLinks("alternate");
         assertEquals(2, links.size());
         assertEquals("es-es", links.get(0).getHrefLang());
@@ -2221,9 +1950,7 @@ public class FeedValidatorTest extends B
     public void testSection412LinkSameRelTypeHreflang() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/link-same-rel-type-hreflang.xml
         IRI uri = baseURI.resolve("4.1.2/link-same-rel-type-hreflang.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals(new IRI("http://example.org/2003/12/13/atom02"), entry.getAlternateLink().getResolvedHref());
     }
@@ -2232,9 +1959,7 @@ public class FeedValidatorTest extends B
     public void testSection412LinkSameRelTypeNoHreflang() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/link-same-rel-type-no-hreflang.xml
         IRI uri = baseURI.resolve("4.1.2/link-same-rel-type-no-hreflang.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals(new IRI("http://example.org/2003/12/13/atom02"), entry.getAlternateLink().getResolvedHref());
     }
@@ -2243,9 +1968,7 @@ public class FeedValidatorTest extends B
     public void testSection412MissingId() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/missing-id.xml
         IRI uri = baseURI.resolve("4.1.2/missing-id.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getId());
     }
@@ -2254,9 +1977,7 @@ public class FeedValidatorTest extends B
     public void testSection412MissingTitle() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/missing-title.xml
         IRI uri = baseURI.resolve("4.1.2/missing-title.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getTitle());
     }
@@ -2265,9 +1986,7 @@ public class FeedValidatorTest extends B
     public void testSection412MissingUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/missing-updated.xml
         IRI uri = baseURI.resolve("4.1.2/missing-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getUpdated());
     }
@@ -2276,9 +1995,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultiEnclosureTest() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multi-enclosure-test.xml
         IRI uri = baseURI.resolve("4.1.2/multi-enclosure-test.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2293,9 +2010,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleCategories() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-categories.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-categories.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2311,9 +2026,7 @@ public class FeedValidatorTest extends B
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-contents.xml
         // Note: not implemented
         IRI uri = baseURI.resolve("4.1.2/multiple-contents.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("No big deal", entry.getContent());
     }
@@ -2322,9 +2035,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleContributors() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-contributors.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-contributors.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2339,9 +2050,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleIds() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-ids.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-ids.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         assertEquals(new IRI("urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a"), doc.getRoot().getEntries().get(0)
             .getId());
     }
@@ -2350,9 +2059,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultiplePublished() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-published.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-published.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Date d = AtomDate.parse("2003-12-11T11:13:56Z");
         assertEquals(d, doc.getRoot().getEntries().get(0).getPublished());
     }
@@ -2361,9 +2068,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleRights() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-rights.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-rights.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Public Domain", entry.getRights());
     }
@@ -2372,9 +2077,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleSources() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-sources.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-sources.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         Source source = entry.getSource();
         assertEquals(new IRI("urn:uuid:9b056ae0-f778-11d9-8cd6-0800200c9a66"), source.getId());
@@ -2384,9 +2087,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleSummaries() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-summaries.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-summaries.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Some text.", entry.getSummary());
     }
@@ -2395,9 +2096,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleTitles() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-titles.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-titles.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Atom-Powered Robots Run Amok", entry.getTitle());
     }
@@ -2406,9 +2105,7 @@ public class FeedValidatorTest extends B
     public void testSection412MultipleUpdated() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/multiple-updated.xml
         IRI uri = baseURI.resolve("4.1.2/multiple-updated.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         Date d = AtomDate.parse("2003-12-13T18:30:02Z");
         assertEquals(d, entry.getUpdated());
@@ -2418,9 +2115,7 @@ public class FeedValidatorTest extends B
     public void testSection412NoContentOrAlternate() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/no-content-or-alternate.xml
         IRI uri = baseURI.resolve("4.1.2/no-content-or-alternate.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getContent());
         assertNull(entry.getAlternateLink());
@@ -2430,9 +2125,7 @@ public class FeedValidatorTest extends B
     public void testSection412RelatedSameRelTypeHreflang() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/related-same-rel-type-hreflang.xml
         IRI uri = baseURI.resolve("4.1.2/related-same-rel-type-hreflang.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         List<Link> links = entry.getLinks("related");
         assertEquals(2, links.size());
@@ -2444,9 +2137,7 @@ public class FeedValidatorTest extends B
     public void testSection412SummaryContentBase64() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/summary-content-base64.xml
         IRI uri = baseURI.resolve("4.1.2/summary-content-base64.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2463,9 +2154,7 @@ public class FeedValidatorTest extends B
     public void testSection412SummaryContentSrc() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.2/summary-content-src.xml
         IRI uri = baseURI.resolve("4.1.2/summary-content-src.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2485,9 +2174,7 @@ public class FeedValidatorTest extends B
     public void testSection4131TypeHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.1/type-html.xml
         IRI uri = baseURI.resolve("4.1.3.1/type-html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2502,9 +2189,7 @@ public class FeedValidatorTest extends B
     public void testSection413TypeMultipartAlternative() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.1/type-multipart-alternative.xml
         IRI uri = baseURI.resolve("4.1.3.1/type-multipart-alternative.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("multipart/alternative", entry.getContentElement().getMimeType().toString());
     }
@@ -2513,9 +2198,7 @@ public class FeedValidatorTest extends B
     public void testSection4131TypeTextHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.1/type-text-html.xml
         IRI uri = baseURI.resolve("4.1.3.1/type-text-html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2532,9 +2215,7 @@ public class FeedValidatorTest extends B
     public void testSection4131TypeText() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.1/type-text.xml
         IRI uri = baseURI.resolve("4.1.3.1/type-text.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2549,9 +2230,7 @@ public class FeedValidatorTest extends B
     public void testSection4131TypeXhtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.1/type-xhtml.xml
         IRI uri = baseURI.resolve("4.1.3.1/type-xhtml.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2566,9 +2245,7 @@ public class FeedValidatorTest extends B
     public void testSection413TypeXml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.1/type-xhtml.xml
         IRI uri = baseURI.resolve("4.1.3.1/type-xml.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2583,9 +2260,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcExtraChild() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-extra-child.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-extra-child.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         Content content = entry.getContentElement();
         assertEquals(new IRI("http://example.org/2003/12/13/atom03"), content.getResolvedSrc());
@@ -2597,9 +2272,7 @@ public class FeedValidatorTest extends B
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-extra-text.xml
         try {
             IRI uri = baseURI.resolve("4.1.3.2/content-src-extra-text.xml");
-            Document<Feed> doc = get(uri);
-            if (doc == null)
-                return;
+            Document<Feed> doc = parse(uri);
             Entry entry = doc.getRoot().getEntries().get(0);
             Content content = entry.getContentElement();
             assertEquals(new IRI("http://example.org/2003/12/13/atom03"), content.getResolvedSrc());
@@ -2611,9 +2284,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcInvalidIri() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-invalid-iri.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-invalid-iri.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2633,9 +2304,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcNoTypeNoError() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-no-type-no-error.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-no-type-no-error.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         Content content = entry.getContentElement();
         assertEquals(new IRI("http://example.org/2003/12/13/atom03"), content.getResolvedSrc());
@@ -2646,9 +2315,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcNoType() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-no-type.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-no-type.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         Content content = entry.getContentElement();
         assertEquals(new IRI("http://example.org/2003/12/13/atom03"), content.getResolvedSrc());
@@ -2659,9 +2326,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcRelativeRef() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-relative-ref.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-relative-ref.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2678,9 +2343,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcTypeHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-type-html.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-type-html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("", entry.getContent());
         assertEquals(Content.Type.HTML, entry.getContentType());
@@ -2691,9 +2354,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcTypeTextHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-type-text-html.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-type-text-html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("", entry.getContent());
         assertEquals(Content.Type.MEDIA, entry.getContentType());
@@ -2704,9 +2365,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcTypeText() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-type-text.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-type-text.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("", entry.getContent());
         assertEquals(Content.Type.TEXT, entry.getContentType());
@@ -2717,9 +2376,7 @@ public class FeedValidatorTest extends B
     public void testSection4132ContentSrcTypeXhtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.2/content-src-type-xhtml.xml
         IRI uri = baseURI.resolve("4.1.3.2/content-src-type-xhtml.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertNull(entry.getContent());
         assertEquals(Content.Type.XHTML, entry.getContentType());
@@ -2730,9 +2387,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentApplicationXhtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-application-xthml.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-application-xthml.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
 
         Feed feed = doc.getRoot();
         assertNotNull(feed);
@@ -2748,9 +2403,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentHtmlWithChildren() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-html-with-children.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-html-with-children.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Some  text.", entry.getContent());
         assertEquals(Content.Type.HTML, entry.getContentType());
@@ -2760,9 +2413,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentJpegInvalidBase64() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-jpeg-invalid-base64.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-jpeg-invalid-base64.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals(Content.Type.MEDIA, entry.getContentType());
         assertEquals("insert image here", entry.getContent());
@@ -2772,9 +2423,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentJpegValidBase64() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-jpeg-valid-base64.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-jpeg-valid-base64.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals(Content.Type.MEDIA, entry.getContentType());
         DataHandler dh = entry.getContentElement().getDataHandler();
@@ -2793,9 +2442,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentNoTypeEscapedHtml() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-no-type-escaped-html.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-no-type-escaped-html.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Some <b>bold</b> text.", entry.getContent());
         assertEquals(Content.Type.TEXT, entry.getContentType());
@@ -2805,9 +2452,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentNoTypeWithChildren() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-no-type-with-children.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-no-type-with-children.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Some  text", entry.getContent().trim());
         assertEquals(Content.Type.TEXT, entry.getContentType());
@@ -2817,9 +2462,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentPlainWithChildren() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-plain-with-children.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-plain-with-children.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         assertEquals("Some  text.", entry.getContent().trim());
         assertEquals(Content.Type.MEDIA, entry.getContentType());
@@ -2829,9 +2472,7 @@ public class FeedValidatorTest extends B
     public void testSection4133ContentSvgMixed() throws Exception {
         // http://feedvalidator.org/testcases/atom/4.1.3.3/content-svg-mixed.xml
         IRI uri = baseURI.resolve("4.1.3.3/content-svg-mixed.xml");
-        Document<Feed> doc = get(uri);
-        if (doc == null)
-            return;
+        Document<Feed> doc = parse(uri);
         Entry entry = doc.getRoot().getEntries().get(0);
         Content content = entry.getContentElement();
         assertNotNull(content.getValueElement()); // we're pretty forgiving
@@ -2842,9 +2483,7 @@ public class FeedValidatorTest extends B

[... 847 lines stripped ...]


Mime
View raw message