Skip to content

Commit f1802ae

Browse files
marci4marci4
committed
Update Draft_6455Test.java
Adjust tests
1 parent edeb6fe commit f1802ae

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

‎src/test/java/org/java_websocket/drafts/Draft_6455Test.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void testGetKnownExtensions() throws Exception {
132132

133133
@Test
134134
public void testGetProtocol() throws Exception {
135-
Draft_6455 draft_6455 = new Draft_6455();
135+
Draft_6455 draft_6455 = new Draft_6455(Collections.<IExtension>emptyList(), Collections.<IProtocol>emptyList());
136136
assertNull( draft_6455.getProtocol() );
137137
draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension );
138138
assertNull( draft_6455.getProtocol() );
@@ -194,7 +194,7 @@ public void testToString() throws Exception {
194194
Draft_6455 draft_6455 = new Draft_6455();
195195
assertEquals( "Draft_6455 extension: DefaultExtension max frame size: 2147483647", draft_6455.toString() );
196196
draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension );
197-
assertEquals( "Draft_6455 extension: DefaultExtension max frame size: 2147483647", draft_6455.toString() );
197+
assertEquals( "Draft_6455 extension: DefaultExtension protocol: max frame size: 2147483647", draft_6455.toString() );
198198
draft_6455 = new Draft_6455( Collections.<IExtension>emptyList(), Collections.<IProtocol>singletonList( new Protocol( "chat" ) ) );
199199
assertEquals( "Draft_6455 extension: DefaultExtension max frame size: 2147483647", draft_6455.toString() );
200200
draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension );
@@ -223,15 +223,15 @@ public void testEquals() throws Exception {
223223
draft1.acceptHandshakeAsServer( handshakedataProtocolExtension );
224224
assertNotEquals( draft2, draft3 );
225225
assertNotEquals( draft0, draft2 );
226-
assertEquals( draft0, draft1 );
226+
assertNotEquals( draft0, draft1 );
227227
draft2 = draft2.copyInstance();
228228
draft1 = draft1.copyInstance();
229229
//unequal for draft draft2 due to a provided protocol
230230
draft2.acceptHandshakeAsServer( handshakedataProtocol );
231231
draft1.acceptHandshakeAsServer( handshakedataProtocol );
232232
assertNotEquals( draft2, draft3 );
233233
assertNotEquals( draft0, draft2 );
234-
assertEquals( draft0, draft1 );
234+
assertNotEquals( draft0, draft1 );
235235
draft2 = draft2.copyInstance();
236236
draft1 = draft1.copyInstance();
237237
//unequal for draft draft0 due to a provided protocol (no protocol)
@@ -297,14 +297,14 @@ public void testHashCode() throws Exception {
297297
public void acceptHandshakeAsServer() throws Exception {
298298
Draft_6455 draft_6455 = new Draft_6455();
299299
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedata ) );
300-
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocol ) );
300+
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocol ) );
301301
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataExtension ) );
302-
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension ) );
302+
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension ) );
303303
draft_6455 = new Draft_6455( new TestExtension() );
304304
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedata ) );
305-
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocol ) );
305+
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocol ) );
306306
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataExtension ) );
307-
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension ) );
307+
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocolExtension ) );
308308
draft_6455 = new Draft_6455( Collections.<IExtension>emptyList(), Collections.<IProtocol>singletonList( new Protocol( "chat" ) ) );
309309
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsServer( handshakedata ) );
310310
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsServer( handshakedataProtocol ) );
@@ -336,15 +336,15 @@ public void acceptHandshakeAsClient() throws Exception {
336336
response.put( "Sec-WebSocket-Accept", "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=" );
337337
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsClient( request, response ) );
338338
response.put( "Sec-WebSocket-Protocol", "chat" );
339-
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsClient( request, response ) );
339+
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsClient( request, response ) );
340340
draft_6455 = new Draft_6455( Collections.<IExtension>emptyList(), Collections.<IProtocol>singletonList( new Protocol( "chat" ) ) );
341341
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsClient( request, response ) );
342342
ArrayList<IProtocol> protocols = new ArrayList<IProtocol>();
343343
protocols.add( new Protocol( "" ) );
344344
protocols.add( new Protocol( "chat" ) );
345345
draft_6455 = new Draft_6455( Collections.<IExtension>emptyList(), protocols );
346346
assertEquals( HandshakeState.MATCHED, draft_6455.acceptHandshakeAsClient( request, response ) );
347-
draft_6455 = new Draft_6455();
347+
draft_6455 =new Draft_6455(Collections.<IExtension>emptyList(), Collections.<IProtocol>emptyList());
348348
assertEquals( HandshakeState.NOT_MATCHED, draft_6455.acceptHandshakeAsClient( request, response ) );
349349
protocols.clear();
350350
protocols.add( new Protocol( "chat3" ) );

0 commit comments

Comments
 (0)