서블릿 학습 테스트 코드 개선

.gitignore

@@ -171,3 +171,5 @@ Temporary Items
 
 tomcat.*
 tomcat.*/**
+
+**/WEB-INF/classes/**

study/src/main/java/servlet/com/example/TomcatStarter.java

@@ -44,6 +44,7 @@ public void await() {
     public void stop() {
         try {
             tomcat.stop();
+            tomcat.destroy();
         } catch (LifecycleException e) {
             throw new RuntimeException(e);
         }

study/src/test/java/servlet/com/example/FilterTest.java

@@ -1,19 +1,20 @@
 package servlet.com.example;
 
 import org.junit.jupiter.api.Test;
+import support.HttpUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static servlet.com.example.KoreanServlet.인코딩;
 
 class FilterTest {
 
     @Test
-    void testFilter() throws Exception {
+    void testFilter() {
         // 톰캣 서버 시작
-        final var tomcatStarter = TestHttpUtils.createTomcatStarter();
+        final var tomcatStarter = new TomcatStarter("src/main/webapp/");
         tomcatStarter.start();
 
-        final var response = TestHttpUtils.send("/korean");
+        final var response = HttpUtils.send("/korean");
 
         // 톰캣 서버 종료
         tomcatStarter.stop();

study/src/test/java/servlet/com/example/ServletTest.java

@@ -1,22 +1,25 @@
 package servlet.com.example;
 
 import org.junit.jupiter.api.Test;
+import support.HttpUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 class ServletTest {
 
+    private final String WEBAPP_DIR_LOCATION = "src/main/webapp/";
+
     @Test
-    void testSharedCounter() throws Exception {
+    void testSharedCounter() {
         // 톰캣 서버 시작
-        final var tomcatStarter = TestHttpUtils.createTomcatStarter();
+        final var tomcatStarter = new TomcatStarter(WEBAPP_DIR_LOCATION);
         tomcatStarter.start();
 
         // shared-counter 페이지를 3번 호출한다.
         final var PATH = "/shared-counter";
-        TestHttpUtils.send(PATH);
-        TestHttpUtils.send(PATH);
-        final var response = TestHttpUtils.send(PATH);
+        HttpUtils.send(PATH);
+        HttpUtils.send(PATH);
+        final var response = HttpUtils.send(PATH);
 
         // 톰캣 서버 종료
         tomcatStarter.stop();
@@ -29,16 +32,16 @@ void testSharedCounter() throws Exception {
     }
 
     @Test
-    void testLocalCounter() throws Exception {
+    void testLocalCounter() {
         // 톰캣 서버 시작
-        final var tomcatStarter = TestHttpUtils.createTomcatStarter();
+        final var tomcatStarter = new TomcatStarter(WEBAPP_DIR_LOCATION);
         tomcatStarter.start();
 
         // local-counter 페이지를 3번 호출한다.
         final var PATH = "/local-counter";
-        TestHttpUtils.send(PATH);
-        TestHttpUtils.send(PATH);
-        final var response = TestHttpUtils.send(PATH);
+        HttpUtils.send(PATH);
+        HttpUtils.send(PATH);
+        final var response = HttpUtils.send(PATH);
 
         // 톰캣 서버 종료
         tomcatStarter.stop();