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

[maven] IDEA-375474 MavenTestCase cleanup

Browse Source 
GitOrigin-RevId: 9192e47df7d5353068235e26a7f9f7317449d61c
This commit is contained in:
Dmitry Kichinsky
2025-07-07 10:03:20 +00:00
committed by intellij-monorepo-bot
parent 0c3f084073
commit b48cc2ba57
1 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt
+5 -37
View File
@@ -24,10 +24,7 @@ import com.intellij.openapi.roots.ex.ProjectRootManagerEx
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.ThrowableComputable
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.findOrCreateFile
import com.intellij.openapi.util.io.toCanonicalPath
import com.intellij.openapi.util.io.toNioPathOrNull
import com.intellij.openapi.util.io.*
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.platform.testFramework.core.FileComparisonFailedError
@@ -108,9 +105,6 @@ abstract class MavenTestCase : UsefulTestCase() {
myProjectPom = projectPom
}
val allPoms: List<VirtualFile>
get() = myAllPoms.toList()
fun addPom(pom: VirtualFile) {
myAllPoms.add(pom)
}
@@ -253,7 +247,6 @@ abstract class MavenTestCase : UsefulTestCase() {
}
override fun tearDown() {
val basePath = myProject!!.basePath
RunAll(
ThrowableRunnable {
val mavenProgressTracker =
@@ -476,7 +469,7 @@ abstract class MavenTestCase : UsefulTestCase() {
val filePath = Path.of(dir.path, fileName)
setPomContent(filePath, xml)
dir.refresh(false, false)
var f = dir.findChild(fileName) ?: throw AssertionError("can't find file ${filePath.absolutePathString()} in VFS")
val f = dir.findChild(fileName) ?: throw AssertionError("can't find file ${filePath.absolutePathString()} in VFS")
myAllPoms.add(f)
refreshFiles(listOf(f))
return f
@@ -486,10 +479,6 @@ abstract class MavenTestCase : UsefulTestCase() {
return createProfilesFile(projectRoot, xml, true)
}
protected fun createProfilesXmlOldStyle(relativePath: String, xml: String): VirtualFile {
return createProfilesFile(createProjectSubDir(relativePath), xml, true)
}
protected fun createProfilesXml(xml: String): VirtualFile {
return createProfilesFile(projectRoot, xml, false)
}
@@ -498,21 +487,6 @@ abstract class MavenTestCase : UsefulTestCase() {
return createProfilesFile(createProjectSubDir(relativePath), xml, false)
}
protected fun createFullProfilesXml(content: String): VirtualFile {
return createProfilesFile(projectRoot, content)
}
protected fun createFullProfilesXml(relativePath: String, content: String): VirtualFile {
return createProfilesFile(createProjectSubDir(relativePath), content)
}
protected fun deleteProfilesXml() {
WriteCommandAction.writeCommandAction(myProject).run<IOException> {
val f = myProjectRoot!!.findChild("profiles.xml")
f?.delete(this)
}
}
protected fun createProjectSubDirs(vararg relativePaths: String) {
for (path in relativePaths) {
createProjectSubDir(path)
@@ -620,14 +594,10 @@ abstract class MavenTestCase : UsefulTestCase() {
}
}
protected fun deleteDirOnTearDown(dir: Path?) {
FileUtil.delete(dir!!)
// cannot use reliably the result of the com.intellij.openapi.util.io.FileUtil.delete() method
// because com.intellij.openapi.util.io.FileUtilRt.deleteRecursivelyNIO() does not honor this contract
protected fun deleteDirOnTearDown(dir: Path) {
NioFiles.deleteRecursively(dir)
if (dir.exists()) {
System.err.println("Cannot delete $dir")
//printDirectoryContent(myDir);
dir.toFile().deleteOnExit()
}
}
@@ -825,12 +795,10 @@ abstract class MavenTestCase : UsefulTestCase() {
}
protected fun getRelativePath(base: Path, path: String) : String {
return base.relativize(Path.of(path)).toCanonicalPath().toString()
return base.relativize(Path.of(path)).toCanonicalPath()
}
companion object {
val preimportTestMode: Boolean = java.lang.Boolean.getBoolean("MAVEN_TEST_PREIMPORT")
@Language("XML")
fun createPomXml(@Language(value = "XML", prefix = "<project>", suffix = "</project>") xml: @NonNls String?): @NonNls String {
return """