forked from TooTallNate/Java-WebSocket
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use socket isConnected() method rather than isBound() before connect …
…to server. Fixes TooTallNate#962
- Loading branch information
1 parent
f427b64
commit 39ff448
Showing
3 changed files
with
134 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
src/test/java/org/java_websocket/issues/Issue962Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
/* | ||
* To change this license header, choose License Headers in Project Properties. | ||
* To change this template file, choose Tools | Templates | ||
* and open the template in the editor. | ||
*/ | ||
package org.java_websocket.issues; | ||
|
||
import java.io.IOException; | ||
import java.net.InetAddress; | ||
import java.net.InetSocketAddress; | ||
import java.net.Socket; | ||
import java.net.URI; | ||
import java.net.URISyntaxException; | ||
import java.net.UnknownHostException; | ||
import java.util.concurrent.locks.Condition; | ||
import java.util.concurrent.locks.Lock; | ||
import java.util.concurrent.locks.ReentrantLock; | ||
import javax.net.SocketFactory; | ||
import org.java_websocket.WebSocket; | ||
import org.java_websocket.client.WebSocketClient; | ||
import org.java_websocket.handshake.ClientHandshake; | ||
import org.java_websocket.handshake.ServerHandshake; | ||
import org.java_websocket.server.WebSocketServer; | ||
import org.java_websocket.util.SocketUtil; | ||
import org.junit.Assert; | ||
import org.junit.Test; | ||
|
||
/** | ||
* | ||
* @author Ayache | ||
*/ | ||
public class Issue962Test { | ||
|
||
private static class TestSocketFactory extends SocketFactory { | ||
|
||
private final SocketFactory socketFactory = SocketFactory.getDefault(); | ||
private final String bindingAddress; | ||
|
||
public TestSocketFactory(String bindingAddress) { | ||
this.bindingAddress = bindingAddress; | ||
} | ||
|
||
@Override | ||
public Socket createSocket() throws IOException { | ||
Socket socket = socketFactory.createSocket(); | ||
socket.bind(new InetSocketAddress(bindingAddress, 0)); | ||
return socket; | ||
} | ||
|
||
@Override | ||
public Socket createSocket(String string, int i) throws IOException, UnknownHostException { | ||
Socket socket = socketFactory.createSocket(string, i); | ||
socket.bind(new InetSocketAddress(bindingAddress, 0)); | ||
return socket; | ||
} | ||
|
||
@Override | ||
public Socket createSocket(String string, int i, InetAddress ia, int i1) throws IOException, UnknownHostException { | ||
throw new UnsupportedOperationException(); | ||
} | ||
|
||
@Override | ||
public Socket createSocket(InetAddress ia, int i) throws IOException { | ||
Socket socket = socketFactory.createSocket(ia, i); | ||
socket.bind(new InetSocketAddress(bindingAddress, 0)); | ||
return socket; | ||
} | ||
|
||
@Override | ||
public Socket createSocket(InetAddress ia, int i, InetAddress ia1, int i1) throws IOException { | ||
throw new UnsupportedOperationException(); | ||
} | ||
|
||
} | ||
|
||
@Test | ||
public void testIssue() throws IOException, URISyntaxException, InterruptedException { | ||
int port = SocketUtil.getAvailablePort(); | ||
WebSocketClient client = new WebSocketClient(new URI("ws://127.0.0.1:" + port)) { | ||
@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) { | ||
Assert.fail(ex.toString() + " sould not occur"); | ||
} | ||
}; | ||
|
||
String bindingAddress = "127.0.0.1"; | ||
|
||
client.setSocketFactory(new TestSocketFactory(bindingAddress)); | ||
|
||
WebSocketServer server = new WebSocketServer(new InetSocketAddress(port)) { | ||
@Override | ||
public void onOpen(WebSocket conn, ClientHandshake handshake) { | ||
} | ||
|
||
@Override | ||
public void onClose(WebSocket conn, int code, String reason, boolean remote) { | ||
} | ||
|
||
@Override | ||
public void onMessage(WebSocket conn, String message) { | ||
} | ||
|
||
@Override | ||
public void onError(WebSocket conn, Exception ex) { | ||
} | ||
|
||
@Override | ||
public void onStart() { | ||
} | ||
}; | ||
|
||
server.start(); | ||
client.connectBlocking(); | ||
Assert.assertEquals(bindingAddress, client.getSocket().getLocalAddress().getHostAddress()); | ||
Assert.assertNotEquals(0, client.getSocket().getLocalPort()); | ||
Assert.assertTrue(client.getSocket().isConnected()); | ||
} | ||
|
||
} |