Delete temporary directory in tomcat servlet3 tests (#12455)

open-telemetry · Oct 17, 2024 · aa12231 · aa12231
1 parent 799aca2
commit aa12231
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/...entelemetry/javaagent/instrumentation/servlet/v3_0/mapping/TomcatServlet3MappingTest.java b/...entelemetry/javaagent/instrumentation/servlet/v3_0/mapping/TomcatServlet3MappingTest.java
@@ -6,30 +6,28 @@
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.mapping;
 
 import java.io.File;
-import java.nio.file.Files;
 import java.util.UUID;
 import javax.servlet.Servlet;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.startup.Tomcat;
+import org.junit.jupiter.api.io.TempDir;
 
 class TomcatServlet3MappingTest extends AbstractServlet3MappingTest<Tomcat, Context> {
+  @TempDir private static File tempDir;
+
   @Override
   protected Tomcat setupServer() throws Exception {
     Tomcat tomcatServer = new Tomcat();
 
-    File baseDir = Files.createTempDirectory("tomcat").toFile();
-    baseDir.deleteOnExit();
+    File baseDir = tempDir;
     tomcatServer.setBaseDir(baseDir.getAbsolutePath());
 
     tomcatServer.setPort(port);
     tomcatServer.getConnector().setEnableLookups(true); // get localhost instead of 127.0.0.1
 
     File applicationDir = new File(baseDir, "/webapps/ROOT");
-    if (!applicationDir.exists()) {
-      applicationDir.mkdirs();
-      applicationDir.deleteOnExit();
-    }
+    applicationDir.mkdirs();
 
     Context servletContext =
         tomcatServer.addWebapp(getContextPath(), applicationDir.getAbsolutePath());

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java b/...va/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java
@@ -23,7 +23,6 @@
 import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest;
 import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
 import java.io.File;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +40,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -66,6 +66,8 @@ public abstract class TomcatServlet3Test extends AbstractServlet3Test<Tomcat, Co
           false);
   private final TestAccessLogValve accessLogValue = new TestAccessLogValve();
 
+  @TempDir private static File tempDir;
+
   @Override
   protected void configure(HttpServerTestOptions options) {
     super.configure(options);
@@ -98,18 +100,14 @@ protected boolean hasResponseSpan(ServerEndpoint endpoint) {
   protected Tomcat setupServer() throws Exception {
     Tomcat tomcatServer = new Tomcat();
 
-    File baseDir = Files.createTempDirectory("tomcat").toFile();
-    baseDir.deleteOnExit();
+    File baseDir = tempDir;
     tomcatServer.setBaseDir(baseDir.getAbsolutePath());
 
     tomcatServer.setPort(port);
     tomcatServer.getConnector().setEnableLookups(true); // get localhost instead of 127.0.0.1
 
     File applicationDir = new File(baseDir, "/webapps/ROOT");
-    if (!applicationDir.exists()) {
-      applicationDir.mkdirs();
-      applicationDir.deleteOnExit();
-    }
+    applicationDir.mkdirs();
 
     Context servletContext =
         tomcatServer.addWebapp(getContextPath(), applicationDir.getAbsolutePath());