You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/04/11 19:21:08 UTC

nifi git commit: NIFI-1749 Adjusting tests that fail without a connection to the Internet and removing attributable elements from test resources.

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-0.6.x ee0025a4f -> abbd21531


NIFI-1749 Adjusting tests that fail without a connection to the Internet and removing attributable elements from test resources.

Signed-off-by: joewitt <jo...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/abbd2153
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/abbd2153
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/abbd2153

Branch: refs/heads/support/nifi-0.6.x
Commit: abbd21531b7d133e86726790eb7a4557356ae8f1
Parents: ee0025a
Author: Aldrin Piri <al...@apache.org>
Authored: Sun Apr 10 15:59:51 2016 -0400
Committer: joewitt <jo...@apache.org>
Committed: Mon Apr 11 12:23:35 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/nifi/AbstractHTMLTest.java  |  2 +-
 .../org/apache/nifi/TestGetHTMLElement.java     | 21 ++++++++------------
 .../src/test/resources/Weather.html             |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/abbd2153/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/AbstractHTMLTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/AbstractHTMLTest.java b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/AbstractHTMLTest.java
index 10bc33e..53ce645 100644
--- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/AbstractHTMLTest.java
+++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/AbstractHTMLTest.java
@@ -22,7 +22,7 @@ public abstract class AbstractHTMLTest {
     protected final String GDR_WEATHER_TEXT = "<i>Grand Rapids Weather</i>";
     protected final String ATL_WEATHER_LINK = "http://w1.weather.gov/obhistory/KPDK.html";
     protected final String GR_WEATHER_LINK = "http://w1.weather.gov/obhistory/KGRR.html";
-    protected final String AUTHOR_NAME = "Jeremy Dyer";
+    protected final String AUTHOR_NAME = "Apache NiFi Community";
     protected final String ATL_ID = "ATL";
     protected final String GDR_ID = "GDR";
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/abbd2153/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestGetHTMLElement.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestGetHTMLElement.java b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestGetHTMLElement.java
index 4839fce..4b215fd 100644
--- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestGetHTMLElement.java
+++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestGetHTMLElement.java
@@ -16,6 +16,11 @@
  */
 package org.apache.nifi;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 import org.apache.nifi.util.MockFlowFile;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
@@ -25,12 +30,6 @@ import org.jsoup.select.Selector;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.Exception;
-import java.net.URL;
-import java.util.List;
-
 public class TestGetHTMLElement extends AbstractHTMLTest {
 
     private TestRunner testRunner;
@@ -44,14 +43,10 @@ public class TestGetHTMLElement extends AbstractHTMLTest {
         testRunner.setProperty(GetHTMLElement.HTML_CHARSET, "UTF-8");
     }
 
-    @Test
+    @Test(expected = Selector.SelectorParseException.class)
     public void testCSSSelectorSyntaxValidator() throws IOException {
-        Document doc = Jsoup.parse(new URL("http://www.google.com"), 5000);
-        try {
-            doc.select("---jeremy");
-        } catch (Selector.SelectorParseException ex) {
-            ex.printStackTrace();
-        }
+        Document doc = Jsoup.parse(new File("src/test/resources/Weather.html"), StandardCharsets.UTF_8.name());
+        doc.select("---invalidCssSelector");
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/nifi/blob/abbd2153/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/resources/Weather.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/resources/Weather.html b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/resources/Weather.html
index 673f7cb..a715a1d 100644
--- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/resources/Weather.html
+++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/resources/Weather.html
@@ -4,7 +4,7 @@
         <title>NiFi HTML Parsing Demo</title>
         <meta charset="utf-8">
         <meta name="description" content="NiFi HTML Parsing Demo">
-        <meta name="author" content="Jeremy Dyer">
+        <meta name="author" content="Apache NiFi Community">
         <link rel="stylesheet" href="css/styles.css?v=1.0">
 
         <!--[if lt IE 9]>