Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making testcase more consistent

This commit is contained in:
Joakim Erdfelt 2013-06-24 15:02:40 -07:00
parent 40fea41d4f
commit f986493827
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
View File

@ -25,6 +25,9 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.toolchain.test.EventQueue;
import org.eclipse.jetty.toolchain.test.TestTracker;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.server.helper.CaptureSocket;
@ -32,10 +35,14 @@ import org.eclipse.jetty.websocket.server.helper.SessionServlet;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
public class WebSocketOverSSLTest
{
@Rule
public TestTracker tracker = new TestTracker();
private static SimpleServletServer server;
@BeforeClass
@ -144,13 +151,13 @@ public class WebSocketOverSSLTest
CaptureSocket clientSocket = new CaptureSocket();
URI requestUri = server.getServerUri().resolve("/deep?a=b");
System.err.printf("Request URI: %s%n",requestUri.toASCIIString());
client.connect(clientSocket,requestUri);
Future<Session> fut = client.connect(clientSocket,requestUri);
// wait for connect
clientSocket.awaitConnected(5000);
Session session = fut.get(5,TimeUnit.SECONDS);
// Generate text frame
clientSocket.getRemote().sendString("session.upgradeRequest.requestURI");
session.getRemote().sendString("session.upgradeRequest.requestURI");
// Read frame (hopefully text frame)
clientSocket.messages.awaitEventCount(1,500,TimeUnit.MILLISECONDS);

9
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java
View File

@ -24,6 +24,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.toolchain.test.EventQueue;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.WebSocketAdapter;
public class CaptureSocket extends WebSocketAdapter
@ -53,12 +54,10 @@ public class CaptureSocket extends WebSocketAdapter
}
}
public void onClose(int closeCode, String message)
{
}
public void onOpen(Connection connection)
@Override
public void onWebSocketConnect(Session sess)
{
super.onWebSocketConnect(sess);
latch.countDown();
}