diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index 719dbe1e0adf..8f51b8ce41db 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -110,6 +110,7 @@ jvm_library( "//platform/workspace/storage", "//xml/xml-psi-api:psi", "//libraries/io", + "//platform/build-scripts/downloader", ] ) diff --git a/java/idea-ui/intellij.java.ui.tests.iml b/java/idea-ui/intellij.java.ui.tests.iml index 428b1bef061e..69eef5445c00 100644 --- a/java/idea-ui/intellij.java.ui.tests.iml +++ b/java/idea-ui/intellij.java.ui.tests.iml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/java/idea-ui/testSrc/com/intellij/facet/FacetLibrariesValidatorTest.java b/java/idea-ui/testSrc/com/intellij/facet/FacetLibrariesValidatorTest.java index bb7545b9cc84..1be534dd707a 100644 --- a/java/idea-ui/testSrc/com/intellij/facet/FacetLibrariesValidatorTest.java +++ b/java/idea-ui/testSrc/com/intellij/facet/FacetLibrariesValidatorTest.java @@ -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 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(); }