Reduce scope of try-catch block

Author: marcphilipp

junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DiscoveryIssueCollector.java

@@ -10,6 +10,7 @@
 
 package org.junit.platform.launcher.core;
 
+import static org.junit.platform.commons.util.UnrecoverableExceptions.rethrowIfUnrecoverable;
 import static org.junit.platform.engine.SelectorResolutionResult.Status.FAILED;
 import static org.junit.platform.engine.SelectorResolutionResult.Status.UNRESOLVED;
 
@@ -67,7 +68,7 @@ public void selectorProcessed(UniqueId engineId, DiscoverySelector selector, Sel
 		if (result.getStatus() == FAILED) {
 			this.issues.add(DiscoveryIssue.builder(Severity.ERROR, selector + " resolution failed") //
 					.cause(result.getThrowable()) //
-					.source(toSourceSafely(selector)) //
+					.source(toSource(selector)) //
 					.build());
 		}
 		else if (result.getStatus() == UNRESOLVED && selector instanceof UniqueIdSelector uniqueIdSelector) {
@@ -78,16 +79,6 @@ else if (result.getStatus() == UNRESOLVED && selector instanceof UniqueIdSelecto
 		}
 	}
 
-	private static @Nullable TestSource toSourceSafely(DiscoverySelector selector) {
-		try {
-			return toSource(selector);
-		}
-		catch (Exception e) {
-			logger.error(e, () -> "Failed to convert DiscoverySelector [%s] into TestSource".formatted(selector));
-			return null;
-		}
-	}
-
 	private static @Nullable TestSource toSource(DiscoverySelector selector) {
 		if (selector instanceof ClassSelector classSelector) {
 			return ClassSource.from(classSelector.getClassName());
@@ -106,17 +97,26 @@ else if (result.getStatus() == UNRESOLVED && selector instanceof UniqueIdSelecto
 		if (selector instanceof PackageSelector packageSelector) {
 			return PackageSource.from(packageSelector.getPackageName());
 		}
-		if (selector instanceof FileSelector fileSelector) {
-			return fileSelector.getPosition() //
-					.map(DiscoveryIssueCollector::convert) //
-					.map(position -> FileSource.from(fileSelector.getFile(), position)) //
-					.orElseGet(() -> FileSource.from(fileSelector.getFile()));
-		}
-		if (selector instanceof DirectorySelector directorySelector) {
-			return DirectorySource.from(directorySelector.getDirectory());
+		try {
+			// Both FileSource and DirectorySource call File.getCanonicalFile() to normalize the reported file which
+			// can throw an exception for certain file names on certain file systems. UriSource.from(...) is affected
+			// as well because it may return a FileSource or DirectorySource
+			if (selector instanceof FileSelector fileSelector) {
+				return fileSelector.getPosition() //
+						.map(DiscoveryIssueCollector::convert) //
+						.map(position -> FileSource.from(fileSelector.getFile(), position)) //
+						.orElseGet(() -> FileSource.from(fileSelector.getFile()));
+			}
+			if (selector instanceof DirectorySelector directorySelector) {
+				return DirectorySource.from(directorySelector.getDirectory());
+			}
+			if (selector instanceof UriSelector uriSelector) {
+				return UriSource.from(uriSelector.getUri());
+			}
 		}
-		if (selector instanceof UriSelector uriSelector) {
-			return UriSource.from(uriSelector.getUri());
+		catch (Exception ex) {
+			rethrowIfUnrecoverable(ex);
+			logger.warn(ex, () -> "Failed to convert DiscoverySelector [%s] into TestSource".formatted(selector));
 		}
 		return null;
 	}