[maven][test][eel][IDEA-361665] MavenTestCase: rename repositoryFile to repositoryPath

GitOrigin-RevId: fda728ce36c2d85c420e8ae79f1f805fbe1496ea

plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenPluginInfoReaderTest.kt

@@ -27,8 +27,8 @@ class MavenPluginInfoReaderTest : MavenTestCase() {
 
   override fun setUp() {
     super.setUp()
-    repositoryFile = MavenCustomRepositoryHelper(dir, "plugins").getTestData("plugins")
-    p = MavenArtifactUtil.readPluginInfo(Path.of(repositoryFile.toAbsolutePath().toString(), "org/apache/maven/plugins", "maven-compiler-plugin", "2.0.2", "maven-compiler-plugin-2.0.2.jar"))
+    repositoryPath = MavenCustomRepositoryHelper(dir, "plugins").getTestData("plugins")
+    p = MavenArtifactUtil.readPluginInfo(Path.of(repositoryPath.toAbsolutePath().toString(), "org/apache/maven/plugins", "maven-compiler-plugin", "2.0.2", "maven-compiler-plugin-2.0.2.jar"))
   }
 
   fun testLoadingPluginInfo() {

plugins/maven/src/test/java/org/jetbrains/idea/maven/compatibility/MavenCompatibilityProjectImportingTest.kt

@@ -93,7 +93,7 @@ class MavenCompatibilityProjectImportingTest : MavenImportingTestCase() {
 
     val helper = MavenCustomRepositoryHelper(dir, "local1")
     val repoPath = helper.getTestData("local1")
-    repositoryFile = repoPath
+    repositoryPath = repoPath
   }
 
   @After
@@ -106,7 +106,7 @@ class MavenCompatibilityProjectImportingTest : MavenImportingTestCase() {
   fun testExceptionsFromMavenExtensionsAreReportedAsProblems() = runBlocking {
     assumeVersionAtLeast("3.1.0")
     val helper = MavenCustomRepositoryHelper(dir, "plugins")
-    repositoryFile = helper.getTestData("plugins")
+    repositoryPath = helper.getTestData("plugins")
     mavenGeneralSettings.isWorkOffline = true
 
     createProjectPom("""

plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.kt

@@ -461,7 +461,7 @@ $relativePathUnixSeparator<caret></relativePath>
   fun testResolveLATESTDependency() = runBlocking {
     val helper = MavenCustomRepositoryHelper(dir, "local1")
     val repoPath = helper.getTestData("local1")
-    repositoryFile = repoPath
+    repositoryPath = repoPath
 
     updateProjectPom("""
                     <groupId>test</groupId>

plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt

@@ -687,7 +687,7 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() {
   fun testResolvingSettingsModelProperties() = runBlocking {
     val profiles = updateSettingsXml("""
   <localRepository>
-  ${repositoryFile}</localRepository>
+  ${repositoryPath}</localRepository>
   """.trimIndent())
 
     updateProjectPom("""

plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.kt

@@ -543,42 +543,42 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
     assertAllProductionSearchScope("m1",
                                    "$projectPath/m1/src/main/java",
                                    "$projectPath/m2/src/main/java",
-                                   "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                                   "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
     assertAllTestsSearchScope("m1",
                               "$projectPath/m1/src/main/java",
                               "$projectPath/m1/src/test/java",
                               "$projectPath/m2/src/main/java",
-                              "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                              "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
 
     assertAllProductionClasspath("m1",
                                  "$projectPath/m1/target/classes",
                                  "$projectPath/m2/target/classes",
-                                 "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                                 "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
     assertAllTestsClasspath("m1",
                             "$projectPath/m1/target/test-classes",
                             "$projectPath/m1/target/classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                            "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
 
     assertAllProductionSearchScope("m2",
                                    "$projectPath/m2/src/main/java",
-                                   "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar",
-                                   "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                   "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar",
+                                   "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertAllTestsSearchScope("m2",
                               "$projectPath/m2/src/main/java",
                               "$projectPath/m2/src/test/java",
-                              "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar",
-                              "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                              "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar",
+                              "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertAllProductionClasspath("m2",
                                  "$projectPath/m2/target/classes",
-                                 "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar",
-                                 "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                 "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar",
+                                 "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertAllTestsClasspath("m2",
                             "$projectPath/m2/target/test-classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar",
-                            "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                            "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar",
+                            "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
   }
 
   @Test
@@ -641,32 +641,32 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
     assertCompileProductionSearchScope("m1",
                                        "$projectPath/m1/src/main/java",
                                        "$projectPath/m2/src/main/java",
-                                       "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                       "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertRuntimeProductionSearchScope("m1",
                                        "$projectPath/m1/src/main/java",
                                        "$projectPath/m2/src/main/java",
-                                       "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                       "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertAllTestsSearchScope("m1",
                               "$projectPath/m1/src/main/java",
                               "$projectPath/m1/src/test/java",
                               "$projectPath/m2/src/main/java",
-                              "$repositoryFile/junit/junit/4.0/junit-4.0.jar",
+                              "$repositoryPath/junit/junit/4.0/junit-4.0.jar",
                               "$projectPath/m3/src/main/java",
-                              "$repositoryFile/jmock/jmock/4.0/jmock-4.0.jar")
+                              "$repositoryPath/jmock/jmock/4.0/jmock-4.0.jar")
 
     assertCompileProductionClasspath("m1",
                                      "$projectPath/m1/target/classes",
                                      "$projectPath/m2/target/classes",
-                                     "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                     "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertRuntimeProductionClasspath("m1",
                                      "$projectPath/m1/target/classes")
     assertAllTestsClasspath("m1",
                             "$projectPath/m1/target/test-classes",
                             "$projectPath/m1/target/classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/junit/junit/4.0/junit-4.0.jar",
+                            "$repositoryPath/junit/junit/4.0/junit-4.0.jar",
                             "$projectPath/m3/target/classes",
-                            "$repositoryFile/jmock/jmock/4.0/jmock-4.0.jar")
+                            "$repositoryPath/jmock/jmock/4.0/jmock-4.0.jar")
   }
 
   @Test
@@ -712,12 +712,12 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
     assertRuntimeProductionSearchScope("m1",
                                        "$projectPath/m1/src/main/java",
                                        "$projectPath/m2/src/main/java",
-                                       "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                       "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertAllTestsSearchScope("m1",
                               "$projectPath/m1/src/main/java",
                               "$projectPath/m1/src/test/java",
                               "$projectPath/m2/src/main/java",
-                              "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                              "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertCompileProductionClasspath("m1",
                                      "$projectPath/m1/target/classes")
@@ -725,13 +725,13 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
     assertRuntimeProductionClasspath("m1",
                                      "$projectPath/m1/target/classes",
                                      "$projectPath/m2/target/classes",
-                                     "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                     "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertAllTestsClasspath("m1",
                             "$projectPath/m1/target/test-classes",
                             "$projectPath/m1/target/classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                            "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
   }
 
   @Test
@@ -802,26 +802,26 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
 
     assertCompileProductionSearchScope("m2",
                                        "$projectPath/m2/src/main/java",
-                                       "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                                       "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
     assertRuntimeProductionSearchScope("m2",
                                        "$projectPath/m2/src/main/java",
-                                       "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                                       "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
     assertAllTestsSearchScope("m2",
                               "$projectPath/m2/src/main/java",
                               "$projectPath/m2/src/test/java",
-                              "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar",
-                              "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                              "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar",
+                              "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertCompileProductionClasspath("m2",
                                      "$projectPath/m2/target/classes",
-                                     "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar")
+                                     "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar")
     assertRuntimeProductionClasspath("m2",
                                      "$projectPath/m2/target/classes")
     assertAllTestsClasspath("m2",
                             "$projectPath/m2/target/test-classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/jmock/jmock/1.0/jmock-1.0.jar",
-                            "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                            "$repositoryPath/jmock/jmock/1.0/jmock-1.0.jar",
+                            "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
   }
 
   @Test
@@ -869,8 +869,8 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
                       "$projectPath/m2/src/test/java"
     )
 
-    val libraryPath = "$repositoryFile/junit/junit/4.0/junit-4.0.jar"
-    val librarySrcPath = "$repositoryFile/junit/junit/4.0/junit-4.0-sources.jar"
+    val libraryPath = "$repositoryPath/junit/junit/4.0/junit-4.0.jar"
+    val librarySrcPath = "$repositoryPath/junit/junit/4.0/junit-4.0-sources.jar"
     val m2m = getInstance(project).findModuleByName("m2")
     val modules2: List<OrderEntry> = ArrayList()
     ModuleRootManager.getInstance(m2m!!).orderEntries().withoutSdk().withoutModuleSourceEntries().forEach(
@@ -948,14 +948,14 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
                               "$projectPath/m1/src/main/java",
                               "$projectPath/m1/src/test/java",
                               "$projectPath/m2/src/main/java",
-                              "$repositoryFile/junit/junit/4.0/junit-4.0.jar",
+                              "$repositoryPath/junit/junit/4.0/junit-4.0.jar",
                               "$projectPath/m3/src/main/java")
 
     assertAllTestsClasspath("m1",
                             "$projectPath/m1/target/test-classes",
                             "$projectPath/m1/target/classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/junit/junit/4.0/junit-4.0.jar",
+                            "$repositoryPath/junit/junit/4.0/junit-4.0.jar",
                             "$projectPath/m3/target/classes")
   }
 
@@ -1019,7 +1019,7 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
     assertCompileProductionClasspath("user",
                                      "$projectPath/user/output",
                                      "$projectPath/m1/target/classes",
-                                     "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                     "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertRuntimeProductionClasspath("user",
                                      "$projectPath/user/output",
@@ -1031,7 +1031,7 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
                                 "$projectPath/user/output",
                                 "$projectPath/m1/target/test-classes",
                                 "$projectPath/m1/target/classes",
-                                "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertRuntimeTestsClasspath("user",
                                 "$projectPath/user/test-output",
@@ -1040,11 +1040,11 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
                                 "$projectPath/m1/target/classes",
                                 "$projectPath/m2/target/test-classes",
                                 "$projectPath/m2/target/classes",
-                                "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
 
     assertCompileProductionClasspath("m1",
                                      "$projectPath/m1/target/classes",
-                                     "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                                     "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
     assertRuntimeProductionClasspath("m1",
                                      "$projectPath/m1/target/classes",
                                      "$projectPath/m2/target/classes")
@@ -1052,7 +1052,7 @@ class MavenClasspathsAndSearchScopesTest : MavenMultiVersionImportingTestCase()
                             "$projectPath/m1/target/test-classes",
                             "$projectPath/m1/target/classes",
                             "$projectPath/m2/target/classes",
-                            "$repositoryFile/junit/junit/4.0/junit-4.0.jar")
+                            "$repositoryPath/junit/junit/4.0/junit-4.0.jar")
   }
 
   @Test
@@ -1215,7 +1215,7 @@ $scope</scope>
     val m6E3 = m6OrderEntries[3]
     UsefulTestCase.assertInstanceOf(m6E3, ModuleSourceOrderEntry::class.java)
 
-    val jmockDir = VfsUtil.findFile(repositoryFile.resolve("jmock/jmock/1.0/jmock-1.0.jar"), true)
+    val jmockDir = VfsUtil.findFile(repositoryPath.resolve("jmock/jmock/1.0/jmock-1.0.jar"), true)
     assertNotNull(jmockDir)
     val jmockJar = JarFileSystem.getInstance().getJarRootForLocalFile(jmockDir!!)
     assertNotNull(jmockJar)
@@ -1264,7 +1264,7 @@ $scope</scope>
     val m6E2 = m6OrderEntries[2]
     UsefulTestCase.assertInstanceOf(m6E2, ModuleSourceOrderEntry::class.java)
 
-    val jmockDir = VfsUtil.findFile(repositoryFile.resolve("jmock/jmock/1.0/jmock-1.0.jar"), true)
+    val jmockDir = VfsUtil.findFile(repositoryPath.resolve("jmock/jmock/1.0/jmock-1.0.jar"), true)
     assertNotNull(jmockDir)
     val jmockJar = JarFileSystem.getInstance().getJarRootForLocalFile(jmockDir!!)
     assertNotNull(jmockJar)
@@ -1476,7 +1476,7 @@ $scope</scope>
     f.parent.createDirectories()
 
     createEmptyJar(f.parent.toString(), f.fileName.toString())
-    repositoryFile = createProjectSubDir("repo").toNioPath()
+    repositoryPath = createProjectSubDir("repo").toNioPath()
   }
 
   private fun createOutputDirectories() {

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ArtifactsDownloadingTest.kt

@@ -40,8 +40,8 @@ class ArtifactsDownloadingTest : ArtifactsDownloadingTestCase() {
                     </dependencies>
                     """.trimIndent())
 
-    val sources = repositoryFile.resolve("junit/junit/4.0/junit-4.0-sources.jar")
-    val javadoc = repositoryFile.resolve("junit/junit/4.0/junit-4.0-javadoc.jar")
+    val sources = repositoryPath.resolve("junit/junit/4.0/junit-4.0-sources.jar")
+    val javadoc = repositoryPath.resolve("junit/junit/4.0/junit-4.0-javadoc.jar")
 
     assertFalse(sources.exists())
     assertFalse(javadoc.exists())
@@ -67,8 +67,8 @@ class ArtifactsDownloadingTest : ArtifactsDownloadingTestCase() {
                     </dependencies>
                     """.trimIndent())
 
-    val sources = repositoryFile.resolve("junit/junit/4.0/junit-4.0-sources.jar")
-    val javadoc = repositoryFile.resolve("junit/junit/4.0/junit-4.0-javadoc.jar")
+    val sources = repositoryPath.resolve("junit/junit/4.0/junit-4.0-sources.jar")
+    val javadoc = repositoryPath.resolve("junit/junit/4.0/junit-4.0-javadoc.jar")
 
     assertFalse(sources.exists())
     assertFalse(javadoc.exists())
@@ -112,8 +112,8 @@ class ArtifactsDownloadingTest : ArtifactsDownloadingTestCase() {
                     </dependencies>
                     """.trimIndent())
 
-    val sources = repositoryFile.resolve("jmock/jmock/1.2.0/jmock-1.2.0-sources.jar")
-    val javadoc = repositoryFile.resolve("jmock/jmock/1.2.0/jmock-1.2.0-javadoc.jar")
+    val sources = repositoryPath.resolve("jmock/jmock/1.2.0/jmock-1.2.0-sources.jar")
+    val javadoc = repositoryPath.resolve("jmock/jmock/1.2.0/jmock-1.2.0-javadoc.jar")
     assertFalse(sources.exists())
     assertFalse(javadoc.exists())
 
@@ -123,8 +123,8 @@ class ArtifactsDownloadingTest : ArtifactsDownloadingTestCase() {
 
     assertTrue(sources.exists())
     assertTrue(javadoc.exists())
-    assertFalse(repositoryFile.resolve("junit/junit/4.0/junit-4.0-sources.jar").exists())
-    assertFalse(repositoryFile.resolve("junit/junit/4.0/junit-4.0-javadoc.jar").exists())
+    assertFalse(repositoryPath.resolve("junit/junit/4.0/junit-4.0-sources.jar").exists())
+    assertFalse(repositoryPath.resolve("junit/junit/4.0/junit-4.0-javadoc.jar").exists())
   }
 
   @Test
@@ -171,8 +171,8 @@ class ArtifactsDownloadingTest : ArtifactsDownloadingTestCase() {
                     </dependencies>
                     """.trimIndent())
 
-    val sources = repositoryFile.resolve("junit/junit/4.0/junit-4.0-sources.jar")
-    val javadoc = repositoryFile.resolve("junit/junit/4.0/junit-4.0-javadoc.jar")
+    val sources = repositoryPath.resolve("junit/junit/4.0/junit-4.0-sources.jar")
+    val javadoc = repositoryPath.resolve("junit/junit/4.0/junit-4.0-javadoc.jar")
 
     assertFalse(sources.exists())
     assertFalse(javadoc.exists())
@@ -238,15 +238,15 @@ ${VfsUtilCore.pathToUrl(pathTransformer.toRemotePath(remoteRepo)!!)}</url>
                     </dependencies>
                     """.trimIndent())
 
-    val files1 = listOf(repositoryFile.resolve("xxx/xxx/1/xxx-1-sources.jar"),
-                        repositoryFile.resolve("xxx/xxx/1/xxx-1-javadoc.jar"),
-                        repositoryFile.resolve("xxx/yyy/1/yyy-1-test-sources.jar"),
-                        repositoryFile.resolve("xxx/yyy/1/yyy-1-test-javadoc.jar"))
+    val files1 = listOf(repositoryPath.resolve("xxx/xxx/1/xxx-1-sources.jar"),
+                        repositoryPath.resolve("xxx/xxx/1/xxx-1-javadoc.jar"),
+                        repositoryPath.resolve("xxx/yyy/1/yyy-1-test-sources.jar"),
+                        repositoryPath.resolve("xxx/yyy/1/yyy-1-test-javadoc.jar"))
 
-    val files2 = listOf(repositoryFile.resolve("xxx/xxx/1/xxx-1-foo-sources.jar"),
-                        repositoryFile.resolve("xxx/xxx/1/xxx-1-foo-javadoc.jar"),
-                        repositoryFile.resolve("xxx/zzz/1/zzz-1-test-foo-sources.jar"),
-                        repositoryFile.resolve("xxx/zzz/1/zzz-1-test-foo-javadoc.jar"))
+    val files2 = listOf(repositoryPath.resolve("xxx/xxx/1/xxx-1-foo-sources.jar"),
+                        repositoryPath.resolve("xxx/xxx/1/xxx-1-foo-javadoc.jar"),
+                        repositoryPath.resolve("xxx/zzz/1/zzz-1-test-foo-sources.jar"),
+                        repositoryPath.resolve("xxx/zzz/1/zzz-1-test-foo-javadoc.jar"))
 
     for (each in files1) {
       assertFalse(each.toString(), each.exists())
@@ -282,7 +282,7 @@ ${VfsUtilCore.pathToUrl(pathTransformer.toRemotePath(remoteRepo)!!)}</url>
                       </build>
                       """.trimIndent())
 
-      val f = repositoryFile.resolve("org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.jar")
+      val f = repositoryPath.resolve("org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.jar")
 
       assertTrue(f.exists())
     }
@@ -294,7 +294,7 @@ ${VfsUtilCore.pathToUrl(pathTransformer.toRemotePath(remoteRepo)!!)}</url>
 
   @Test
   fun DownloadBuildExtensionsOnResolve() = runBlocking {
-    val f = repositoryFile.resolve("org/apache/maven/wagon/wagon-ftp/2.10/wagon-ftp-2.10.pom")
+    val f = repositoryPath.resolve("org/apache/maven/wagon/wagon-ftp/2.10/wagon-ftp-2.10.pom")
     assertFalse(f.exists())
 
     importProjectAsync("""

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ArtifactsDownloadingTestCase.kt

@@ -16,7 +16,7 @@ abstract class ArtifactsDownloadingTestCase : MavenMultiVersionImportingTestCase
     super.setUp()
     val helper = MavenCustomRepositoryHelper(dir, "plugins", "local1")
     helper.copy("plugins", "local1")
-    repositoryFile = helper.getTestData("local1")
+    repositoryPath = helper.getTestData("local1")
   }
 
   protected fun createDummyArtifact(remoteRepo: String, name: String) {

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingExternalChangesTest.kt

@@ -31,21 +31,21 @@ class DependenciesImportingExternalChangesTest : MavenMultiVersionImportingTestC
     assertModuleLibDeps("project", "Maven: junit:junit:4.0")
 
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
 
     waitForImportWithinTimeout {
-      repositoryFile = dir.resolve("__repo")
+      repositoryPath = dir.resolve("__repo")
     }
     projectsManager.embeddersManager.reset() // to recognize repository change
 
     updateAllProjects()
 
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
   }
 
   @Test
@@ -66,20 +66,20 @@ class DependenciesImportingExternalChangesTest : MavenMultiVersionImportingTestC
 
     assertModuleLibDeps("project", "Maven: org.testng:testng:jdk15:5.8", "Maven: junit:junit:3.8.1")
     assertModuleLibDep("project", "Maven: org.testng:testng:jdk15:5.8",
-                       "jar://" + repositoryFile + "/org/testng/testng/5.8/testng-5.8-jdk15.jar!/",
-                       "jar://" + repositoryFile + "/org/testng/testng/5.8/testng-5.8-sources.jar!/",
-                       "jar://" + repositoryFile + "/org/testng/testng/5.8/testng-5.8-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/org/testng/testng/5.8/testng-5.8-jdk15.jar!/",
+                       "jar://" + repositoryPath + "/org/testng/testng/5.8/testng-5.8-sources.jar!/",
+                       "jar://" + repositoryPath + "/org/testng/testng/5.8/testng-5.8-javadoc.jar!/")
 
     waitForImportWithinTimeout {
-      repositoryFile = dir.resolve("__repo")
+      repositoryPath = dir.resolve("__repo")
     }
     projectsManager.embeddersManager.reset() // to recognize repository change
 
     updateAllProjects()
 
     assertModuleLibDep("project", "Maven: org.testng:testng:jdk15:5.8",
-                       "jar://" + repositoryFile + "/org/testng/testng/5.8/testng-5.8-jdk15.jar!/",
-                       "jar://" + repositoryFile + "/org/testng/testng/5.8/testng-5.8-sources.jar!/",
-                       "jar://" + repositoryFile + "/org/testng/testng/5.8/testng-5.8-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/org/testng/testng/5.8/testng-5.8-jdk15.jar!/",
+                       "jar://" + repositoryPath + "/org/testng/testng/5.8/testng-5.8-sources.jar!/",
+                       "jar://" + repositoryPath + "/org/testng/testng/5.8/testng-5.8-javadoc.jar!/")
   }
 }

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.kt

@@ -50,9 +50,9 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       "jar://$repositoryFile/junit/junit/4.0/junit-4.0.jar!/",
-                       "jar://$repositoryFile/junit/junit/4.0/junit-4.0-sources.jar!/",
-                       "jar://$repositoryFile/junit/junit/4.0/junit-4.0-javadoc.jar!/")
+                       "jar://$repositoryPath/junit/junit/4.0/junit-4.0.jar!/",
+                       "jar://$repositoryPath/junit/junit/4.0/junit-4.0-sources.jar!/",
+                       "jar://$repositoryPath/junit/junit/4.0/junit-4.0-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: junit:junit:4.0", "junit", "junit", "4.0")
   }
 
@@ -69,14 +69,14 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
                       <version>4.0</version>
                       <scope>system</scope>
                       <systemPath>
-                  ${repositoryFile}/junit/junit/4.0/junit-4.0.jar</systemPath>
+                  ${repositoryPath}/junit/junit/4.0/junit-4.0.jar</systemPath>
                     </dependency>
                   </dependencies>
                   """.trimIndent())
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       listOf("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/"),
+                       listOf("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/"),
                        emptyList(), emptyList())
   }
 
@@ -98,9 +98,9 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: junit:junit:test-jar:tests:4.0",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-tests.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-test-sources.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-test-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-tests.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-test-sources.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-test-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: junit:junit:test-jar:tests:4.0", "junit", "junit", "tests", "jar", "4.0")
   }
 
@@ -121,9 +121,9 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
                     """.trimIndent())
     assertModules("project")
     assertModuleLibDep("project", "Maven: junit:junit:bar:4.0",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-bar.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-bar.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: junit:junit:bar:4.0", "junit", "junit", "bar", "jar", "4.0")
   }
 
@@ -299,9 +299,9 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
 
     assertModuleModuleDeps("m1", "m2")
     assertModuleLibDep("m1", "Maven: test:m2:client:1",
-                       "jar://" + repositoryFile + "/test/m2/1/m2-1-client.jar!/",
-                       "jar://" + repositoryFile + "/test/m2/1/m2-1-sources.jar!/",
-                       "jar://" + repositoryFile + "/test/m2/1/m2-1-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/test/m2/1/m2-1-client.jar!/",
+                       "jar://" + repositoryPath + "/test/m2/1/m2-1-sources.jar!/",
+                       "jar://" + repositoryPath + "/test/m2/1/m2-1-javadoc.jar!/")
   }
 
   @Test
