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 2017/11/20 22:51:59 UTC
[1/3] incubator-edgent git commit: [Edgent-438] improve
WebSocketClientTest's skip-if-cant-connect
Repository: incubator-edgent
Updated Branches:
refs/heads/develop f46dd81a5 -> 62384ddce
[Edgent-438] improve WebSocketClientTest's skip-if-cant-connect
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/718ff63b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/718ff63b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/718ff63b
Branch: refs/heads/develop
Commit: 718ff63b5ec1194d138233e7f8481bb205818132
Parents: f46dd81
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 20 17:21:50 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 20 17:21:50 2017 -0500
----------------------------------------------------------------------
.../WebSocketClientConnectTestHelper.java | 46 ++++++++++++++++++++
.../javax/websocket/WebSocketClientTest.java | 26 ++++-------
2 files changed, 55 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/718ff63b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
----------------------------------------------------------------------
diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
new file mode 100644
index 0000000..f6ffc12
--- /dev/null
+++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
@@ -0,0 +1,46 @@
+package org.apache.edgent.test.connectors.wsclient.javax.websocket;
+
+import java.net.URI;
+import java.util.Properties;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.ContainerProvider;
+import javax.websocket.OnError;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+
+import org.eclipse.jetty.util.component.LifeCycle;
+
+@ClientEndpoint
+public class WebSocketClientConnectTestHelper {
+
+ @OnError
+ public void onError(Session client, Throwable t) {
+ System.err.println("Unable to connect to WebSocket server: "+t.getMessage());
+ }
+
+ public static void connectToServer(Properties config) throws Exception {
+ // Verify we can create a real websocket connection to the server.
+ //
+ // We do the following instead of a simple socket connect
+ // because in at least one location, the websocket connect/upgrade
+ // fails with: expecting 101 got 403 (Forbidden).
+ // There's something about that location that's not
+ // allowing a websocket to be created to the (public) server.
+ // Everything works fine from other locations.
+ //
+ String wsUri = config.getProperty("ws.uri");
+ URI uri = new URI(wsUri);
+ WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+ try {
+ Session session = container.connectToServer(WebSocketClientConnectTestHelper.class, uri);
+ session.close();
+ }
+ finally {
+ if (container instanceof LifeCycle) {
+ ((LifeCycle)container).stop();
+ }
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/718ff63b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 4ef65c9..b256bfe 100644
--- a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -23,8 +23,6 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
-import java.net.InetSocketAddress;
-import java.net.Socket;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -772,21 +770,15 @@ public class WebSocketClientTest extends ConnectorTestBase {
}
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);
- }
+ String wsUri = config.getProperty("ws.uri");
+ try {
+ WebSocketClientConnectTestHelper.connectToServer(config);
+ } catch (Exception e) {
+ System.err.println("Unable to connect to WebSocket server "+wsUri+" : "+e.getMessage());
+ e.printStackTrace();
+ System.err.println("skipTestIfCantConnect(): SKIPPING TEST");
+ assumeTrue(false);
+ }
}
@Test
[3/3] incubator-edgent git commit: add nl
Posted by dl...@apache.org.
add nl
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/62384ddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/62384ddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/62384ddc
Branch: refs/heads/develop
Commit: 62384ddcef54391167bd4b853bc0d7ea7e25ace7
Parents: cc1864b
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 20 17:40:02 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 20 17:40:02 2017 -0500
----------------------------------------------------------------------
.../wsclient/javax/websocket/WebSocketClientConnectTestHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/62384ddc/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
----------------------------------------------------------------------
diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
index aaf3b57..41878f7 100644
--- a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
+++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
@@ -61,4 +61,4 @@ public class WebSocketClientConnectTestHelper {
}
}
-}
\ No newline at end of file
+}
[2/3] incubator-edgent git commit: add header to new module,
update RELEASE_NOTES
Posted by dl...@apache.org.
add header to new module, update RELEASE_NOTES
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/cc1864b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/cc1864b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/cc1864b5
Branch: refs/heads/develop
Commit: cc1864b57b54c88a80b1eb2889c7cbbb94f6dd26
Parents: 718ff63
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 20 17:38:19 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 20 17:38:19 2017 -0500
----------------------------------------------------------------------
RELEASE_NOTES | 1 +
.../WebSocketClientConnectTestHelper.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/cc1864b5/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 7da5c39..fc2bbd8 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -71,6 +71,7 @@ EDGENT-423 Range.toStringUnsigned() not supported on Java7/Android
Miscellaneous changes
---------------------
+EDGENT-438 Improve WebSocketClientTest skip-if-cant-connect
EDGENT-436 Change tests that use complete() TMO for successful runs
EDGENT-435 CME in TrackingScheduledExecutor seen with testMultiTopologyPollWithError()
EDGENT-434 Desensitize PlumbingTest.testParallelBalanced
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/cc1864b5/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
----------------------------------------------------------------------
diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
index f6ffc12..aaf3b57 100644
--- a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
+++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
@@ -1,3 +1,21 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
package org.apache.edgent.test.connectors.wsclient.javax.websocket;
import java.net.URI;