Merge pull request #44 from IBMStreams/develop

joergboe · web-flow · commit ff7dbbbb88f8 · 2019-10-30T10:37:58.000+01:00
Develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,3 +44,7 @@
 ## v4.3.0
 * Enhancement: New parameter 'sslAppConfigName' to get the SSL server key/certificate and the client trust material from Streams application configuration with this name
 
+## v4.3.1
+* Fix: Use relative path in all sample index.html files to be able to be used behind proxy
+* Fix: Correct timing issue in junit tests
+
diff --git a/com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectForm.java b/com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectForm.java
@@ -43,8 +43,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
 		out.println("</head>");
 		out.println("<body>");
 		out.println("<H1>" + port.getName() + "</H1>");
-		String action = request.getRequestURI().replace("form", "inject");
-		out.println("<FORM METHOD=POST ACTION=\"" + action + "\">");
+		out.println("<FORM METHOD=POST ACTION=\"inject\">");
 		for (Attribute attr : port.getStreamSchema()) {
 			out.print(attr.getName());
 			out.println(": <input type=text size=30 value=\"\" name=" + attr.getName() + "><br/>");		
diff --git a/com.ibm.streamsx.inetserver/info.xml b/com.ibm.streamsx.inetserver/info.xml
@@ -14,7 +14,7 @@ This toolkit separates its functionality into a number of namespaces:
 * [namespace:com.ibm.streamsx.inet.wsserver|com.ibm.streamsx.inet.wsserver]: Operators that embed a (jetty) WebSocket server to expose streaming data as WebSocket messages.
 
     </description>
-    <version>4.3.0</version>
+    <version>4.3.1</version>
     <requiredProductVersion>4.0.1.0</requiredProductVersion>
   </identity>
   <dependencies/>
diff --git a/samples/HTTPTupleInjectAndView/opt/html/index.html b/samples/HTTPTupleInjectAndView/opt/html/index.html
@@ -10,11 +10,11 @@ <h2>Information About All Exposed Contexts (JSON)</h2>
 <a href="contexts/info">contexts/info</a>
 <h2>Further static contextes</h2>
 <h3>Static Context from WebContext operator</h3>
-<a href="/wct">/wct</a>
+<a href="wct">wct</a>
 <h3>Static Context HTTPTupleView operator</h3>
-<a href="/state">/state</a>
+<a href="state">state</a>
 <h3>Inet Resources</h3>
-<a href="/streamsx.inet.resources">/streamsx.inet.resources</a>
+<a href="streamsx.inet.resources">streamsx.inet.resources</a>
 <h3>Dojo</h3>
-<a href="/streamsx.inet.dojo">/streamsx.inet.dojo</a>
+<a href="streamsx.inet.dojo">streamsx.inet.dojo</a>
 </body>
diff --git a/samples/RequestProcessTuple/application/DynaTuple.spl b/samples/RequestProcessTuple/application/DynaTuple.spl
@@ -16,7 +16,7 @@ use com.ibm.streamsx.inet.rest::HTTPRequest ;
 *    
 * The goal:
 * * Demonstrate the processing of forms.
-* * Reinterate how important it is NOT to mess with the id. 
+* * Reiterate how important it is NOT to mess with the id. 
 * 
 * Procedure:
 * * build the sample - execute 'make'
diff --git a/samples/RequestProcessTuple/opt/html/index.html b/samples/RequestProcessTuple/opt/html/index.html
@@ -3,7 +3,7 @@
 <meta charset='utf-8'>
 <b3>Input form test for Streams</h3>
 <p>Input a use name and password to be judged by streams.</p>
-<form action="/livepage/HttpTuple/ports/analyze/0/login" method="post" >
+<form action="HttpTuple/ports/analyze/0/login" method="post" >
 User: <input type="text" name="name"><br>
 Profession: <input type="text" name="profession"><br>
 Pass: <input type="text" name="password"><br>
diff --git a/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectBLOBTest.java b/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectBLOBTest.java
@@ -218,7 +218,7 @@ public void _testBigInject(int nk) throws Exception {
 		}
 	}
 
