azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flaky navigation tests by refreshing file system before find

Browse Source
This commit is contained in:
Nikolay Krasko
2019-02-18 18:42:32 +03:00
parent e9ec8e2cee
commit c41d6c427d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt
+3 -1
View File
@@ -17,7 +17,9 @@ abstract class AbstractNavigateFromLibrarySourcesTest : LightCodeInsightFixtureT
protected fun navigationElementForReferenceInLibrarySource(filePath: String, referenceText: String): PsiElement { protected fun navigationElementForReferenceInLibrarySource(filePath: String, referenceText: String): PsiElement {
val libraryOrderEntry = ModuleRootManager.getInstance(myModule!!).orderEntries.first { it is LibraryOrderEntry } val libraryOrderEntry = ModuleRootManager.getInstance(myModule!!).orderEntries.first { it is LibraryOrderEntry }
val libSourcesRoot = libraryOrderEntry.getUrls(OrderRootType.SOURCES)[0] val libSourcesRoot = libraryOrderEntry.getUrls(OrderRootType.SOURCES)[0]
val vf = VirtualFileManager.getInstance().findFileByUrl(libSourcesRoot + "/$filePath")!! val libUrl = "$libSourcesRoot/$filePath"
val vf = VirtualFileManager.getInstance().refreshAndFindFileByUrl(libUrl)
?: error("Can't find library: $libUrl")
val psiFile = psiManager.findFile(vf)!! val psiFile = psiManager.findFile(vf)!!
val indexOf = psiFile.text!!.indexOf(referenceText) val indexOf = psiFile.text!!.indexOf(referenceText)
val reference = psiFile.findReferenceAt(indexOf) val reference = psiFile.findReferenceAt(indexOf)
idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt
+5 -1
View File
@@ -41,7 +41,11 @@ fun PlatformTestCase.projectLibrary(
} }
} }
val File.jarRoot get() = JarFileSystem.getInstance().getRootByLocal(LocalFileSystem.getInstance().findFileByIoFile(this)!!)!! val File.jarRoot: VirtualFile
get() {
val virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(this) ?: error("Cannot find file $this")
return JarFileSystem.getInstance().getRootByLocal(virtualFile) ?: error("Can't find root by file $virtualFile")
}
fun Module.addDependency( fun Module.addDependency(
library: Library, library: Library,