Add several testcases to improve the code coverage.

Author: dota17

src/test/java/org/java_websocket/AllTests.java

@@ -32,6 +32,7 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 org.java_websocket.util.ByteBufferUtilsTest.class,
+org.java_websocket.util.Base64Test.class,
 org.java_websocket.client.AllClientTests.class,
 org.java_websocket.drafts.AllDraftTests.class,
 org.java_websocket.issues.AllIssueTests.class,

src/test/java/org/java_websocket/client/AllClientTests.java

@@ -32,7 +32,8 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 org.java_websocket.client.AttachmentTest.class,
-org.java_websocket.client.SchemaCheckTest.class
+org.java_websocket.client.SchemaCheckTest.class,
+org.java_websocket.client.HeadersTest.class
 })
 /**
  * Start all tests for the client

src/test/java/org/java_websocket/client/HeadersTest.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2010-2020 Nathan Rajlich
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+packageorg.java_websocket.client;
+
+importorg.java_websocket.handshake.ServerHandshake;
+importorg.junit.Test;
+
+importjava.net.URI;
+importjava.net.URISyntaxException;
+importjava.util.HashMap;
+importjava.util.Map;
+
+importstaticorg.junit.Assert.assertEquals;
+importstaticorg.junit.Assert.assertNull;
+
+publicclassHeadersTest{
+
+@Test
+publicvoidtestHttpHeaders() throwsURISyntaxException{
+Map<String, String> httpHeaders = newHashMap<String, String>();
+httpHeaders.put("Cache-Control", "only-if-cached");
+httpHeaders.put("Keep-Alive", "1000");
+
+WebSocketClientclient = newWebSocketClient(newURI( "ws://localhost"), httpHeaders){
+@Override
+publicvoidonOpen( ServerHandshakehandshakedata ){
+
+ }
+
+@Override
+publicvoidonMessage( Stringmessage ){
+
+ }
+
+@Override
+publicvoidonClose( intcode, Stringreason, booleanremote ){
+
+ }
+
+@Override
+publicvoidonError( Exceptionex ){
+
+ }
+ };
+
+assertEquals("only-if-cached", client.removeHeader("Cache-Control"));
+assertEquals("1000", client.removeHeader("Keep-Alive"));
+ }
+
+@Test
+publicvoidtest_Add_RemoveHeaders() throwsURISyntaxException{
+Map<String, String> httpHeaders = null;
+WebSocketClientclient = newWebSocketClient(newURI( "ws://localhost"), httpHeaders){
+@Override
+publicvoidonOpen( ServerHandshakehandshakedata ){
+
+ }
+
+@Override
+publicvoidonMessage( Stringmessage ){
+
+ }
+
+@Override
+publicvoidonClose( intcode, Stringreason, booleanremote ){
+
+ }
+
+@Override
+publicvoidonError( Exceptionex ){
+
+ }
+ };
+client.addHeader("Cache-Control", "only-if-cached");
+assertEquals("only-if-cached", client.removeHeader("Cache-Control"));
+assertNull(client.removeHeader("Cache-Control"));
+
+client.addHeader("Cache-Control", "only-if-cached");
+client.clearHeaders();
+assertNull(client.removeHeader("Cache-Control"));
+ }
+
+@Test
+publicvoidtestGetURI() throwsURISyntaxException{
+WebSocketClientclient = newWebSocketClient(newURI( "ws://localhost")){
+@Override
+publicvoidonOpen( ServerHandshakehandshakedata ){
+
+ }
+
+@Override
+publicvoidonMessage( Stringmessage ){
+
+ }
+
+@Override
+publicvoidonClose( intcode, Stringreason, booleanremote ){
+
+ }
+
+@Override
+publicvoidonError( Exceptionex ){
+
+ }
+ };
+StringactualURI = client.getURI().getScheme() + "://" + client.getURI().getHost();
+
+assertEquals("ws://localhost", actualURI);
+ }
+}

src/test/java/org/java_websocket/util/Base64Test.java

@@ -41,6 +41,14 @@ public void testEncodeBytes() throws IOException{
 Assert.assertEquals("", Base64.encodeBytes(newbyte[0]));
 Assert.assertEquals("QHE=",
 Base64.encodeBytes(newbyte[]{49, 121, 64, 113, -63, 43, -24, 62, 4, 48}, 2, 2, 0));
+Assert.assertEquals("H4sIAAAAAAAAADMEALfv3IMBAAAA",
+Base64.encodeBytes(newbyte[]{49, 121, 64, 113, -63, 43, -24, 62, 4, 48}, 0, 1, 6));
+Assert.assertEquals("H4sIAAAAAAAAAHMoBABQHKKWAgAAAA==",
+Base64.encodeBytes(newbyte[]{49, 121, 64, 113, -63, 43, -24, 62, 4, 48}, 2, 2, 18));
+Assert.assertEquals("F63=",
+Base64.encodeBytes(newbyte[]{49, 121, 64, 113, 63, 43, -24, 62, 4, 48}, 2, 2, 32));
+Assert.assertEquals("6sg7---------6Bc0-0F699L-V----==",
+Base64.encodeBytes(newbyte[]{49, 121, 64, 113, 63, 43, -24, 62, 4, 48}, 2, 2, 34));
  }
 
 @Test
@@ -90,4 +98,30 @@ public void testEncodeBytesToBytes2() throws IOException{
 thrown.expect(IllegalArgumentException.class);
 Base64.encodeBytesToBytes(newbyte[]{83, 10, 91, 67, 42, -1, 107, 62, 91, 67}, 8, 6, 26);
  }
+
+@Test
+publicvoidtestEncodeBytesToBytes3() throwsIOException{
+byte[] src = newbyte[]{
+113, 42, 123, 99, 10, -33, 75, 30, 88, 99,
+113, 42, 123, 99, 10, -33, 75, 31, 88, 99,
+113, 42, 123, 99, 10, -33, 75, 32, 88, 99,
+113, 42, 123, 99, 10, -33, 75, 33, 88, 99,
+113, 42, 123, 99, 10, -33, 75, 34, 88, 99,
+113, 42, 123, 99, 10, -33, 75, 35, 88, 99,
+55, 60
+ };
+byte[] excepted = newbyte[]{
+99, 83, 112, 55, 89, 119, 114, 102, 83, 120,
+53, 89, 89, 51, 69, 113, 101, 50, 77, 75, 51,
+48, 115, 102, 87, 71, 78, 120, 75, 110, 116, 106,
+67, 116, 57, 76, 73, 70, 104, 106, 99, 83, 112,
+55, 89, 119, 114, 102, 83, 121, 70, 89, 89,
+51, 69, 113, 101, 50, 77, 75, 51, 48, 115,
+105, 87, 71, 78, 120, 75, 110, 116, 106, 67,
+116, 57, 76, 10, 73, 49, 104, 106, 78, 122,
+119, 61
+ };
+
+Assert.assertArrayEquals(excepted, Base64.encodeBytesToBytes(src, 0, 62, 8));
+ }
 }