Merge branch 'master' of https://github.com/palmerabollo/netty into WsTests
Conflicts: src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java
This commit is contained in:
vibul
commit
1323675392
@ -91,6 +91,7 @@ public class WebSocketServerHandshaker00 extends WebSocketServerHandshaker {
|
||||
* Connection: Upgrade
|
||||
* Host: example.com
|
||||
* Origin: http://example.com
|
||||
* Sec-WebSocket-Protocol: chat, sample
|
||||
* Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5
|
||||
* Sec-WebSocket-Key2: 12998 5 Y3 1 .P00
|
||||
*
|
||||
|
||||
@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright 2011 The Netty Project
|
||||
*
|
||||
* The Netty Project licenses this file to you under the Apache License,
|
||||
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at:
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package io.netty.handler.codec.http.websocketx;
|
||||
|
||||
import static io.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
|
||||
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
|
||||
import static org.easymock.EasyMock.capture;
|
||||
import static org.easymock.EasyMock.replay;
|
||||
import io.netty.buffer.ChannelBuffer;
|
||||
import io.netty.buffer.ChannelBuffers;
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.DefaultChannelFuture;
|
||||
import io.netty.channel.DefaultChannelPipeline;
|
||||
import io.netty.handler.codec.http.DefaultHttpRequest;
|
||||
import io.netty.handler.codec.http.HttpChunkAggregator;
|
||||
import io.netty.handler.codec.http.HttpHeaders.Names;
|
||||
import io.netty.handler.codec.http.HttpMethod;
|
||||
import io.netty.handler.codec.http.HttpRequest;
|
||||
import io.netty.handler.codec.http.HttpRequestDecoder;
|
||||
import io.netty.handler.codec.http.HttpResponse;
|
||||
import io.netty.handler.codec.http.HttpResponseEncoder;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
import org.easymock.Capture;
|
||||
import org.easymock.EasyMock;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class WebSocketServerHandshaker00Test {
|
||||
|
||||
private DefaultChannelPipeline createPipeline() {
|
||||
DefaultChannelPipeline pipeline = new DefaultChannelPipeline();
|
||||
pipeline.addLast("chunkAggregator", new HttpChunkAggregator(42));
|
||||
pipeline.addLast("wsdecoder", new HttpRequestDecoder());
|
||||
pipeline.addLast("wsencoder", new HttpResponseEncoder());
|
||||
return pipeline;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPerformOpeningHandshake() {
|
||||
Channel channelMock = EasyMock.createMock(Channel.class);
|
||||
|
||||
DefaultChannelPipeline pipeline = createPipeline();
|
||||
EasyMock.expect(channelMock.getPipeline()).andReturn(pipeline);
|
||||
|
||||
// capture the http response in order to verify the headers
|
||||
Capture<HttpResponse> res = new Capture<HttpResponse>();
|
||||
EasyMock.expect(channelMock.write(capture(res))).andReturn(new DefaultChannelFuture(channelMock, true));
|
||||
|
||||
replay(channelMock);
|
||||
|
||||
HttpRequest req = new DefaultHttpRequest(HTTP_1_1, HttpMethod.GET, "/chat");
|
||||
req.setHeader(Names.HOST, "server.example.com");
|
||||
req.setHeader(Names.UPGRADE, WEBSOCKET.toLowerCase());
|
||||
req.setHeader(Names.CONNECTION, "Upgrade");
|
||||
req.setHeader(Names.ORIGIN, "http://example.com");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_KEY1, "4 @1 46546xW%0l 1 5");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_KEY2, "12998 5 Y3 1 .P00");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_PROTOCOL, "chat, superchat");
|
||||
|
||||
ChannelBuffer buffer = ChannelBuffers.copiedBuffer("^n:ds[4U", Charset.defaultCharset());
|
||||
req.setContent(buffer);
|
||||
|
||||
WebSocketServerHandshaker00 handsaker = new WebSocketServerHandshaker00("ws://example.com/chat", "chat");
|
||||
handsaker.performOpeningHandshake(channelMock, req);
|
||||
|
||||
Assert.assertEquals("ws://example.com/chat", res.getValue().getHeader(Names.SEC_WEBSOCKET_LOCATION));
|
||||
Assert.assertEquals("chat", res.getValue().getHeader(Names.SEC_WEBSOCKET_PROTOCOL));
|
||||
Assert.assertEquals("8jKS'y:G*Co,Wxa-", res.getValue().getContent().toString(Charset.defaultCharset()));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
/*
|
||||
* Copyright 2011 The Netty Project
|
||||
*
|
||||
* The Netty Project licenses this file to you under the Apache License,
|
||||
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at:
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package io.netty.handler.codec.http.websocketx;
|
||||
|
||||
import static io.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
|
||||
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
|
||||
import static org.easymock.EasyMock.capture;
|
||||
import static org.easymock.EasyMock.replay;
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.DefaultChannelFuture;
|
||||
import io.netty.channel.DefaultChannelPipeline;
|
||||
import io.netty.handler.codec.http.DefaultHttpRequest;
|
||||
import io.netty.handler.codec.http.HttpChunkAggregator;
|
||||
import io.netty.handler.codec.http.HttpHeaders.Names;
|
||||
import io.netty.handler.codec.http.HttpMethod;
|
||||
import io.netty.handler.codec.http.HttpRequest;
|
||||
import io.netty.handler.codec.http.HttpRequestDecoder;
|
||||
import io.netty.handler.codec.http.HttpResponse;
|
||||
import io.netty.handler.codec.http.HttpResponseEncoder;
|
||||
|
||||
import org.easymock.Capture;
|
||||
import org.easymock.EasyMock;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class WebSocketServerHandshaker10Test {
|
||||
|
||||
private DefaultChannelPipeline createPipeline() {
|
||||
DefaultChannelPipeline pipeline = new DefaultChannelPipeline();
|
||||
pipeline.addLast("chunkAggregator", new HttpChunkAggregator(42));
|
||||
pipeline.addLast("requestDecoder", new HttpRequestDecoder());
|
||||
pipeline.addLast("responseEncoder", new HttpResponseEncoder());
|
||||
return pipeline;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPerformOpeningHandshake() {
|
||||
Channel channelMock = EasyMock.createMock(Channel.class);
|
||||
|
||||
DefaultChannelPipeline pipeline = createPipeline();
|
||||
EasyMock.expect(channelMock.getPipeline()).andReturn(pipeline);
|
||||
|
||||
// capture the http response in order to verify the headers
|
||||
Capture<HttpResponse> res = new Capture<HttpResponse>();
|
||||
EasyMock.expect(channelMock.write(capture(res))).andReturn(new DefaultChannelFuture(channelMock, true));
|
||||
|
||||
replay(channelMock);
|
||||
|
||||
HttpRequest req = new DefaultHttpRequest(HTTP_1_1, HttpMethod.GET, "/chat");
|
||||
req.setHeader(Names.HOST, "server.example.com");
|
||||
req.setHeader(Names.UPGRADE, WEBSOCKET.toLowerCase());
|
||||
req.setHeader(Names.CONNECTION, "Upgrade");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_KEY, "dGhlIHNhbXBsZSBub25jZQ==");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_ORIGIN, "http://example.com");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_PROTOCOL, "chat, superchat");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_VERSION, "8");
|
||||
|
||||
WebSocketServerHandshaker10 handsaker = new WebSocketServerHandshaker10("ws://example.com/chat", "chat", false);
|
||||
handsaker.performOpeningHandshake(channelMock, req);
|
||||
|
||||
Assert.assertEquals("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=", res.getValue().getHeader(Names.SEC_WEBSOCKET_ACCEPT));
|
||||
Assert.assertEquals("chat", res.getValue().getHeader(Names.SEC_WEBSOCKET_PROTOCOL));
|
||||
}
|
||||
}
|
||||
@ -67,10 +67,8 @@ public class WebSocketServerHandshaker13Test {
|
||||
req.setHeader(Names.SEC_WEBSOCKET_ORIGIN, "http://example.com");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_PROTOCOL, "chat, superchat");
|
||||
req.setHeader(Names.SEC_WEBSOCKET_VERSION, "13");
|
||||
|
||||
WebSocketServerHandshaker13 handsaker13 = new WebSocketServerHandshaker13("ws://example.com/chat", "chat",
|
||||
false);
|
||||
handsaker13.performOpeningHandshake(channelMock, req);
|
||||
WebSocketServerHandshaker13 handsaker = new WebSocketServerHandshaker13("ws://example.com/chat", "chat", false);
|
||||
handsaker.performOpeningHandshake(channelMock, req);
|
||||
|
||||
Assert.assertEquals("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=", res.getValue().getHeader(Names.SEC_WEBSOCKET_ACCEPT));
|
||||
Assert.assertEquals("chat", res.getValue().getHeader(Names.SEC_WEBSOCKET_PROTOCOL));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user