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

Fix path to TestNG library in tests for 191

Browse Source
This commit is contained in:
Natalia Selezneva
2019-04-22 15:47:42 +03:00
parent 1db7754298
commit d45644cea4
14 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
+9 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.roots.impl.libraries.LibraryEx
import com.intellij.openapi.roots.libraries.Library
import com.intellij.openapi.roots.libraries.PersistentLibraryKind
import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VfsUtil
import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
import org.jetbrains.kotlin.idea.framework.JSLibraryKind
@@ -189,7 +190,14 @@ object ConfigLibraryUtil {
val editor = NewLibraryEditor()
editor.name = libraryName
for (jarPath in jarPaths) {
val jarFile = if (rootPath == null) File(jarPath) else File(rootPath, jarPath)
val jarFile = rootPath?.let {
File(rootPath, jarPath).takeIf { it.exists() }
?: FileUtil.findFilesByMask(jarPath.toPattern(), File(rootPath)).firstOrNull()
} ?: File(jarPath)
require(jarFile.exists()) {
"Cannot configure library with given path, file doesn't exists $jarPath"
}
editor.addRoot(VfsUtil.getUrlForLibraryRoot(jarFile), OrderRootType.CLASSES)
}