diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/jarRepositories.xml b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/jarRepositories.xml
index e3927c0e76d4..6d1efcb7a702 100644
--- a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/jarRepositories.xml
+++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/jarRepositories.xml
@@ -4,12 +4,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml
index 082ce484995b..f1829ac4916b 100644
--- a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml
+++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml
@@ -2,13 +2,13 @@
-
+
f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1
-
+
diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml
index 5b302fe8502b..704bbef8140d 100644
--- a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml
+++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml b/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml
index 75caa20a7a1e..154f3efb804a 100644
--- a/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml
+++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml
@@ -13,13 +13,13 @@
-
+
f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1
-
+
diff --git a/java/idea-ui/testData/testProjectBadChecksum/.idea/jarRepositories.xml b/java/idea-ui/testData/testProjectBadChecksum/.idea/jarRepositories.xml
index e3927c0e76d4..6d1efcb7a702 100644
--- a/java/idea-ui/testData/testProjectBadChecksum/.idea/jarRepositories.xml
+++ b/java/idea-ui/testData/testProjectBadChecksum/.idea/jarRepositories.xml
@@ -4,12 +4,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml
index a99e0aeb5cff..c79e24cb331e 100644
--- a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml
+++ b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml
@@ -2,13 +2,13 @@
-
+
badchecksum
-
+
diff --git a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml
index 43603c6129c9..6cba1b9c13b3 100644
--- a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml
+++ b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectBadChecksum/testProject.iml b/java/idea-ui/testData/testProjectBadChecksum/testProject.iml
index fa05d702b4ae..695fb0d9304a 100644
--- a/java/idea-ui/testData/testProjectBadChecksum/testProject.iml
+++ b/java/idea-ui/testData/testProjectBadChecksum/testProject.iml
@@ -13,13 +13,13 @@
-
+
badchecksumhere
-
+
diff --git a/java/idea-ui/testData/testProjectBase/.idea/jarRepositories.xml b/java/idea-ui/testData/testProjectBase/.idea/jarRepositories.xml
index e3927c0e76d4..6d1efcb7a702 100644
--- a/java/idea-ui/testData/testProjectBase/.idea/jarRepositories.xml
+++ b/java/idea-ui/testData/testProjectBase/.idea/jarRepositories.xml
@@ -4,12 +4,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibRelease.xml
index 3567576a9fcc..d623a3ac8763 100644
--- a/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibRelease.xml
+++ b/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibRelease.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibSnapshot.xml
index 43603c6129c9..6cba1b9c13b3 100644
--- a/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibSnapshot.xml
+++ b/java/idea-ui/testData/testProjectBase/.idea/libraries/smallSampleLibSnapshot.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectBase/testProject.iml b/java/idea-ui/testData/testProjectBase/testProject.iml
index 80ebb7eeb60b..84d44dca2c81 100644
--- a/java/idea-ui/testData/testProjectBase/testProject.iml
+++ b/java/idea-ui/testData/testProjectBase/testProject.iml
@@ -13,7 +13,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/jarRepositories.xml b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/jarRepositories.xml
index e3927c0e76d4..6d1efcb7a702 100644
--- a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/jarRepositories.xml
+++ b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/jarRepositories.xml
@@ -4,12 +4,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml
index 782e3e630611..d1e23c06aace 100644
--- a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml
+++ b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml
@@ -2,13 +2,13 @@
-
+
f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1
-
+
diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml
index 43603c6129c9..6cba1b9c13b3 100644
--- a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml
+++ b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml b/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml
index c3521962b264..c6b5a59c8cc1 100644
--- a/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml
+++ b/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml
@@ -13,13 +13,13 @@
-
+
f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1
-
+
diff --git a/java/idea-ui/testData/testProjectJarReposGuessed/.idea/jarRepositories.xml b/java/idea-ui/testData/testProjectJarReposGuessed/.idea/jarRepositories.xml
index e3927c0e76d4..6d1efcb7a702 100644
--- a/java/idea-ui/testData/testProjectJarReposGuessed/.idea/jarRepositories.xml
+++ b/java/idea-ui/testData/testProjectJarReposGuessed/.idea/jarRepositories.xml
@@ -4,12 +4,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibRelease.xml
index c928f7fa7b0e..5aa5b2d1f894 100644
--- a/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibRelease.xml
+++ b/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibRelease.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibSnapshot.xml
index 5b302fe8502b..704bbef8140d 100644
--- a/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibSnapshot.xml
+++ b/java/idea-ui/testData/testProjectJarReposGuessed/.idea/libraries/smallSampleLibSnapshot.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/java/idea-ui/testData/testProjectJarReposGuessed/testProject.iml b/java/idea-ui/testData/testProjectJarReposGuessed/testProject.iml
index a780b3d21a9c..3049e105640e 100644
--- a/java/idea-ui/testData/testProjectJarReposGuessed/testProject.iml
+++ b/java/idea-ui/testData/testProjectJarReposGuessed/testProject.iml
@@ -13,7 +13,7 @@
-
+
diff --git a/java/idea-ui/testSrc/com/intellij/jarRepository/RepositoryLibraryUtilsTest.kt b/java/idea-ui/testSrc/com/intellij/jarRepository/RepositoryLibraryUtilsTest.kt
index 9c7cae891f14..e62adf666d7b 100644
--- a/java/idea-ui/testSrc/com/intellij/jarRepository/RepositoryLibraryUtilsTest.kt
+++ b/java/idea-ui/testSrc/com/intellij/jarRepository/RepositoryLibraryUtilsTest.kt
@@ -1,7 +1,6 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.jarRepository
-import com.intellij.application.options.PathMacrosImpl
import com.intellij.openapi.application.PathMacros
import com.intellij.openapi.application.ex.PathManagerEx
import com.intellij.openapi.project.Project
@@ -22,14 +21,20 @@ import com.intellij.util.io.directoryContentOf
import junit.framework.TestCase.assertFalse
import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.runBlocking
-import org.junit.Before
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.Test
+import org.junit.*
import java.nio.file.Path
class RepositoryLibraryUtilsTest {
companion object {
+ /**
+ * See .idea/libraries/ in testData
+ */
+ private const val TEST_MAVEN_LOCAL_REPOSITORY_MACRO = "REPOSITORY_LIBRARY_UTILS_TEST_LOCAL_MAVEN_REPOSITORY"
+ /**
+ * See .idea/jarRepositories.xml in testData
+ */
+ private const val TEST_REMOTE_REPOSITORIES_ROOT_MACRO = "REPOSITORY_LIBRARY_UTILS_TEST_REMOTE_REPOSITORIES_ROOT"
+
@JvmField
@ClassRule
val applicationRule = ApplicationRule()
@@ -39,6 +44,23 @@ class RepositoryLibraryUtilsTest {
val m2Directory = TemporaryDirectory()
private val m2DirectoryPath by lazy { m2Directory.createDir() }
+
+ @BeforeClass
+ @JvmStatic
+ fun beforeAll() {
+ val pathMacros: PathMacros = PathMacros.getInstance()
+ pathMacros.setMacro(TEST_MAVEN_LOCAL_REPOSITORY_MACRO, m2DirectoryPath.toString())
+ JarRepositoryManager.setLocalRepositoryPath(m2DirectoryPath.toFile())
+ }
+
+ @AfterClass
+ @JvmStatic
+ fun afterAll() {
+ val pathMacros: PathMacros = PathMacros.getInstance()
+ pathMacros.setMacro(TEST_MAVEN_LOCAL_REPOSITORY_MACRO, null)
+ pathMacros.setMacro(TEST_REMOTE_REPOSITORIES_ROOT_MACRO, null)
+ JarRepositoryManager.setLocalRepositoryPath(null)
+ }
}
@JvmField
@@ -61,12 +83,7 @@ class RepositoryLibraryUtilsTest {
m2DirectoryPath.createDirectory()
val pathMacros: PathMacros = PathMacros.getInstance()
-
- /* tip: MAVEN_REPOSITORY macro is cached in JarRepositoryManager isn't updated each time */
- pathMacros.setMacro(PathMacrosImpl.MAVEN_REPOSITORY, m2DirectoryPath.toString())
-
- /* See .idea/jarRepositories.xml in testData */
- pathMacros.setMacro("TEST_REMOTE_REPOSITORIES_ROOT", "file://$testRemoteRepositoriesRoot")
+ pathMacros.setMacro(TEST_REMOTE_REPOSITORIES_ROOT_MACRO, "file://$testRemoteRepositoriesRoot")
}
@Test