diff --git a/pom.xml b/pom.xml index f57d0f13..658441e0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,27 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.juv25d - JavaHttpServer + org.example + JavaTemplate 1.0-SNAPSHOT - - scm:git:https://github.com/ithsjava25/project-webserver-juv25d.git - scm:git:https://github.com/ithsjava25/project-webserver-juv25d.git - https://github.com/ithsjava25/project-webserver-juv25d - HEAD - - - 25 + 23 UTF-8 - 6.0.2 + 6.0.3 3.27.7 5.21.0 - 2.45.0 - 0.13.1 - ${maven.build.timestamp} - @@ -97,71 +86,46 @@ org.apache.maven.plugins maven-compiler-plugin 3.15.0 - - true - - -XDcompilePolicy=simple - --should-stop=ifError=FLOW - -Xplugin:ErrorProne -Xep:NullAway:ERROR -XepOpt:NullAway:AnnotatedPackages=org.juv25d - -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED - -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED - -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED - - - - com.google.errorprone - error_prone_core - ${errorprone.version} - - - com.uber.nullaway - nullaway - ${nullaway.version} - - - org.apache.maven.plugins maven-install-plugin 3.1.4 + + org.apache.maven.plugins + maven-jar-plugin + 3.5.0 + org.apache.maven.plugins maven-resources-plugin 3.4.0 - org.apache.maven.plugins - maven-dependency-plugin - 3.9.0 - - - - properties - - - + org.apache.maven.plugins + maven-dependency-plugin + 3.10.0 + + + + properties + + + org.apache.maven.plugins maven-surefire-plugin - 3.5.4 - - @{argLine} -Xshare:off - + 3.5.5 + + @{argLine} -javaagent:${org.mockito:mockito-core:jar} -Xshare:off + org.apache.maven.plugins maven-failsafe-plugin - 3.5.4 + 3.5.5 @@ -194,113 +158,6 @@ - - com.diffplug.spotless - spotless-maven-plugin - 3.2.1 - - - - src/main/java/**/*.java - src/test/java/**/*.java - - - - - - - - - - org.pitest - pitest-maven - 1.22.0 - - - - org.pitest - pitest-junit5-plugin - 1.2.2 - - - - - - org.juv25d.* - - - org.juv25d.* - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 3.2.0 - - - validate - - create - - - - - false - false - 7 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.5.1 - - - package - - shade - - - app - false - false - - - org.juv25d.App - - - - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 3.2.0 - - - validate - - create - - - - - - - - - src/main/resources - false - - - src/main/resources-filtered - true - - diff --git a/src/test/java/org/juv25d/http/HttpResponseTest.java b/src/test/java/org/juv25d/http/HttpResponseTest.java index d6698e65..6a9a32a0 100644 --- a/src/test/java/org/juv25d/http/HttpResponseTest.java +++ b/src/test/java/org/juv25d/http/HttpResponseTest.java @@ -2,9 +2,22 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.*; -class HttpResponseTest { +import static org.junit.jupiter.api.Assertions.*; + +public class HttpResponseTest { + + private HttpResponse response; + + @BeforeEach + void setUp() { + response = new HttpResponse(); + } + + @Test + void shouldReturnDefaultStatusCode() { + assertEquals(200, response.statusCode()); + } private HttpResponse response; @@ -28,6 +41,8 @@ void setHeader_setsEntry_andDoesNotThrow() { assertThatCode(() -> response.setHeader("Content-Type", "text/plain")) .doesNotThrowAnyException(); - assertThat(response.headers()).containsEntry("Content-Type", "text/plain"); + @Test + void shouldHaveEmptyBodyByDefault() { + assertArrayEquals(new byte[0], response.body()); } } diff --git a/src/test/java/org/juv25d/http/HttpResponseWriterTest.java b/src/test/java/org/juv25d/http/HttpResponseWriterTest.java index 9ca861f0..cc82a072 100644 --- a/src/test/java/org/juv25d/http/HttpResponseWriterTest.java +++ b/src/test/java/org/juv25d/http/HttpResponseWriterTest.java @@ -105,5 +105,4 @@ void writes404HeadResponse() throws Exception { assertThat(result).endsWith("\r\n\r\n"); assertThat(result).doesNotContain("Not found"); } - }