Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Issue661Test.java #880

Merged
merged 1 commit into from
Apr 22, 2019
Merged

Update Issue661Test.java #880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 30 additions & 40 deletions src/test/java/org/java_websocket/issues/Issue661Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
import java.net.InetSocketAddress;
import java.util.concurrent.CountDownLatch;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assert.*;

public class Issue661Test {

Expand All @@ -50,42 +49,30 @@ public class Issue661Test {
private CountDownLatch countServerDownLatch = new CountDownLatch( 1 );

private boolean wasError = false;
private boolean wasBindException = false;

class TestPrintStream extends PrintStream {
public TestPrintStream( OutputStream out ) {
super( out );
}

@Override
public void println( Object o ) {
wasError = true;
super.println( o );
}
}

//@Test(timeout = 2000)
@Test(timeout = 2000)
public void testIssue() throws Exception {
System.setErr( new TestPrintStream( System.err ) );
int port = SocketUtil.getAvailablePort();
WebSocketServer server0 = new WebSocketServer( new InetSocketAddress( port ) ) {
WebSocketServer server0 = new WebSocketServer(new InetSocketAddress(port)) {
@Override
public void onOpen( WebSocket conn, ClientHandshake handshake ) {
fail( "There should be no onOpen" );
public void onOpen(WebSocket conn, ClientHandshake handshake) {
fail("There should be no onOpen");
}

@Override
public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
fail( "There should be no onClose" );
public void onClose(WebSocket conn, int code, String reason, boolean remote) {
fail("There should be no onClose");
}

@Override
public void onMessage( WebSocket conn, String message ) {
fail( "There should be no onMessage" );
public void onMessage(WebSocket conn, String message) {
fail("There should be no onMessage");
}

@Override
public void onError( WebSocket conn, Exception ex ) {
fail( "There should be no onError!" );
public void onError(WebSocket conn, Exception ex) {
fail("There should be no onError!");
}

@Override
Expand All @@ -96,42 +83,45 @@ public void onStart() {
server0.start();
try {
countServerDownLatch.await();
} catch ( InterruptedException e ) {
} catch (InterruptedException e) {
//
}
WebSocketServer server1 = new WebSocketServer( new InetSocketAddress( port ) ) {
WebSocketServer server1 = new WebSocketServer(new InetSocketAddress(port)) {
@Override
public void onOpen( WebSocket conn, ClientHandshake handshake ) {
fail( "There should be no onOpen" );
public void onOpen(WebSocket conn, ClientHandshake handshake) {
fail("There should be no onOpen");
}

@Override
public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
fail( "There should be no onClose" );
public void onClose(WebSocket conn, int code, String reason, boolean remote) {
fail("There should be no onClose");
}

@Override
public void onMessage( WebSocket conn, String message ) {
fail( "There should be no onMessage" );
public void onMessage(WebSocket conn, String message) {
fail("There should be no onMessage");
}

@Override
public void onError( WebSocket conn, Exception ex ) {
if( !( ex instanceof BindException ) ) {
fail( "There should be no onError" );
public void onError(WebSocket conn, Exception ex) {
if (ex instanceof BindException){
wasBindException = true;
} else {
wasError = true;
}
}

@Override
public void onStart() {
fail( "There should be no onStart!" );
fail("There should be no onStart!");
}
};
server1.start();
Thread.sleep( 1000 );
Thread.sleep(1000);
server1.stop();
server0.stop();
Thread.sleep( 100 );
assertTrue( "There was an error using System.err", !wasError );
Thread.sleep(100);
assertFalse("There was an unexpected exception!", wasError);
assertTrue("There was no bind exception!", wasBindException);
}
}