Use separate local Maven repos when file system type is NTFS

junit-team · Jan 22, 2025 · 3923550 · 3923550
1 parent ba3a4ff
commit 3923550
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 14 deletions.
diff --git a/...tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/...tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -34,7 +34,7 @@
  */
 class JavaVersionsTests {
 
-	@GlobalResource
+	@ManagedResource
 	LocalMavenRepo localMavenRepo;
 
 	@TempDir

diff --git a/...rm-tooling-support-tests/src/test/java/platform/tooling/support/tests/LocalMavenRepo.java b/...rm-tooling-support-tests/src/test/java/platform/tooling/support/tests/LocalMavenRepo.java
@@ -10,14 +10,41 @@
 
 package platform.tooling.support.tests;
 
+import static platform.tooling.support.tests.ManagedResource.Scope.GLOBAL;
+import static platform.tooling.support.tests.ManagedResource.Scope.PER_CONTEXT;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
 
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+@ManagedResource.Scoped(LocalMavenRepo.ScopeProvider.class)
 public class LocalMavenRepo implements AutoCloseable {
 
+	public static class ScopeProvider implements ManagedResource.Scoped.Provider {
+
+		@Override
+		public ManagedResource.Scope determineScope(ExtensionContext extensionContext) {
+			var tmpDir = Path.of(System.getProperty("java.io.tmpdir"));
+			var fileSystemType = getFileSystemType(tmpDir);
+			extensionContext.publishReportEntry("tempFileSystemType", fileSystemType);
+			// Writing to the same file from multiple Maven processes may fail the build on Windows
+			return "NTFS".equalsIgnoreCase(fileSystemType) ? PER_CONTEXT : GLOBAL;
+		}
+
+		private static String getFileSystemType(Path path) {
+			try {
+				return Files.getFileStore(path).type();
+			}
+			catch (IOException e) {
+				throw new UncheckedIOException(e);
+			}
+		}
+	}
+
 	private final Path tempDir;
 
 	public LocalMavenRepo() {

diff --git a/...tooling/support/tests/GlobalResource.java → ...ooling/support/tests/ManagedResource.java b/...tooling/support/tests/GlobalResource.java → ...ooling/support/tests/ManagedResource.java
@@ -32,15 +32,30 @@
 
 @Target({ ElementType.PARAMETER, ElementType.FIELD })
 @Retention(RUNTIME)
-@ExtendWith(GlobalResource.Extension.class)
-public @interface GlobalResource {
+@ExtendWith(ManagedResource.Extension.class)
+public @interface ManagedResource {
+
+	@Target(ElementType.TYPE)
+	@Retention(RUNTIME)
+	@interface Scoped {
+
+		Class<? extends Provider> value();
+
+		interface Provider {
+			Scope determineScope(ExtensionContext extensionContext);
+		}
+	}
+
+	enum Scope {
+		GLOBAL, PER_CONTEXT
+	}
 
 	class Extension implements ParameterResolver, TestInstancePostProcessor {
 
 		@Override
 		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
 				throws ParameterResolutionException {
-			return parameterContext.isAnnotated(GlobalResource.class);
+			return parameterContext.isAnnotated(ManagedResource.class);
 		}
 
 		@Override
@@ -50,9 +65,14 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 			return getOrCreateResource(extensionContext, type).get();
 		}
 
+		@Override
+		public ExtensionContextScope getTestInstantiationExtensionContextScope(ExtensionContext rootContext) {
+			return ExtensionContextScope.TEST_METHOD;
+		}
+
 		@Override
 		public void postProcessTestInstance(Object testInstance, ExtensionContext extensionContext) {
-			streamFields(testInstance.getClass(), field -> AnnotationSupport.isAnnotated(field, GlobalResource.class),
+			streamFields(testInstance.getClass(), field -> AnnotationSupport.isAnnotated(field, ManagedResource.class),
 				HierarchyTraversalMode.BOTTOM_UP) //
 						.forEach(field -> {
 							try {
@@ -66,7 +86,16 @@ public void postProcessTestInstance(Object testInstance, ExtensionContext extens
 
 		@SuppressWarnings("unchecked")
 		private <T> Resource<T> getOrCreateResource(ExtensionContext extensionContext, Class<T> type) {
-			return extensionContext.getRoot().getStore(Namespace.GLOBAL) //
+			var scope = AnnotationSupport.findAnnotation(type, Scoped.class) //
+					.map(Scoped::value) //
+					.map(ReflectionSupport::newInstance) //
+					.map(provider -> provider.determineScope(extensionContext)) //
+					.orElse(Scope.GLOBAL);
+			var storingContext = switch (scope) {
+				case GLOBAL -> extensionContext.getRoot();
+				case PER_CONTEXT -> extensionContext;
+			};
+			return storingContext.getStore(Namespace.GLOBAL) //
 					.getOrComputeIfAbsent(type, Resource::new, Resource.class);
 		}
 	}

diff --git a/...tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/...tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -32,10 +32,10 @@
  */
 class MavenStarterTests {
 
-	@GlobalResource
+	@ManagedResource
 	LocalMavenRepo localMavenRepo;
 
-	@GlobalResource
+	@ManagedResource
 	MavenRepoProxy mavenRepoProxy;
 
 	@Test

diff --git a/...t-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java b/...t-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
@@ -33,7 +33,7 @@
  */
 class MavenSurefireCompatibilityTests {
 
-	@GlobalResource
+	@ManagedResource
 	LocalMavenRepo localMavenRepo;
 
 	@ParameterizedTest

diff --git a/...ling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/...ling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -33,10 +33,10 @@
  */
 class MultiReleaseJarTests {
 
-	@GlobalResource
+	@ManagedResource
 	LocalMavenRepo localMavenRepo;
 
-	@GlobalResource
+	@ManagedResource
 	MavenRepoProxy mavenRepoProxy;
 
 	@Test

diff --git a/...g-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java b/...g-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java
@@ -37,10 +37,10 @@
  */
 class UnalignedClasspathTests {
 
-	@GlobalResource
+	@ManagedResource
 	LocalMavenRepo localMavenRepo;
 
-	@GlobalResource
+	@ManagedResource
 	MavenRepoProxy mavenRepoProxy;
 
 	@ParameterizedTest

diff --git a/...port-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/...port-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -29,7 +29,7 @@
 
 class VintageMavenIntegrationTests {
 
-	@GlobalResource
+	@ManagedResource
 	LocalMavenRepo localMavenRepo;
 
 	@TempDir