Skip to content

Delete temporary directory in tomcat servlet3 tests #12455

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

Merged
merged 3 commits into from
Oct 17, 2024
Merged

Delete temporary directory in tomcat servlet3 tests #12455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
978db3a
Delete temporary directory in tomcat servlet3 tests
laurit Oct 17, 2024
0764453
spotless
laurit Oct 17, 2024
9f73822
Merge branch 'main' into tomcat-tmp-dir
laurit Oct 17, 2024
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
12 changes: 5 additions & 7 deletions ...entelemetry/javaagent/instrumentation/servlet/v3_0/mapping/TomcatServlet3MappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
12 changes: 5 additions & 7 deletions ...va/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

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