From 4ce1dfe99b243078ea793c7879afe250b1d20496 Mon Sep 17 00:00:00 2001 From: Mikhail Filippov Date: Tue, 10 Jun 2025 17:58:30 +0400 Subject: [PATCH] DPE-72 drop JUnit3 from intellij.platform.jps.build.tests GitOrigin-RevId: f40a0aa8407c07fa62fec2f55be0db8be98e9646 --- .../artifacts/ArtifactBuilderTestCase.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java index d1299822cfca..9df4e0c4c6bc 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java +++ b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java @@ -8,6 +8,7 @@ import com.intellij.util.ArrayUtilRt; import com.intellij.util.io.DirectoryContentSpec; import com.intellij.util.io.TestFileSystemBuilder; import com.intellij.util.text.UniqueNameGenerator; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.CompileScopeTestBuilder; import org.jetbrains.jps.builders.JpsBuildTestCase; @@ -28,6 +29,7 @@ import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Set; import static com.intellij.util.io.TestFileSystemItem.fs; @@ -124,7 +126,14 @@ public abstract class ArtifactBuilderTestCase extends JpsBuildTestCase { } protected static String getJUnitJarPath() { - final File file = new File(assertOneElement(IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit3"))); + List<@NotNull String> files = IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit4"); + File file = null; + for (String path : files) { + if (path.contains("junit")) { + file = new File(path); + } + } + assertNotNull(file); assertTrue("File " + file.getAbsolutePath() + " doesn't exist", file.exists()); return FileUtilRt.toSystemIndependentName(file.getAbsolutePath()); }