Use appropriate schema in any case TooTallNate#1026

add unit test for schema check

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -534,17 +534,14 @@ protected void onSetSSLParameters(SSLParameters sslParameters) {
  */
  private int getPort() {
  int port = uri.getPort();
- if( port == -1 ) {
- String scheme = uri.getScheme();
- if( "wss".equals( scheme ) ) {
- return WebSocketImpl.DEFAULT_WSS_PORT;
- } else if( "ws".equals( scheme ) ) {
- return WebSocketImpl.DEFAULT_PORT;
- } else {
- throw new IllegalArgumentException( "unknown scheme: " + scheme );
- }
+ String scheme = uri.getScheme();
+ if( "wss".equals( scheme ) ) {
+ return port == -1 ? WebSocketImpl.DEFAULT_WSS_PORT : port;
+ } else if( "ws".equals( scheme ) ) {
+ return port == -1 ? WebSocketImpl.DEFAULT_PORT : port;
+ } else {
+ throw new IllegalArgumentException( "unknown scheme: " + scheme );
  }
- return port;
  }
 
  /**

src/test/java/org/java_websocket/client/AllClientTests.java

@@ -31,7 +31,8 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
- org.java_websocket.client.AttachmentTest.class
+ org.java_websocket.client.AttachmentTest.class,
+ org.java_websocket.client.SchemaCheckTest.class
 })
 /**
  * Start all tests for the client

src/test/java/org/java_websocket/client/SchemaCheckTest.java

@@ -0,0 +1,86 @@
+package org.java_websocket.client;
+
+import org.java_websocket.handshake.ServerHandshake;
+import org.junit.Test;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class SchemaCheckTest {
+
+ @Test
+ public void testSchemaCheck() throws URISyntaxException {
+ final String []invalidCase = {
+ "http:https://localhost:80",
+ "http:https://localhost:81",
+ "http:https://localhost",
+ "https://localhost:443",
+ "https://localhost:444",
+ "https://localhost",
+ "any:https://localhost",
+ "any:https://localhost:82",
+ };
+ final Exception[] exs = new Exception[invalidCase.length];
+ for (int i = 0; i < invalidCase.length; i++) {
+ final int finalI = i;
+ new WebSocketClient(new URI(invalidCase[finalI])) {
+ @Override
+ public void onOpen(ServerHandshake handshakedata) {
+
+ }
+
+ @Override
+ public void onMessage(String message) {
+
+ }
+
+ @Override
+ public void onClose(int code, String reason, boolean remote) {
+
+ }
+
+ @Override
+ public void onError(Exception ex) {
+ exs[finalI] = ex;
+ }
+ }.run();
+ }
+ for (Exception exception : exs) {
+ assertTrue(exception instanceof IllegalArgumentException);
+ }
+ final String []validCase = {
+ "ws:https://localhost",
+ "ws:https://localhost:80",
+ "ws:https://localhost:81",
+ "wss:https://localhost",
+ "wss:https://localhost:443",
+ "wss:https://localhost:444"
+ };
+ for (String s : validCase) {
+ new WebSocketClient(new URI(s)) {
+ @Override
+ public void onOpen(ServerHandshake handshakedata) {
+
+ }
+
+ @Override
+ public void onMessage(String message) {
+
+ }
+
+ @Override
+ public void onClose(int code, String reason, boolean remote) {
+
+ }
+
+ @Override
+ public void onError(Exception ex) {
+ assertFalse(ex instanceof IllegalArgumentException);
+ }
+ }.run();
+ }
+ }
+}