From 969d9e24a82cf27c05c98bbf04829e1002fe6139 Mon Sep 17 00:00:00 2001 From: Steeely Dan Date: Mon, 6 Sep 2021 01:53:03 +0200 Subject: [PATCH 1/5] Add .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..71556c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +target/ +.settings/ +.vscode/ +.classpath +.project \ No newline at end of file From 4a2047304587fa0fb4f96998d060c41fdef3403a Mon Sep 17 00:00:00 2001 From: Steeely Dan Date: Mon, 6 Sep 2021 01:53:14 +0200 Subject: [PATCH 2/5] Add maven-surefire & maven-failsafe plugins https://junit.org/junit5/docs/current/user-guide/#running-tests-build-maven-engines-configure --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d74abd2..413ad79 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,19 @@ 1.8 + + + + maven-surefire-plugin + 2.22.2 + + + maven-failsafe-plugin + 2.22.2 + + + + @@ -41,7 +54,7 @@ org.junit.jupiter junit-jupiter - RELEASE + 5.7.2 test From f955ebf319989539924f8c6e32bb3d4ba7d408b8 Mon Sep 17 00:00:00 2001 From: Steeely Dan Date: Mon, 6 Sep 2021 01:54:45 +0200 Subject: [PATCH 3/5] Remove unused request vars --- .../com/coderfromscratch/http/HttpParserTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/coderfromscratch/http/HttpParserTest.java b/src/test/java/com/coderfromscratch/http/HttpParserTest.java index 1a5a867..d637079 100644 --- a/src/test/java/com/coderfromscratch/http/HttpParserTest.java +++ b/src/test/java/com/coderfromscratch/http/HttpParserTest.java @@ -41,7 +41,7 @@ void parseHttpRequest() { @Test void parseHttpRequestBadMethod1() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateBadTestCaseMethodName1() ); fail(); @@ -53,7 +53,7 @@ void parseHttpRequestBadMethod1() { @Test void parseHttpRequestBadMethod2() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateBadTestCaseMethodName2() ); fail(); @@ -65,7 +65,7 @@ void parseHttpRequestBadMethod2() { @Test void parseHttpRequestInvNumItems1() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateBadTestCaseRequestLineInvNumItems1() ); fail(); @@ -77,7 +77,7 @@ void parseHttpRequestInvNumItems1() { @Test void parseHttpEmptyRequestLine() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateBadTestCaseEmptyRequestLine() ); fail(); @@ -89,7 +89,7 @@ void parseHttpEmptyRequestLine() { @Test void parseHttpRequestLineCRnoLF() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateBadTestCaseRequestLineOnlyCRnoLF() ); fail(); @@ -101,7 +101,7 @@ void parseHttpRequestLineCRnoLF() { @Test void parseHttpRequestBadHttpVersion() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateBadHttpVersionTestCase() ); fail(); @@ -113,7 +113,7 @@ void parseHttpRequestBadHttpVersion() { @Test void parseHttpRequestUnsupportedHttpVersion() { try { - HttpRequest request = httpParser.parseHttpRequest( + httpParser.parseHttpRequest( generateUnsuportedHttpVersionTestCase() ); fail(); From 7768077de669092acb6a1444e9fbd38d91e6a138 Mon Sep 17 00:00:00 2001 From: Steeely Dan Date: Mon, 6 Sep 2021 01:58:23 +0200 Subject: [PATCH 4/5] Change param order at assertEquals(): expected, actual --- .../coderfromscratch/http/HttpParserTest.java | 26 +++++++++---------- .../http/HttpVersionTest.java | 7 +++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/test/java/com/coderfromscratch/http/HttpParserTest.java b/src/test/java/com/coderfromscratch/http/HttpParserTest.java index d637079..cea48c1 100644 --- a/src/test/java/com/coderfromscratch/http/HttpParserTest.java +++ b/src/test/java/com/coderfromscratch/http/HttpParserTest.java @@ -32,10 +32,10 @@ void parseHttpRequest() { } assertNotNull(request); - assertEquals(request.getMethod(), HttpMethod.GET); - assertEquals(request.getRequestTarget(), "/"); - assertEquals(request.getOriginalHttpVersion(), "HTTP/1.1"); - assertEquals(request.getBestCompatibleHttpVersion(), HttpVersion.HTTP_1_1); + assertEquals(HttpMethod.GET, request.getMethod()); + assertEquals("/", request.getRequestTarget()); + assertEquals("HTTP/1.1", request.getOriginalHttpVersion()); + assertEquals(HttpVersion.HTTP_1_1, request.getBestCompatibleHttpVersion()); } @Test @@ -46,7 +46,7 @@ void parseHttpRequestBadMethod1() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED); + assertEquals(HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED, e.getErrorCode()); } } @@ -58,7 +58,7 @@ void parseHttpRequestBadMethod2() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED); + assertEquals(HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED, e.getErrorCode()); } } @@ -70,7 +70,7 @@ void parseHttpRequestInvNumItems1() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST); + assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode()); } } @@ -82,7 +82,7 @@ void parseHttpEmptyRequestLine() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST); + assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode()); } } @@ -94,7 +94,7 @@ void parseHttpRequestLineCRnoLF() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST); + assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode()); } } @@ -106,7 +106,7 @@ void parseHttpRequestBadHttpVersion() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST); + assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode()); } } @@ -118,7 +118,7 @@ void parseHttpRequestUnsupportedHttpVersion() { ); fail(); } catch (HttpParsingException e) { - assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_505_HTTP_VERSION_NOT_SUPPORTED); + assertEquals(HttpStatusCode.SERVER_ERROR_505_HTTP_VERSION_NOT_SUPPORTED, e.getErrorCode()); } } @@ -129,8 +129,8 @@ void parseHttpRequestSupportedHttpVersion1() { generateSupportedHttpVersion1() ); assertNotNull(request); - assertEquals(request.getBestCompatibleHttpVersion(), HttpVersion.HTTP_1_1); - assertEquals(request.getOriginalHttpVersion(), "HTTP/1.2"); + assertEquals(HttpVersion.HTTP_1_1, request.getBestCompatibleHttpVersion()); + assertEquals("HTTP/1.2", request.getOriginalHttpVersion()); } catch (HttpParsingException e) { fail(); } diff --git a/src/test/java/com/coderfromscratch/http/HttpVersionTest.java b/src/test/java/com/coderfromscratch/http/HttpVersionTest.java index eec0460..52aaef3 100644 --- a/src/test/java/com/coderfromscratch/http/HttpVersionTest.java +++ b/src/test/java/com/coderfromscratch/http/HttpVersionTest.java @@ -15,14 +15,13 @@ void getBestCompatibleVersionExactMatch() { fail(); } assertNotNull(version); - assertEquals(version, HttpVersion.HTTP_1_1); + assertEquals(HttpVersion.HTTP_1_1, version); } @Test void getBestCompatibleVersionBadFormat() { - HttpVersion version = null; try { - version = HttpVersion.getBestCompatibleVersion("http/1.1"); + HttpVersion.getBestCompatibleVersion("http/1.1"); fail(); } catch (BadHttpVersionException e) { @@ -35,7 +34,7 @@ void getBestCompatibleVersionHigherVersion() { try { version = HttpVersion.getBestCompatibleVersion("HTTP/1.2"); assertNotNull(version); - assertEquals(version, HttpVersion.HTTP_1_1); + assertEquals(HttpVersion.HTTP_1_1, version); } catch (BadHttpVersionException e) { fail(); } From 03fc417c9d8bbab7617467e5033bd48a200db18e Mon Sep 17 00:00:00 2001 From: Steeely Dan Date: Mon, 6 Sep 2021 01:59:46 +0200 Subject: [PATCH 5/5] Remove unused imports --- .../coderfromscratch/httpserver/core/ServerListenerThread.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java b/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java index a9fafe6..7fb5db8 100644 --- a/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java +++ b/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java @@ -4,8 +4,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket;