You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/03/23 18:16:57 UTC
[1/2] incubator-quarks git commit: skip public server tests if can't
connect
Repository: incubator-quarks
Updated Branches:
refs/heads/master d074ba119 -> 71870ca5b
skip public server tests if can't connect
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/8bb88e77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/8bb88e77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/8bb88e77
Branch: refs/heads/master
Commit: 8bb88e7769daa679df793507beb7d8d68a49988d
Parents: e045317
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Mar 23 11:43:40 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Mar 23 11:43:40 2016 -0400
----------------------------------------------------------------------
.../javax/websocket/WebSocketClientTest.java | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/8bb88e77/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 6da1014..1421094 100644
--- a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -6,7 +6,10 @@ package quarks.tests.connectors.wsclient.javax.websocket;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assume.assumeTrue;
+import java.net.InetSocketAddress;
+import java.net.Socket;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
@@ -678,6 +681,24 @@ public class WebSocketClientTest extends ConnectorTestBase {
completeAndValidate("", t, rcvd, SEC_TMO, new String[0]); //rcv nothing
}
+ private void skipTestIfCantConnect(Properties config) throws Exception {
+ String wsUri = config.getProperty("ws.uri");
+ // Skip tests if the WebSocket server can't be contacted.
+ try {
+ URI uri = new URI(wsUri);
+ int port = uri.getPort();
+ if (port == -1)
+ port = uri.getScheme().equals("ws") ? 80 : 443;
+ Socket s = new Socket();
+ s.connect(new InetSocketAddress(uri.getHost(), port), 5*1000/*cn-timeout-msec*/);
+ s.close();
+ } catch (Exception e) {
+ System.err.println("Unable to connect to WebSocket server "+wsUri+" : "+e.getMessage());
+ e.printStackTrace();
+ assumeTrue(false);
+ }
+ }
+
@Test
public void testPublicServer() throws Exception {
Topology t = newTopology("testPublicServer");
@@ -687,6 +708,7 @@ public class WebSocketClientTest extends ConnectorTestBase {
Properties config = getConfig();
config.setProperty("ws.uri", "ws://echo.websocket.org");
+ skipTestIfCantConnect(config);
// System.setProperty("javax.net.debug", "ssl"); // or "all"; "help" for full list
@@ -718,6 +740,7 @@ public class WebSocketClientTest extends ConnectorTestBase {
Properties config = getConfig();
config.setProperty("ws.uri", "wss://echo.websocket.org");
+ skipTestIfCantConnect(config);
// System.setProperty("javax.net.debug", "ssl"); // or "all"; "help" for full list
@@ -750,6 +773,7 @@ public class WebSocketClientTest extends ConnectorTestBase {
Properties config = getConfig();
config.setProperty("ws.uri", "wss://echo.websocket.org");
+ skipTestIfCantConnect(config);
SslSystemPropMgr sslProps = new SslSystemPropMgr();
try {
[2/2] incubator-quarks git commit: Merge pull request #44
Posted by dl...@apache.org.
Merge pull request #44
This closes #44
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/71870ca5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/71870ca5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/71870ca5
Branch: refs/heads/master
Commit: 71870ca5b27e0f12559b805c21eb2813951f8bda
Parents: d074ba1 8bb88e7
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Mar 23 13:16:41 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Mar 23 13:16:41 2016 -0400
----------------------------------------------------------------------
.../javax/websocket/WebSocketClientTest.java | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/71870ca5/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------