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.Library
import com.intellij.openapi.roots.libraries.PersistentLibraryKind import com.intellij.openapi.roots.libraries.PersistentLibraryKind
import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VfsUtil
import org.jetbrains.kotlin.idea.framework.CommonLibraryKind import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
import org.jetbrains.kotlin.idea.framework.JSLibraryKind import org.jetbrains.kotlin.idea.framework.JSLibraryKind
@@ -189,7 +190,14 @@ object ConfigLibraryUtil {
val editor = NewLibraryEditor() val editor = NewLibraryEditor()
editor.name = libraryName editor.name = libraryName
for (jarPath in jarPaths) { 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) editor.addRoot(VfsUtil.getUrlForLibraryRoot(jarFile), OrderRootType.CLASSES)
} }
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Data // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Data
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.Test import org.testng.annotations.Test
@Test class A {<caret> @Test class A {<caret>
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Data // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Data
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.DataProvider import org.testng.annotations.DataProvider
import org.testng.annotations.Test import org.testng.annotations.Test
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.Test import org.testng.annotations.Test
@Test class A {<caret> @Test class A {<caret>
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.BeforeMethod import org.testng.annotations.BeforeMethod
import org.testng.annotations.Test import org.testng.annotations.Test
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// NOT_APPLICABLE // NOT_APPLICABLE
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.BeforeMethod import org.testng.annotations.BeforeMethod
import org.testng.annotations.Test import org.testng.annotations.Test
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.Test import org.testng.annotations.Test
open class A { open class A {
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.BeforeMethod import org.testng.annotations.BeforeMethod
import org.testng.annotations.Test import org.testng.annotations.Test
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.Test import org.testng.annotations.Test
@Test class A {<caret> @Test class A {<caret>
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.AfterMethod import org.testng.annotations.AfterMethod
import org.testng.annotations.Test import org.testng.annotations.Test
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// NOT_APPLICABLE // NOT_APPLICABLE
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.AfterMethod import org.testng.annotations.AfterMethod
import org.testng.annotations.Test import org.testng.annotations.Test
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Test // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Test
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.Test import org.testng.annotations.Test
@Test class A {<caret> @Test class A {<caret>
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Test // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Test
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
import org.testng.annotations.Test import org.testng.annotations.Test
@Test class A { @Test class A {
idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar // CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
package testing package testing
import org.testng.annotations.Test import org.testng.annotations.Test