@@ -1433,7 +1433,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
   @Test
   fun testResolvingFromRepositoriesIfSeveral() = runBlocking {
     val fixture = MavenCustomNioRepositoryHelper(dir, "local1")
-    repositoryFile = fixture.getTestData("local1")
+    repositoryPath = fixture.getTestData("local1")
     removeFromLocalRepository("junit")
 
     val file = fixture.getTestData("local1/junit/junit/4.0/junit-4.0.pom")
@@ -1463,7 +1463,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
 
   @Test
   fun testUsingMirrors() = runBlocking {
-    repositoryFile = dir.resolve("repo")
+    repositoryPath = dir.resolve("repo")
     val mirrorPath = pathTransformer.toRemotePath(dir.resolve("mirror").toCanonicalPath())
 
     updateSettingsXmlFully("""<settings>
@@ -1703,18 +1703,18 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
                     """.trimIndent())
 
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       Arrays.asList("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/"),
-                       Arrays.asList("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/"),
-                       Arrays.asList("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/"))
+                       Arrays.asList("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/"),
+                       Arrays.asList("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/"),
+                       Arrays.asList("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/"))
 
     // update twice
     updateAllProjects()
     updateAllProjects()
 
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       Arrays.asList("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/"),
-                       Arrays.asList("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/"),
-                       Arrays.asList("jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/"))
+                       Arrays.asList("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/"),
+                       Arrays.asList("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/"),
+                       Arrays.asList("jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/"))
   }
 
   @Test
