Author: markt
Date: Sat Dec 15 21:28:10 2012
New Revision: 1422361
URL: http://svn.apache.org/viewvc?rev=1422361&view=rev
Log:
Update the location of the echo WebSocket end point (one test still fails -
need to improve continuation frame handling)
Modified:
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Modified: tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1422361&r1=1422360&r2=1422361&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java Sat Dec
15 21:28:10 2012
@@ -70,7 +70,7 @@ public class TestWebSocket extends Tomca
// Send the WebSocket handshake
- client.writer.write("GET /examples/websocket/echoStream HTTP/1.1" +
CRLF);
+ client.writer.write("GET /examples/websocket/echoProgrammatic
HTTP/1.1" + CRLF);
client.writer.write("Host: foo" + CRLF);
client.writer.write("Upgrade: websocket" + CRLF);
client.writer.write("Connection: keep-alive, upgrade" + CRLF);
@@ -110,7 +110,7 @@ public class TestWebSocket extends Tomca
WebSocketClient client= new WebSocketClient(getPort());
// Send the WebSocket handshake
- client.writer.write("GET /examples/websocket/echoStream HTTP/1.1" +
CRLF);
+ client.writer.write("GET /examples/websocket/echoProgrammatic
HTTP/1.1" + CRLF);
client.writer.write("Host: foo" + CRLF);
client.writer.write("Upgrade: websocket" + CRLF);
client.writer.write("Connection: upgrade" + CRLF);
@@ -148,7 +148,7 @@ public class TestWebSocket extends Tomca
// Send the WebSocket handshake
- client.writer.write("GET /examples/websocket/echoStream HTTP/1.1" +
CRLF);
+ client.writer.write("GET /examples/websocket/echoProgrammatic
HTTP/1.1" + CRLF);
client.writer.write("Host: foo" + CRLF);
client.writer.write("Upgrade: websocket" + CRLF);
client.writer.write("Sec-WebSocket-Version: 13" + CRLF);
@@ -176,7 +176,7 @@ public class TestWebSocket extends Tomca
WebSocketClient client= new WebSocketClient(getPort());
// Send the WebSocket handshake
- client.writer.write("GET /examples/websocket/echoStream HTTP/1.1" +
CRLF);
+ client.writer.write("GET /examples/websocket/echoProgrammatic
HTTP/1.1" + CRLF);
client.writer.write("Host: foo" + CRLF);
client.writer.write("Connection: upgrade" + CRLF);
client.writer.write("Sec-WebSocket-Version: 13" + CRLF);
@@ -203,7 +203,7 @@ public class TestWebSocket extends Tomca
WebSocketClient client= new WebSocketClient(getPort());
// Send the WebSocket handshake
- client.writer.write("GET /examples/websocket/echoStream HTTP/1.1" +
CRLF);
+ client.writer.write("GET /examples/websocket/echoProgrammatic
HTTP/1.1" + CRLF);
client.writer.write("Host: foo" + CRLF);
client.writer.write("Upgrade: websocket" + CRLF);
client.writer.write("Connection: upgrade" + CRLF);
@@ -356,7 +356,7 @@ public class TestWebSocket extends Tomca
SocketAddress addr = new InetSocketAddress("localhost", port);
socket = new Socket();
try {
- socket.setSoTimeout(10000);
+ socket.setSoTimeout(100000);
socket.connect(addr, 10000);
os = socket.getOutputStream();
writer = new OutputStreamWriter(os, encoding);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
