You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/06/02 13:50:14 UTC
[2/3] nifi git commit: NIFI-1265 Fixing InvokeHttp tests.
NIFI-1265 Fixing InvokeHttp tests.
Signed-off-by: Matt Gilman <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4f101294
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4f101294
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4f101294
Branch: refs/heads/master
Commit: 4f101294ebb7fc3b10fd2ec53a7ce86487835005
Parents: e587c99
Author: jpercivall <jo...@yahoo.com>
Authored: Fri May 27 14:39:43 2016 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jun 2 09:49:57 2016 -0400
----------------------------------------------------------------------
.../processors/standard/TestInvokeHTTP.java | 4 +-
.../standard/util/TestInvokeHttpCommon.java | 43 +++++++++++---------
2 files changed, 26 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4f101294/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
index e116f8c..b99f4b8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
@@ -124,7 +124,7 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
// Currently InvokeHttp does not support Proxy via Https
@@ -171,7 +171,7 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
public static class MyProxyHandler extends AbstractHandler {
http://git-wip-us.apache.org/repos/asf/nifi/blob/4f101294/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
index d0f29b9..6e8468e 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
@@ -132,7 +132,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
final List<ProvenanceEventRecord> provEvents = runner.getProvenanceEvents();
assertEquals(2, provEvents.size());
@@ -185,7 +185,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "404");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "Not Found");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -225,7 +225,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "404");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "Not Found");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -266,8 +266,8 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
- bundle1.assertAttributeEquals("mime.type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
+ bundle1.assertAttributeEquals("mime.type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -311,7 +311,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "404");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "Not Found");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@@ -349,7 +349,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
bundle1.assertAttributeEquals("double", "1, 2");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -378,7 +378,7 @@ public abstract class TestInvokeHttpCommon {
bundle.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle.assertAttributeEquals("Foo", "Bar");
bundle.assertAttributeEquals("double", "1, 2");
- bundle.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
// expected in response
// status code, status message, all headers from server response --> ff attributes
@@ -389,7 +389,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
bundle1.assertAttributeEquals("double", "1, 2");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -445,7 +445,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertContentEquals("/status/200".getBytes("UTF-8"));
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -547,7 +547,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
final List<ProvenanceEventRecord> provEvents = runner.getProvenanceEvents();
assertEquals(2, provEvents.size());
@@ -641,7 +641,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -683,7 +683,7 @@ public abstract class TestInvokeHttpCommon {
"<h2>HTTP ERROR: 401</h2>\n" +
"<p>Problem accessing /status/200. Reason:\n" +
"<pre> Unauthorized</pre></p>\n" +
- "<hr /><i><small>Powered by Jetty://</small></i>\n" +
+ "<hr /><a href=\"http://eclipse.org/jetty\">Powered by Jetty:// 9.3.9.v20160517</a><hr/>\n" +
"</body>\n" +
"</html>\n", response);
}
@@ -752,6 +752,7 @@ public abstract class TestInvokeHttpCommon {
createFlowFiles(runner);
+ //assertTrue(server.jetty.isRunning());
runner.run();
runner.assertTransferCount(InvokeHTTP.REL_SUCCESS_REQ, 0);
runner.assertTransferCount(InvokeHTTP.REL_RESPONSE, 0);
@@ -885,7 +886,6 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain");
final String actual1 = new String(bundle1.toByteArray(), StandardCharsets.UTF_8);
final String expected1 = "";
Assert.assertEquals(expected1, actual1);
@@ -1164,7 +1164,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("dynamicHeader","yes!");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
}
@Test
@@ -1279,7 +1279,7 @@ public abstract class TestInvokeHttpCommon {
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain;charset=iso-8859-1");
final String actual1 = new String(bundle1.toByteArray(), StandardCharsets.UTF_8);
final String expected1 = "/status/200";
Assert.assertEquals(expected1, actual1);
@@ -1408,10 +1408,15 @@ public abstract class TestInvokeHttpCommon {
final int status = Integer.valueOf(target.substring("/status".length() + 1));
response.setStatus(status);
- response.setContentType("text/plain");
- response.setContentLength(target.length());
-
if ("GET".equalsIgnoreCase(request.getMethod())) {
+ if (status == 304){
+ // Status code 304 ("Not Modified") must not contain a message body
+ return;
+ }
+
+ response.setContentType("text/plain");
+ response.setContentLength(target.length());
+
try (PrintWriter writer = response.getWriter()) {
writer.print(target);
writer.flush();