MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

DPE-72 drop JUnit3 from intellij.java.ui.tests

Browse Source 
GitOrigin-RevId: b605052715852a9dfed0bffd7cdcd539fb16c839
This commit is contained in:
Mikhail Filippov
2025-06-11 09:27:56 +00:00
committed by intellij-monorepo-bot
parent d3a2d009cb
commit 536f418728
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/BUILD.bazel
+1
View File
@@ -110,6 +110,7 @@ jvm_library(
"//platform/workspace/storage",
"//xml/xml-psi-api:psi",
"//libraries/io",
"//platform/build-scripts/downloader",
]
)
java/idea-ui/intellij.java.ui.tests.iml
+1
View File
@@ -36,5 +36,6 @@
<orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
<orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.io" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.buildScripts.downloader" scope="TEST" />
</component>
</module>
java/idea-ui/testSrc/com/intellij/facet/FacetLibrariesValidatorTest.java
+11 -11
View File
@@ -28,9 +28,9 @@ public class FacetLibrariesValidatorTest extends FacetTestCase {
private MockFacetValidatorsManager myValidatorsManager;
private static final LibraryInfo
FAST_UTIL = new LibraryInfo("fastutil.jar", (String)null, null, null, "it.unimi.dsi.fastutil.objects.ObjectOpenHashSet");
private static final LibraryInfo JUNIT = new LibraryInfo("junit.jar", (String)null, null, null, "junit.framework.TestCase");
private static final LibraryInfo HASH4J = new LibraryInfo("hash4j.jar", (String)null, null, null, "com.dynatrace.hash4j.hashing.Hasher");
private VirtualFile myFastUtilJar;
private VirtualFile myJUnitJar;
private VirtualFile myHash4jJar;
@NonNls private static final String LIB_NAME = "lib";
private MockFacet myFacet;
private FacetLibrariesValidatorDescription myDescription;
@@ -41,7 +41,7 @@ public class FacetLibrariesValidatorTest extends FacetTestCase {
myValidatorsManager = new MockFacetValidatorsManager();
myFacet = createFacet();
myFastUtilJar = IntelliJProjectConfiguration.getJarFromSingleJarProjectLibrary("fastutil-min");
myJUnitJar = IntelliJProjectConfiguration.getJarFromSingleJarProjectLibrary("JUnit3");
myHash4jJar = IntelliJProjectConfiguration.getJarFromSingleJarProjectLibrary("hash4j");
myDescription = new FacetLibrariesValidatorDescription(LIB_NAME);
}
@@ -75,27 +75,27 @@ public class FacetLibrariesValidatorTest extends FacetTestCase {
validator.setRequiredLibraries(LibraryInfo.EMPTY_ARRAY);
assertNoErrors();
validator.setRequiredLibraries(new LibraryInfo[]{JUNIT});
assertError("junit.jar");
validator.setRequiredLibraries(new LibraryInfo[]{HASH4J});
assertError("hash4j.jar");
}
public void testAddJars() {
final FacetLibrariesValidatorImpl validator = createValidator(FAST_UTIL, JUNIT);
final FacetLibrariesValidatorImpl validator = createValidator(FAST_UTIL, HASH4J);
assertError("");
ModuleRootModificationUtil.addModuleLibrary(myModule, myFastUtilJar.getUrl());
IndexingTestUtil.waitUntilIndexesAreReady(myProject);
myValidatorsManager.validate();
assertError("junit");
assertError("hash4j");
ModuleRootModificationUtil.addModuleLibrary(myModule, myJUnitJar.getUrl());
ModuleRootModificationUtil.addModuleLibrary(myModule, myHash4jJar.getUrl());
IndexingTestUtil.waitUntilIndexesAreReady(myProject);
myValidatorsManager.validate();
validator.onFacetInitialized(createFacet());
final List<VirtualFile> classpath = Arrays.asList(OrderEnumerator.orderEntries(myModule).getClassesRoots());
assertTrue(classpath.contains(myFastUtilJar));
assertTrue(classpath.contains(myJUnitJar));
assertTrue(classpath.contains(myHash4jJar));
}
public void testUnresolvedLibrary() {
@@ -104,8 +104,8 @@ public class FacetLibrariesValidatorTest extends FacetTestCase {
}
public void testLibrary() {
PsiTestUtil.addProjectLibrary(myModule, "lib1", myFastUtilJar, myJUnitJar);
createValidator(FAST_UTIL, JUNIT);
PsiTestUtil.addProjectLibrary(myModule, "lib1", myFastUtilJar, myHash4jJar);
createValidator(FAST_UTIL, HASH4J);
assertNoErrors();
}