@@ -1943,7 +1943,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
     createAndAddProjectLibrary("project", "lib")
 
     assertProjectLibraries("lib")
-    addLibraryRoot("lib", OrderRootType.CLASSES, "file://" + repositoryFile + "/foo/bar.jar!/")
+    addLibraryRoot("lib", OrderRootType.CLASSES, "file://" + repositoryPath + "/foo/bar.jar!/")
 
     updateProjectPom("""
                     <groupId>test</groupId>
@@ -1966,7 +1966,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
                     """.trimIndent())
 
     createProjectLibrary("lib")
-    addLibraryRoot("lib", OrderRootType.CLASSES, "file://" + repositoryFile + "/foo/bar.jar!/")
+    addLibraryRoot("lib", OrderRootType.CLASSES, "file://" + repositoryPath + "/foo/bar.jar!/")
 
     assertProjectLibraries("lib")
 
@@ -2159,7 +2159,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
     // should not throw NPE when accessing CustomArtifact.getPath();
     val helper = MavenCustomNioRepositoryHelper(dir, "local1")
     val repoPath = helper.getTestData("local1")
-    repositoryFile = repoPath
+    repositoryPath = repoPath
 
     importProjectAsync("""
       <groupId>test</groupId>
@@ -2195,7 +2195,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
   fun testVersionRangeInDependencyManagementDoesntBreakIndirectDependency() = runBlocking {
     val helper = MavenCustomNioRepositoryHelper(dir, "local1")
     val repoPath = helper.getTestData("local1")
-    repositoryFile = repoPath
+    repositoryPath = repoPath
 
     createProjectPom("""
       <groupId>test</groupId>
@@ -2289,9 +2289,9 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
     assertModuleLibDeps("m1", "Maven: test:m2:2")
 
     assertModuleLibDep("m1", "Maven: test:m2:2",
-                       "jar://" + repositoryFile + "/test/m2/2/m2-2.jar!/",
-                       "jar://" + repositoryFile + "/test/m2/2/m2-2-sources.jar!/",
-                       "jar://" + repositoryFile + "/test/m2/2/m2-2-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/test/m2/2/m2-2.jar!/",
+                       "jar://" + repositoryPath + "/test/m2/2/m2-2-sources.jar!/",
+                       "jar://" + repositoryPath + "/test/m2/2/m2-2-javadoc.jar!/")
   }
 
   @Test
