Added test for http parser and fixed some issues

test/zutil/net/http/HttpHeaderParserTest.java

@@ -0,0 +1,80 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Ziver Koc
+ *
+ * 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.
+ */
+
+package zutil.net.http;
+
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+public class HttpHeaderParserTest {
+
+    @Test
+    public void firstLineRequest() throws IOException {
+        HttpHeaderParser parser = new HttpHeaderParser("GET / HTTP/1.1");
+        HttpHeader header = parser.read();
+
+        assertTrue(header.isRequest());
+        assertEquals("GET", header.getRequestType());
+        assertEquals("/", header.getRequestURL());
+        assertEquals("HTTP", header.getProtocol());
+        assertEquals(1.1f, header.getProtocolVersion(), 0);
+        assertEquals(-1, header.getResponseStatusCode());
+        assertEquals(null, header.getResponseStatusString());
+
+        parser = new HttpHeaderParser("DESCRIBE http://example.com RTSP/1.0");
+        header = parser.read();
+
+        assertTrue(header.isRequest());
+        assertEquals("DESCRIBE", header.getRequestType());
+        assertEquals("http://example.com", header.getRequestURL());
+        assertEquals("RTSP", header.getProtocol());
+        assertEquals(1.0f, header.getProtocolVersion(), 0f);
+    }
+
+    @Test
+    public void firstLineResponse() throws IOException {
+        HttpHeaderParser parser = new HttpHeaderParser("HTTP/1.0 200 OK");
+        HttpHeader header = parser.read();
+
+        assertTrue(header.isResponse());
+        assertEquals("HTTP", header.getProtocol());
+        assertEquals(1.0f, header.getProtocolVersion(), 0f);
+        assertEquals(200, header.getResponseStatusCode(), 0f);
+        assertEquals("OK", header.getResponseStatusString());
+        assertNull(header.getRequestType());
+        assertNull(header.getRequestURL());
+
+        parser = new HttpHeaderParser("RTSP/1.0 404 File not found Special");
+        header = parser.read();
+
+        assertTrue(header.isResponse());
+        assertEquals("RTSP", header.getProtocol());
+        assertEquals(1.0f, header.getProtocolVersion(), 0f);
+        assertEquals(404, header.getResponseStatusCode(), 0f);
+        assertEquals("File not found Special", header.getResponseStatusString());
+    }
+}

test/zutil/net/http/HttpHeaderTest.java

@@ -44,7 +44,7 @@ public class HttpHeaderTest {
     @Test
     public void setProtocol() {
         HttpHeader header = new HttpHeader();
-        assertEquals("HTTP", header.getProtocol());
+        assertEquals(null, header.getProtocol());
 
         header.setProtocol("RTSP");
         assertEquals("RTSP", header.getProtocol());
@@ -54,7 +54,7 @@ public class HttpHeaderTest {
     @Test
     public void setProtocolVersion() {
         HttpHeader header = new HttpHeader();
-        assertEquals(1.0f, header.getProtocolVersion(), 0);
+        assertEquals(-1, header.getProtocolVersion(), 0);
 
         header.setProtocolVersion(1.1f);
         assertEquals(1.1f, header.getProtocolVersion(), 0);
@@ -64,7 +64,7 @@ public class HttpHeaderTest {
     @Test
     public void setRequestType() {
         HttpHeader header = new HttpHeader();
-        assertEquals("GET", header.getRequestType());
+        assertEquals(null, header.getRequestType());
 
         header.setRequestType("POST");
         assertEquals("POST", header.getRequestType());
@@ -74,7 +74,7 @@ public class HttpHeaderTest {
     @Test
     public void setResponseStatusCode() {
         HttpHeader header = new HttpHeader();
-        assertEquals(200, header.getResponseStatusCode());
+        assertEquals(-1, header.getResponseStatusCode());
 
         header.setResponseStatusCode(400);
         assertEquals(400, header.getResponseStatusCode());
@@ -83,16 +83,10 @@ public class HttpHeaderTest {
     @Test
     public void setRequestURL() {
         HttpHeader header = new HttpHeader();
-        assertEquals("/", header.getRequestURL());
+        assertEquals(null, header.getRequestURL());
 
         header.setRequestURL("/page/test");
         assertEquals("/page/test", header.getRequestURL());
-
-        header.setRequestURL(" /page/1test ");
-        assertEquals("/page/1test", header.getRequestURL());
-
-        header.setRequestURL("/page//2test ");
-        assertEquals("/page/2test", header.getRequestURL());
     }
 
     @Test
@@ -150,7 +144,7 @@ public class HttpHeaderTest {
     @Test
     public void getResponseStatusString() {
         HttpHeader header = new HttpHeader();
-        assertEquals("OK", header.getResponseStatusString());
+        assertEquals(null, header.getResponseStatusString());
 
         header.setResponseStatusCode(400);
         assertEquals("Bad Request", header.getResponseStatusString());

test/zutil/parser/URLDecoderTest.java

@@ -32,9 +32,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 
-/**
- * Created by ezivkoc on 2015-12-11.
- */
 public class URLDecoderTest {
 
     @Test