From 0b50dba4586ceb91a9a95d4ac0e557da213716e4 Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 15 Dec 2023 17:54:04 +0200 Subject: [PATCH] Minor cleanup in tests discovery (#1538) --- .../kubernetes/tests/discovery/TestsDiscovery.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java index 78a281a4..38d86ea7 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java @@ -43,9 +43,10 @@ import org.junit.platform.launcher.core.LauncherFactory; public class TestsDiscovery { public static void main(String[] args) throws Exception { - List targetClasses = entireClasspath().stream().filter(x -> x.contains("target/classes")).toList(); + List classpathEntries = entireClasspath(); + List targetClasses = classpathEntries.stream().filter(x -> x.contains("target/classes")).toList(); List targetTestClasses = targetClasses.stream().map(x -> x.replace("classes", "test-classes")).toList(); - List jars = entireClasspath().stream().filter(x -> x.contains(".jar")).toList(); + List jars = classpathEntries.stream().filter(x -> x.contains(".jar")).toList(); List urls = Stream.of(targetClasses, targetTestClasses, jars).flatMap(List::stream) .map(x -> toURL(new File(x).toPath().toUri())).toList(); @@ -62,9 +63,9 @@ public class TestsDiscovery { Launcher launcher = session.getLauncher(); TestPlan testPlan = launcher.discover(request); testPlan.getRoots().stream().flatMap(x -> testPlan.getChildren(x).stream()) - .map(TestIdentifier::getLegacyReportingName).sorted().forEach(test -> { - System.out.println("spring.cloud.k8s.test.to.run -> " + test); - }); + .map(TestIdentifier::getLegacyReportingName).sorted().forEach(test -> + System.out.println("spring.cloud.k8s.test.to.run -> " + test) + ); } } @@ -75,7 +76,7 @@ public class TestsDiscovery { Thread.currentThread().setContextClassLoader(classLoader); } - // /tmp/deps.txt are created by the pipeline + // /tmp/deps.txt is created by the pipeline private static List entireClasspath() throws Exception { try (Stream lines = Files.lines(Paths.get("/tmp/deps.txt"))) { return lines.distinct().collect(Collectors.toList());