This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/master by this push:
     new 07ca88b67 Keep the mojo tests' temporary files in @TempDir
07ca88b67 is described below

commit 07ca88b6728bc77075946a666f330f0b291c2082
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Mon Nov 9 11:12:27 2026 +0000

    Keep the mojo tests' temporary files in @TempDir
    
    They created files and fake classes directories through
    SureFireFileManager, whose exit hook deletes only the files it created,
    so every directory holding an AnotherTest.class stayed in the system
    temp directory, and with it surefire-<user>. shouldExistTmpDirectory
    now deletes the directories it creates in the temp and build
    directories.
---
 .../plugin/surefire/AbstractSurefireMojoTest.java  | 90 ++++++++++------------
 .../maven/plugin/surefire/MojoMocklessTest.java    | 39 +++++-----
 2 files changed, 59 insertions(+), 70 deletions(-)

diff --git 
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
 
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 024d83719..9177b0dc2 100644
--- 
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++ 
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -59,7 +59,6 @@
 import org.apache.maven.surefire.api.testset.TestListResolver;
 import org.apache.maven.surefire.api.util.DefaultScanResult;
 import org.apache.maven.surefire.api.util.RunOrder;
-import org.apache.maven.surefire.api.util.SureFireFileManager;
 import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
 import org.apache.maven.surefire.booter.Classpath;
 import org.apache.maven.surefire.booter.ModularClasspathConfiguration;
@@ -816,24 +815,33 @@ public void shouldExistTmpDirectory() throws IOException {
         when(mojo.createSurefireBootDirectoryInBuild()).thenCallRealMethod();
         when(mojo.getSurefireTempDir()).thenCallRealMethod();
 
-        File bootDir = mojo.createSurefireBootDirectoryInTemp();
-        assertThat(bootDir).isNotNull();
-        assertThat(bootDir).isDirectory();
-
-        assertThat(new File(systemTmpDir, bootDir.getName())).isDirectory();
-        assertThat(bootDir.getName()).startsWith(tmpDir);
-
-        File buildTmp = mojo.createSurefireBootDirectoryInBuild();
-        assertThat(buildTmp).isNotNull();
-        assertThat(buildTmp).isDirectory();
-        
assertThat(buildTmp.getParentFile().getCanonicalFile().getParent()).isEqualTo(usrDir);
-        assertThat(buildTmp.getName()).isEqualTo(tmpDir);
-
-        File tmp = mojo.getSurefireTempDir();
-        assertThat(tmp).isNotNull();
-        assertThat(tmp).isDirectory();
-        assertThat(IS_OS_WINDOWS ? new File(systemTmpDir, bootDir.getName()) : 
new File(targetDir, tmpDir))
-                .isDirectory();
+        File bootDir = null;
+        try {
+            bootDir = mojo.createSurefireBootDirectoryInTemp();
+            assertThat(bootDir).isNotNull();
+            assertThat(bootDir).isDirectory();
+
+            assertThat(new File(systemTmpDir, 
bootDir.getName())).isDirectory();
+            assertThat(bootDir.getName()).startsWith(tmpDir);
+
+            File buildTmp = mojo.createSurefireBootDirectoryInBuild();
+            assertThat(buildTmp).isNotNull();
+            assertThat(buildTmp).isDirectory();
+            
assertThat(buildTmp.getParentFile().getCanonicalFile().getParent()).isEqualTo(usrDir);
+            assertThat(buildTmp.getName()).isEqualTo(tmpDir);
+
+            File tmp = mojo.getSurefireTempDir();
+            assertThat(tmp).isNotNull();
+            assertThat(tmp).isDirectory();
+            assertThat(IS_OS_WINDOWS ? new File(systemTmpDir, 
bootDir.getName()) : new File(targetDir, tmpDir))
+                    .isDirectory();
+        } finally {
+            if (bootDir != null) {
+                FileUtils.deleteDirectory(bootDir);
+            }
+            FileUtils.deleteDirectory(new File(systemTmpDir, tmpDir));
+            FileUtils.deleteDirectory(new File(targetDir, tmpDir));
+        }
     }
 
     @Test