-	private static void postBLOBAndTest(URL postTuple, byte[] data, MostRecent<Tuple> mrt, boolean checkHeaderAttrib) throws IOException {
+	private static void postBLOBAndTest(URL postTuple, byte[] data, MostRecent<Tuple> mrt, boolean checkHeaderAttrib) throws IOException, InterruptedException {
 		System.out.println(postTuple.toString());
 		HttpURLConnection conn = (HttpURLConnection) postTuple.openConnection();
 		conn.setDoOutput(true);
@@ -231,7 +231,7 @@ private static void postBLOBAndTest(URL postTuple, byte[] data, MostRecent<Tuple
 		System.out.println(conn.getResponseMessage());
 		assertEquals(HttpURLConnection.HTTP_NO_CONTENT, conn.getResponseCode());
 		conn.disconnect();
-		
+		Thread.sleep(1000);
 		Blob tuple = mrt.getMostRecentTuple().getBlob(0);
 		System.out.println(tuple.toString());
 		assertTrue(Arrays.equals(data, tuple.getData()));
diff --git a/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectFormTest.java b/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectFormTest.java
@@ -56,6 +56,7 @@ public void testInjectSinglePort() throws Exception {
 		System.out.println(conn.getResponseMessage());
 		assertEquals(HttpURLConnection.HTTP_NO_CONTENT, conn.getResponseCode());
 		conn.disconnect();
+		Thread.sleep(1000);
 		System.out.println(mrt.getMostRecentTuple().toString());
 		assertEquals(0, mrt.getMostRecentTuple().getInt(0));
 		assertEquals("", mrt.getMostRecentTuple().getString(1));
@@ -77,6 +78,7 @@ public void testInjectSinglePort() throws Exception {
 		System.out.println(conn.getResponseMessage());
 		assertEquals(HttpURLConnection.HTTP_NO_CONTENT, conn.getResponseCode());
 		conn.disconnect();
+		Thread.sleep(1000);
 		System.out.println(mrt.getMostRecentTuple().toString());
 		assertEquals(0, mrt.getMostRecentTuple().getInt(0));
 		assertEquals(quote, mrt.getMostRecentTuple().getString(1));
@@ -97,6 +99,7 @@ public void testInjectSinglePort() throws Exception {
 		System.out.println(conn.getResponseMessage());
 		assertEquals(HttpURLConnection.HTTP_NO_CONTENT, conn.getResponseCode());
 		conn.disconnect();
+		Thread.sleep(1000);
 		System.out.println(mrt.getMostRecentTuple().toString());
 		assertEquals(73, mrt.getMostRecentTuple().getInt(0));
 		assertEquals(quote, mrt.getMostRecentTuple().getString(1));
diff --git a/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectJSONTest.java b/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectJSONTest.java
@@ -11,6 +11,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Random;
@@ -187,7 +188,7 @@ public void _testBigInject(int nk) throws Exception {
 		}
 	}
 
-	private static void postJSONAndTest(URL postTuple, JSONObject json, MostRecent<Tuple> mrt) throws IOException {
+	private static void postJSONAndTest(URL postTuple, JSONObject json, MostRecent<Tuple> mrt) throws UnsupportedEncodingException, IOException, InterruptedException  {
 		System.out.println(postTuple.toString());
 		byte[] dataBytes = json.serialize().getBytes("UTF-8");
 		HttpURLConnection conn = (HttpURLConnection) postTuple.openConnection();
@@ -201,7 +202,7 @@ private static void postJSONAndTest(URL postTuple, JSONObject json, MostRecent<T
 		System.out.println(conn.getResponseMessage());
 		assertEquals(HttpURLConnection.HTTP_NO_CONTENT, conn.getResponseCode());
 		conn.disconnect();
-		
+		Thread.sleep(1000);
 		JSONObject tuple = JSONObject.parse(mrt.getMostRecentTuple().getString(0));
 		System.out.println(tuple.toString());
 		assertEquals(json, tuple);
diff --git a/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectXMLTest.java b/tests/junit/src/com/ibm/streamsx/inet/rest/test/InjectXMLTest.java
@@ -186,7 +186,7 @@ public void _testBigInject(int nk) throws Exception {
 		}
 	}
 
-	private static void postXMLAndTest(URL postTuple, String xml, MostRecent<Tuple> mrt) throws IOException {
+	private static void postXMLAndTest(URL postTuple, String xml, MostRecent<Tuple> mrt) throws IOException, InterruptedException {
 		System.out.println(postTuple.toString());
 		byte[] dataBytes = xml.getBytes("UTF-8");
 		HttpURLConnection conn = (HttpURLConnection) postTuple.openConnection();
@@ -200,7 +200,7 @@ private static void postXMLAndTest(URL postTuple, String xml, MostRecent<Tuple>
 		System.out.println(conn.getResponseMessage());
 		assertEquals(HttpURLConnection.HTTP_NO_CONTENT, conn.getResponseCode());
 		conn.disconnect();
-		
+		Thread.sleep(1000);
 		String tuple = mrt.getMostRecentTuple().getString(0);
 		System.out.println(tuple.toString());
 		assertEquals(xml, tuple);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ use com.ibm.streamsx.inet.rest::HTTPRequest ;`
`16`	`16`	`*`
`17`	`17`	`* The goal:`
`18`	`18`	`* * Demonstrate the processing of forms.`
`19`		`-* * Reinterate how important it is NOT to mess with the id.`
	`19`	`+* * Reiterate how important it is NOT to mess with the id.`
`20`	`20`	`*`
`21`	`21`	`* Procedure:`
`22`	`22`	`* * build the sample - execute 'make'`