From 5825bae546db8e2724d22e9b9c74b72c71c542cd Mon Sep 17 00:00:00 2001 From: greeng00se Date: Mon, 11 Sep 2023 17:38:02 +0900 Subject: [PATCH] =?UTF-8?q?test:=20=EC=84=B8=EC=85=98=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nextstep/jwp/controller/LoginControllerTest.java | 5 ++++- .../java/org/apache/coyote/http11/Http11ProcessorTest.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tomcat/src/test/java/nextstep/jwp/controller/LoginControllerTest.java b/tomcat/src/test/java/nextstep/jwp/controller/LoginControllerTest.java index b55f9ee1d5..1220d75b83 100644 --- a/tomcat/src/test/java/nextstep/jwp/controller/LoginControllerTest.java +++ b/tomcat/src/test/java/nextstep/jwp/controller/LoginControllerTest.java @@ -57,8 +57,8 @@ void setUp() { // given final RequestLine requestLine = RequestLine.from("GET /login HTTP/1.1"); final String uuid = UUID.randomUUID().toString(); - final HttpRequest httpRequest = new HttpRequest(requestLine, new Headers(), new RequestBody()); final Session session = new Session(uuid); + final HttpRequest httpRequest = new HttpRequest(requestLine, new Headers(), new RequestBody()); session.setAttribute("user", new User("gugu", "password", "gugu@naver.com")); httpRequest.setSession(session); final HttpResponse httpResponse = new HttpResponse(HttpVersion.HTTP_1_1); @@ -99,6 +99,9 @@ void setUp() { final RequestLine requestLine = RequestLine.from("POST /login HTTP/1.1"); final RequestBody requestBody = RequestBody.from("account=hello&password=world"); final HttpRequest httpRequest = new HttpRequest(requestLine, new Headers(), requestBody); + final String uuid = UUID.randomUUID().toString(); + final Session session = new Session(uuid); + httpRequest.setSession(session); final HttpResponse httpResponse = new HttpResponse(HttpVersion.HTTP_1_1); InMemoryUserRepository.save(new User("hello", "world", "email@email.com")); diff --git a/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java b/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java index 7fd4f34bf9..ab848a092d 100644 --- a/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java +++ b/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java @@ -6,7 +6,9 @@ import java.io.IOException; import java.net.URL; import java.nio.file.Files; +import java.util.Collections; import org.apache.catalina.RequestAdapter; +import org.apache.catalina.RequestMapper; import org.apache.catalina.controller.StaticController; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; @@ -28,7 +30,7 @@ void index() throws IOException { ""); final var socket = new StubSocket(httpRequest); - final RequestAdapter requestAdapter = new RequestAdapter(new StaticController()); + final RequestAdapter requestAdapter = new RequestAdapter(new RequestMapper(Collections.emptyMap())); final Http11Processor processor = new Http11Processor(socket, requestAdapter); // when