@@ -2492,7 +2500,8 @@ public void setExcludeJUnit5Engines(String[] 
excludeJUnit5Engines) {
     public void shouldNotPerformMethodFilteringOnIncludes() throws Exception {
         Mojo plugin = new Mojo();
 
-        File includesExcludes = SureFireFileManager.createTempFile("surefire", 
"includes");
+        File includesExcludes =
+                Files.createTempFile(tempFolder, "surefire", 
"includes").toFile();
         FileUtils.write(includesExcludes, "AnotherTest#method", UTF_8);
         plugin.setIncludesFile(includesExcludes);
 
@@ -2503,8 +2512,7 @@ public void shouldNotPerformMethodFilteringOnIncludes() 
throws Exception {
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"jar", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
".jar");
-        artifactFile.deleteOnExit();
+        File artifactFile = Files.createTempFile(tempFolder, "surefire", 
".jar").toFile();
         testDeps.setFile(artifactFile);
         plugin.setProjectTestArtifacts(singletonList(testDeps));
         plugin.setDependenciesToScan(new String[] {"g:a"});
@@ -2519,18 +2527,14 @@ public void shouldFilterTestsOnIncludesFile() throws 
Exception {
 
         plugin.setLogger(mock(Logger.class));
 
-        File includes = SureFireFileManager.createTempFile("surefire", 
"includes");
+        File includes = Files.createTempFile(tempFolder, "surefire", 
"includes").toFile();
         FileUtils.write(includes, "AnotherTest#method", UTF_8);
         plugin.setIncludesFile(includes);
 
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"test-jar", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
"classes");
-        String classDir = artifactFile.getCanonicalPath();
-        assertThat(artifactFile.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
         testDeps.setFile(classes);
         assertThat(new File(classes, 
"AnotherTest.class").createNewFile()).isTrue();
         plugin.setProjectTestArtifacts(singletonList(testDeps));
@@ -2547,18 +2551,15 @@ public void shouldFilterTestsOnExcludesFile() throws 
Exception {
 
         plugin.setLogger(mock(Logger.class));
 
-        File excludes = SureFireFileManager.createTempFile("surefire", 
"-excludes");
+        File excludes =
+                Files.createTempFile(tempFolder, "surefire", 
"-excludes").toFile();
         FileUtils.write(excludes, "AnotherTest", UTF_8);
         plugin.setExcludesFile(excludes);
 
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"test-jar", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
"-classes");
-        String classDir = artifactFile.getCanonicalPath();
-        assertThat(artifactFile.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
         testDeps.setFile(classes);
         assertThat(new File(classes, 
"AnotherTest.class").createNewFile()).isTrue();
         plugin.setProjectTestArtifacts(singletonList(testDeps));
@@ -2579,11 +2580,7 @@ public void shouldFilterTestsOnExcludes() throws 
Exception {
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"jar", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
"-classes");
-        String classDir = artifactFile.getCanonicalPath();
-        assertThat(artifactFile.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
         testDeps.setFile(classes);
         assertThat(new File(classes, 
"AnotherTest.class").createNewFile()).isTrue();
         plugin.setProjectTestArtifacts(singletonList(testDeps));
@@ -2604,11 +2601,7 @@ public void shouldFilterTestMethodsOnExcludes() throws 
Exception {
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"test-jar", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
"-classes");
-        String classDir = artifactFile.getCanonicalPath();
-        assertThat(artifactFile.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
         testDeps.setFile(classes);
         assertThat(new File(classes, 
"AnotherTest.class").createNewFile()).isTrue();
         plugin.setProjectTestArtifacts(singletonList(testDeps));
@@ -2654,7 +2647,8 @@ public void shouldUseOnlySpecificTests() throws Exception 
{
 
         plugin.setLogger(mock(Logger.class));
 
-        File includes = SureFireFileManager.createTempFile("surefire", 
"-includes");
+        File includes =
+                Files.createTempFile(tempFolder, "surefire", 
"-includes").toFile();
         FileUtils.write(includes, "AnotherTest", UTF_8);
         plugin.setIncludesFile(includes);
         plugin.setTest("DifferentTest");
@@ -2662,11 +2656,7 @@ public void shouldUseOnlySpecificTests() throws 
Exception {
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"test-jar", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
"-classes");
-        String classDir = artifactFile.getCanonicalPath();
-        assertThat(artifactFile.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
         testDeps.setFile(classes);
         assertThat(new File(classes, 
"AnotherTest.class").createNewFile()).isTrue();
         plugin.setProjectTestArtifacts(singletonList(testDeps));
diff --git 
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
 
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
index 9cc1c6296..7acf75bd1 100644
--- 
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
+++ 
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -39,10 +40,10 @@
 import org.apache.maven.surefire.api.testset.RunOrderParameters;
 import org.apache.maven.surefire.api.util.DefaultScanResult;
 import org.apache.maven.surefire.api.util.RunOrder;
-import org.apache.maven.surefire.api.util.SureFireFileManager;
 import org.apache.maven.surefire.extensions.ForkNodeFactory;
 import org.apache.maven.surefire.providerapi.ProviderInfo;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 
 import static java.util.Arrays.asList;
@@ -55,6 +56,8 @@
  *
  */
 public class MojoMocklessTest {
+    @TempDir
+    Path tempFolder;
 
     @SuppressWarnings("unchecked")
     private static <T> T invokeMethod(Object target, String methodName, 
Object... args) throws Exception {
@@ -101,7 +104,8 @@ private static void setInternalState(Object target, String 
fieldName, Object val
     @Test
     public void 
testGetStartupReportConfigurationUsesProvidedRunStatisticsFile() throws 
Exception {
         AbstractSurefireMojo surefirePlugin = new Mojo(null, null);
-        File runStatisticsFile = 
SureFireFileManager.createTempFile(".surefire-", "checksum");
+        File runStatisticsFile =
+                Files.createTempFile(tempFolder, ".surefire-", 
"checksum").toFile();
         RunOrderParameters runOrderParameters = new 
RunOrderParameters(RunOrder.DEFAULT, runStatisticsFile);
         StartupReportConfiguration config = invokeMethod(
                 surefirePlugin, "getStartupReportConfiguration", false, 
mock(ProviderInfo.class), runOrderParameters);
@@ -112,8 +116,9 @@ public void 
testGetStartupReportConfigurationUsesProvidedRunStatisticsFile() thr
     @Test
     public void testGetStartupReportConfiguration() throws Exception {
         AbstractSurefireMojo surefirePlugin = new Mojo(null, null);
-        RunOrderParameters runOrderParameters =
-                new RunOrderParameters(RunOrder.DEFAULT, 
SureFireFileManager.createTempFile(".surefire-", "checksum"));
+        RunOrderParameters runOrderParameters = new RunOrderParameters(
+                RunOrder.DEFAULT,
+                Files.createTempFile(tempFolder, ".surefire-", 
"checksum").toFile());
         StartupReportConfiguration config = invokeMethod(
                 surefirePlugin, "getStartupReportConfiguration", false, 
mock(ProviderInfo.class), runOrderParameters);
 
@@ -127,8 +132,9 @@ public void testGetStartupReportConfiguration() throws 
Exception {
     @Test
     public void testGetStartupReportConfiguration2() throws Exception {
         AbstractSurefireMojo surefirePlugin = new Mojo(null, null);
-        RunOrderParameters runOrderParameters =
-                new RunOrderParameters(RunOrder.DEFAULT, 
SureFireFileManager.createTempFile(".surefire-", "checksum"));
+        RunOrderParameters runOrderParameters = new RunOrderParameters(
+                RunOrder.DEFAULT,
+                Files.createTempFile(tempFolder, ".surefire-", 
"checksum").toFile());
         SurefireStatelessReporter xmlReporter = new 
SurefireStatelessReporter();
         SurefireConsoleOutputReporter consoleReporter = new 
SurefireConsoleOutputReporter();
         SurefireStatelessTestsetInfoReporter testsetInfoReporter = new 
SurefireStatelessTestsetInfoReporter();
@@ -217,7 +223,7 @@ public void 
scanDependenciesShouldReturnNullWithExistingWAR() throws Exception {
         VersionRange version = VersionRange.createFromVersion("1.0");
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"war", null, handler);
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
".war");
+        File artifactFile = Files.createTempFile(tempFolder, "surefire", 
".war").toFile();
         testDeps.setFile(artifactFile);
         List<Artifact> projectTestArtifacts = singletonList(testDeps);
         String[] dependenciesToScan = {"g:a"};
@@ -232,7 +238,7 @@ public void 
scanDependenciesShouldReturnClassWithExistingTestJAR() throws Except
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"test-jar", null, handler);
 
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
".jar");
+        File artifactFile = Files.createTempFile(tempFolder, "surefire", 
".jar").toFile();
         testDeps.setFile(artifactFile);
         try (ZipOutputStream os = new 
ZipOutputStream(Files.newOutputStream(artifactFile.toPath()))) {
             os.putNextEntry(new ZipEntry("pkg/"));
@@ -261,7 +267,7 @@ public void 
scanDependenciesShouldReturnNullWithEmptyTestJAR() throws Exception
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"jar", null, handler);
 
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
".jar");
+        File artifactFile = Files.createTempFile(tempFolder, "surefire", 
".jar").toFile();
         testDeps.setFile(artifactFile);
         try (ZipOutputStream os = new 
ZipOutputStream(Files.newOutputStream(artifactFile.toPath()))) {
             os.putNextEntry(new ZipEntry("pkg/"));
@@ -286,11 +292,7 @@ public void 
scanDependenciesShouldReturnClassWithDirectory() throws Exception {
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDeps = new DefaultArtifact("g", "a", version, "compile", 
"test-jar", null, handler);
 
-        File artifactFile = SureFireFileManager.createTempFile("surefire", 
"-classes");
-        String classDir = artifactFile.getCanonicalPath();
-        assertThat(artifactFile.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
 
         testDeps.setFile(classes);
 
@@ -315,18 +317,15 @@ public void scanMultipleDependencies() throws Exception {
         ArtifactHandler handler = new DefaultArtifactHandler();
         Artifact testDep1 = new DefaultArtifact("g", "x", version, "compile", 
"jar", null, handler);
 
-        File artifactFile1 = SureFireFileManager.createTempFile("surefire", 
"-classes");
-        String classDir = artifactFile1.getCanonicalPath();
-        assertThat(artifactFile1.delete()).isTrue();
-        File classes = new File(classDir);
-        assertThat(classes.mkdir()).isTrue();
+        File classes = Files.createTempDirectory(tempFolder, 
"surefire-classes").toFile();
 
         testDep1.setFile(classes);
 
         assertThat(new File(classes, 
"AnotherTest.class").createNewFile()).isTrue();
 
         Artifact testDep2 = new DefaultArtifact("g", "a", version, "test", 
"jar", null, handler);
-        File artifactFile2 = SureFireFileManager.createTempFile("surefire", 
".jar");
+        File artifactFile2 =
+                Files.createTempFile(tempFolder, "surefire", ".jar").toFile();
         testDep2.setFile(artifactFile2);
         try (ZipOutputStream os = new 
ZipOutputStream(Files.newOutputStream(artifactFile2.toPath()))) {
             os.putNextEntry(new ZipEntry("pkg/"));

Reply via email to