@@ -2416,9 +2416,9 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
 
     assertProjectLibraries("Maven: com.google.guava:guava:15.0")
     assertModuleLibDep("project", "Maven: com.google.guava:guava:15.0",
-                       "jar://" + repositoryFile + "/com/google/guava/guava/15.0/guava-15.0.jar!/",
-                       "jar://" + repositoryFile + "/com/google/guava/guava/15.0/guava-15.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/com/google/guava/guava/15.0/guava-15.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/com/google/guava/guava/15.0/guava-15.0.jar!/",
+                       "jar://" + repositoryPath + "/com/google/guava/guava/15.0/guava-15.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/com/google/guava/guava/15.0/guava-15.0-javadoc.jar!/")
   }
 
   @Test
@@ -2469,14 +2469,14 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
     updateAllProjects()
 
     assertModuleLibDep("project", "Maven: junit:junit:4.0",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
 
     assertModuleLibDep(mn("project", "m1"), "Maven: junit:junit:4.0",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/junit/junit/4.0/junit-4.0-javadoc.jar!/")
   }
 
   @Test

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesManagementTest.kt

@@ -24,10 +24,10 @@ class DependenciesManagementTest : MavenMultiVersionImportingTestCase() {
   fun testImportingDependencies() = runBlocking {
     if (!hasMavenInstallation()) return@runBlocking
 
-    repositoryFile = dir.resolve("repo")
+    repositoryPath = dir.resolve("repo")
     updateSettingsXml("""
                       <localRepository>
-                      ${repositoryFile}</localRepository>
+                      ${repositoryPath}</localRepository>
                       """.trimIndent())
 
     createModulePom("__temp",
@@ -77,10 +77,10 @@ class DependenciesManagementTest : MavenMultiVersionImportingTestCase() {
 
   @Test
   fun testImportingNotInstalledDependencies() = runBlocking {
-    repositoryFile = dir.resolve("repo")
+    repositoryPath = dir.resolve("repo")
     updateSettingsXml("""
   <localRepository>
-  ${repositoryFile}</localRepository>
+  ${repositoryPath}</localRepository>
   """.trimIndent())
 
     val bom = createModulePom("bom",

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.kt

@@ -761,8 +761,8 @@ class FoldersImportingTest : MavenMultiVersionImportingTestCase() {
   fun testDownloadingNecessaryPlugins() = runBlocking {
     try {
       val helper = MavenCustomRepositoryHelper(dir, "local1")
-      repositoryFile = helper.getTestData("local1")
-      val pluginFile = repositoryFile.resolve("org/codehaus/mojo/build-helper-maven-plugin/1.2/build-helper-maven-plugin-1.2.jar")
+      repositoryPath = helper.getTestData("local1")
+      val pluginFile = repositoryPath.resolve("org/codehaus/mojo/build-helper-maven-plugin/1.2/build-helper-maven-plugin-1.2.jar")
       assertFalse(pluginFile.exists())
       importProjectAsync("""
                       <groupId>test</groupId>

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/GroovyImporterTest.kt

@@ -20,7 +20,7 @@ class GroovyImporterTest : MavenMultiVersionImportingTestCase() {
 
   override fun setUp() {
     super.setUp()
-    repositoryFile = dir.resolve("repo")
+    repositoryPath = dir.resolve("repo")
   }
 
   @Test
@@ -74,7 +74,7 @@ class GroovyImporterTest : MavenMultiVersionImportingTestCase() {
     val library = libraries[0]
     assertUnorderedPathsAreEqual(
       listOf(*library.getUrls(OrderRootType.CLASSES)),
-      listOf("jar://$repositoryFile/org/codehaus/groovy/groovy-all-minimal/1.5.6/groovy-all-minimal-1.5.6.jar!/"))
+      listOf("jar://$repositoryPath/org/codehaus/groovy/groovy-all-minimal/1.5.6/groovy-all-minimal-1.5.6.jar!/"))
   }
 
   @Test
@@ -163,7 +163,7 @@ class GroovyImporterTest : MavenMultiVersionImportingTestCase() {
 
   @Test
   fun testGroovyEclipsePlugin() = runBlocking {
-    val batchDir = repositoryFile.resolve("org/codehaus/groovy/groovy-eclipse-batch/2.1.3-01/")
+    val batchDir = repositoryPath.resolve("org/codehaus/groovy/groovy-eclipse-batch/2.1.3-01/")
     batchDir.createDirectories()
     val batchJar = batchDir.resolve("groovy-eclipse-batch-2.1.3-01.jar")
     batchJar.createFile()
@@ -231,7 +231,7 @@ class GroovyImporterTest : MavenMultiVersionImportingTestCase() {
 
   @Test
   fun testGroovyEclipsePluginWhenOnlyCompilerDependency() = runBlocking {
-    val batchDir = repositoryFile.resolve("org/codehaus/groovy/groovy-eclipse-batch/2.1.3-01/")
+    val batchDir = repositoryPath.resolve("org/codehaus/groovy/groovy-eclipse-batch/2.1.3-01/")
     batchDir.createDirectories()
     val batchJar = batchDir.resolve("groovy-eclipse-batch-2.1.3-01.jar")
     batchJar.createFile()

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.kt

@@ -834,7 +834,7 @@ class InvalidProjectImportingTest : MavenMultiVersionImportingTestCase() {
   fun testDoNotReportResolvedPlugins() = runBlocking {
     val helper = MavenCustomRepositoryHelper(dir, "plugins")
 
-    repositoryFile = helper.getTestData("plugins")
+    repositoryPath = helper.getTestData("plugins")
 
     importProjectAsync("""
                               <groupId>test</groupId>

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenRepositoriesDownloadingTest.kt

@@ -15,7 +15,6 @@ import org.jetbrains.idea.maven.server.MisconfiguredPlexusDummyEmbedder
 import org.jetbrains.idea.maven.utils.MavenLog
 import org.junit.Test
 import java.io.BufferedReader
-import java.io.File
 import java.io.InputStreamReader
 import java.net.HttpURLConnection
 import java.net.URL
@@ -77,7 +76,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toString())
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """
@@ -100,7 +99,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toString())
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """
@@ -123,7 +122,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toString())
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """
@@ -145,7 +144,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toFile(), USERNAME, PASSWORD)
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """
@@ -175,7 +174,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toFile(), USERNAME, PASSWORD)
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """
@@ -214,7 +213,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toFile(), USERNAME, PASSWORD)
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     @Language(value = "XML") val settingsXmlText = """
        <settings>
           <localRepository>$localRepoPath</localRepository>
@@ -322,7 +321,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toString())
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenSnapshotDependenciesTest.kt

@@ -37,7 +37,7 @@ class MavenSnapshotDependenciesTest : MavenMultiVersionImportingTestCase() {
     val remoteRepoPath = helper.getTestData("remote")
     val localRepoPath = helper.getTestData("local1")
     httpServerFixture.startRepositoryFor(remoteRepoPath.toString())
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenStaticSyncTest.kt

@@ -29,9 +29,9 @@ class MavenStaticSyncTest : AbstractMavenStaticSyncTest() {
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: somedep:somedep:4.0",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: somedep:somedep:4.0", "somedep", "somedep", "4.0")
   }
 
@@ -55,9 +55,9 @@ class MavenStaticSyncTest : AbstractMavenStaticSyncTest() {
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: somedep:somedep:4.0",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: somedep:somedep:4.0", "somedep", "somedep", "4.0")
   }
 
@@ -82,9 +82,9 @@ class MavenStaticSyncTest : AbstractMavenStaticSyncTest() {
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: somedep:somedep:4.0",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: somedep:somedep:4.0", "somedep", "somedep", "4.0")
   }
 
@@ -123,9 +123,9 @@ class MavenStaticSyncTest : AbstractMavenStaticSyncTest() {
 
     assertModules("project", "m1")
     assertModuleLibDep("m1", "Maven: somedep:somedep:4.0",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
     assertProjectLibraryCoordinates("Maven: somedep:somedep:4.0", "somedep", "somedep", "4.0")
   }
 
@@ -730,9 +730,9 @@ class MavenStaticSyncTest : AbstractMavenStaticSyncTest() {
 
     assertModules("project")
     assertModuleLibDep("project", "Maven: somedep:somedep:4.0",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
 
     assertModuleLibDepScope("project", "Maven: somedep:somedep:4.0", DependencyScope.TEST)
 
@@ -770,9 +770,9 @@ class MavenStaticSyncTest : AbstractMavenStaticSyncTest() {
     assertModules("project", "m1")
 
     assertModuleLibDep("m1", "Maven: somedep:somedep:4.0",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
-                       "jar://" + repositoryFile + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-sources.jar!/",
+                       "jar://" + repositoryPath + "/somedep/somedep/4.0/somedep-4.0-javadoc.jar!/")
   }
 
   @Test

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenWrapperConfigurationTest.kt

@@ -129,7 +129,7 @@ class MavenWrapperConfigurationTest : MavenImportingTestCase() {
     }
     httpServerFixtureForWrapper.startRepositoryFor(repack.parent)
 
-    repositoryFile = localRepoPath
+    repositoryPath = localRepoPath
     val settingsXml = createProjectSubFile(
       "settings.xml",
       """

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MiscImportingTest.kt

@@ -292,8 +292,8 @@ class MiscImportingTest : MavenMultiVersionImportingTestCase() {
   @Test
   fun testTakingProxySettingsIntoAccount() = runBlocking {
     val helper = MavenCustomRepositoryHelper(dir, "local1")
-    repositoryFile = helper.getTestData("local1")
-    mavenGeneralSettings.setLocalRepository(repositoryFile.toString())
+    repositoryPath = helper.getTestData("local1")
+    mavenGeneralSettings.setLocalRepository(repositoryPath.toString())
     importProjectAsync("""
                     <groupId>test</groupId>
                     <artifactId>project</artifactId>
@@ -311,7 +311,7 @@ class MiscImportingTest : MavenMultiVersionImportingTestCase() {
     // incremental sync doesn't download dependencies if effective pom dependencies haven't changed
     updateAllProjectsFullSync()
 
-    val jarFile = repositoryFile.resolve("junit/junit/4.0/junit-4.0.jar")
+    val jarFile = repositoryPath.resolve("junit/junit/4.0/junit-4.0.jar")
     assertTrue(jarFile.exists())
     projectsManager.listenForExternalChanges()
     waitForImportWithinTimeout {
@@ -347,7 +347,7 @@ class MiscImportingTest : MavenMultiVersionImportingTestCase() {
   fun testMavenExtensionsAreLoadedAndAfterProjectsReadIsCalled() = runBlocking {
     try {
       val helper = MavenCustomRepositoryHelper(dir, "plugins")
-      repositoryFile = helper.getTestData("plugins")
+      repositoryPath = helper.getTestData("plugins")
       mavenGeneralSettings.isWorkOffline = true
       importProjectAsync("""
                       <groupId>test</groupId>

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/SnapshotDependenciesImportingTest.kt

@@ -162,13 +162,13 @@ ${repositoriesSection()}<dependencies>
 
     assertModuleLibDep("project",
                        "Maven: test:foo:1-SNAPSHOT",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar!/",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar!/",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar!/",
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar!/",
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar!/")
 
-    assertTrue(repositoryFile.resolve("test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar").exists())
-    assertTrue(repositoryFile.resolve("test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar").exists())
-    assertTrue(repositoryFile.resolve("test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar").exists())
+    assertTrue(repositoryPath.resolve("test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar").exists())
+    assertTrue(repositoryPath.resolve("test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar").exists())
+    assertTrue(repositoryPath.resolve("test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar").exists())
   }
 
   @Test
@@ -221,9 +221,9 @@ ${repositoriesSection()}<dependencies>
 
     assertModuleLibDep("project",
                        "Maven: test:foo:1-SNAPSHOT",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar!/",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar!/",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar!/",
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar!/",
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar!/")
 
 
     deployArtifact("test", "foo", "1-SNAPSHOT",
@@ -257,9 +257,9 @@ ${repositoriesSection()}<dependencies>
 
     assertModuleLibDep("project",
                        "Maven: test:foo:1-SNAPSHOT",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar!/",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar!/",
-                       "jar://" + repositoryFile + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar!/")
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT.jar!/",
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-sources.jar!/",
+                       "jar://" + repositoryPath + "/test/foo/1-SNAPSHOT/foo-1-SNAPSHOT-javadoc.jar!/")
   }
 
   private fun deployArtifact(groupId: String, artifactId: String, version: String, tail: String = "") {

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.kt

@@ -12,7 +12,6 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import java.io.IOException
 import java.nio.file.Files
-import java.nio.file.Paths
 
 class StructureImportingTest : MavenMultiVersionImportingTestCase() {
   @Test
@@ -639,7 +638,7 @@ class StructureImportingTest : MavenMultiVersionImportingTestCase() {
   @Test
   fun testParentInRemoteRepository() = runBlocking {
     val pathToJUnit = "asm/asm-parent/3.0"
-    val parentDir = repositoryFile.resolve(pathToJUnit)
+    val parentDir = repositoryPath.resolve(pathToJUnit)
 
     removeFromLocalRepository(pathToJUnit)
     assertFalse(Files.exists(parentDir))

plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.kt

@@ -612,7 +612,7 @@ class MavenProjectReaderTest : MavenProjectReaderTestCase() {
 
   fun testHandlingRecursionProprielyAndDoNotForgetCoClearRecursionGuard() = runBlocking {
     val repoPath = dir.resolve("repository")
-    repositoryFile = repoPath
+    repositoryPath = repoPath
 
     val parentFile = repoPath.resolve("test/parent/1/parent-1.pom")
     createFile(parentFile, createPomXml("""
@@ -907,7 +907,7 @@ class MavenProjectReaderTest : MavenProjectReaderTestCase() {
 
   fun testExpandingPropertiesFromParentInRepository() = runBlocking {
     val repoPath = dir.resolve("repository")
-    repositoryFile = repoPath
+    repositoryPath = repoPath
 
     val parentFile = repoPath.resolve("org/test/parent/1/parent-1.pom")
     createFile(parentFile, createPomXml("""

plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenImportingTestCase.kt

@@ -541,7 +541,7 @@ abstract class MavenImportingTestCase : MavenTestCase() {
     if (SystemInfo.isWindows) {
       MavenServerManager.getInstance().closeAllConnectorsAndWait()
     }
-    FileUtil.delete(repositoryFile.resolve(relativePath))
+    FileUtil.delete(repositoryPath.resolve(relativePath))
   }
 
   protected fun setupJdkForModules(vararg moduleNames: String) {

plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt

@@ -379,7 +379,7 @@ abstract class MavenTestCase : UsefulTestCase() {
   protected val mavenImporterSettings: MavenImportingSettings
     get() = MavenProjectsManager.getInstance(myProject!!).importingSettings
 
-  protected var repositoryFile: Path
+  protected var repositoryPath: Path
     get() = mavenGeneralSettings.effectiveRepositoryPath
     set(path) {
       mavenGeneralSettings.setLocalRepository(path.toCanonicalPath())