Skip to content

assertEquals: Param order #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
steeelydan wants to merge 5 commits into
base: master
Choose a base branch
from
Open

assertEquals: Param order #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
969d9e2
Add .gitignore
steeelydan Sep 5, 2021
4a20473
Add maven-surefire & maven-failsafe plugins
steeelydan Sep 5, 2021
f955ebf
Remove unused request vars
steeelydan Sep 5, 2021
7768077
Change param order at assertEquals(): expected, actual
steeelydan Sep 5, 2021
03fc417
Remove unused imports
steeelydan Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
target/
.settings/
.vscode/
.classpath
.project
15 changes: 14 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
</plugin>
</plugins>
</build>

<!-- Dependencies -->
<dependencies>
<dependency>
Expand Down Expand Up @@ -41,7 +54,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>RELEASE</version>
<version>5.7.2</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
40 changes: 20 additions & 20 deletions src/test/java/com/coderfromscratch/http/HttpParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,93 +32,93 @@ 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
void parseHttpRequestBadMethod1() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateBadTestCaseMethodName1()
);
fail();
} catch (HttpParsingException e) {
assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED);
assertEquals(HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED, e.getErrorCode());
}
}

@Test
void parseHttpRequestBadMethod2() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateBadTestCaseMethodName2()
);
fail();
} catch (HttpParsingException e) {
assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED);
assertEquals(HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED, e.getErrorCode());
}
}

@Test
void parseHttpRequestInvNumItems1() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateBadTestCaseRequestLineInvNumItems1()
);
fail();
} catch (HttpParsingException e) {
assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
}
}

@Test
void parseHttpEmptyRequestLine() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateBadTestCaseEmptyRequestLine()
);
fail();
} catch (HttpParsingException e) {
assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
}
}

@Test
void parseHttpRequestLineCRnoLF() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateBadTestCaseRequestLineOnlyCRnoLF()
);
fail();
} catch (HttpParsingException e) {
assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
}
}

@Test
void parseHttpRequestBadHttpVersion() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateBadHttpVersionTestCase()
);
fail();
} catch (HttpParsingException e) {
assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
}
}

@Test
void parseHttpRequestUnsupportedHttpVersion() {
try {
HttpRequest request = httpParser.parseHttpRequest(
httpParser.parseHttpRequest(
generateUnsuportedHttpVersionTestCase()
);
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());
}
}

Expand All @@ -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();
}
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/com/coderfromscratch/http/HttpVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand All @@ -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();
}
Expand Down