From d45644cea42b7c5f5ad16ae2db4642a85408fc3f Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Mon, 22 Apr 2019 15:47:42 +0300
Subject: [PATCH] Fix path to TestNG library in tests for 191

---
 .../jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt    | 10 +++++++++-
 .../generate/testFrameworkSupport/testNG/dataMethod.kt |  2 +-
 .../testFrameworkSupport/testNG/dataMethod.kt.after    |  2 +-
 .../generate/testFrameworkSupport/testNG/setUp.kt      |  2 +-
 .../testFrameworkSupport/testNG/setUp.kt.after         |  2 +-
 .../testFrameworkSupport/testNG/setUpExists.kt         |  2 +-
 .../testFrameworkSupport/testNG/setUpOverrides.kt      |  2 +-
 .../testNG/setUpOverrides.kt.after                     |  2 +-
 .../generate/testFrameworkSupport/testNG/tearDown.kt   |  2 +-
 .../testFrameworkSupport/testNG/tearDown.kt.after      |  2 +-
 .../testFrameworkSupport/testNG/tearDownExists.kt      |  2 +-
 .../generate/testFrameworkSupport/testNG/testMethod.kt |  2 +-
 .../testFrameworkSupport/testNG/testMethod.kt.after    |  2 +-
 .../runMarkers/testNGTestClassWithSubclasses.kt        |  2 +-
 14 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
index 8b1b2273d19..d6a75065bb8 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
@@ -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)
         }
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt
index 970538f34d8..7e24c784c62 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt
@@ -1,5 +1,5 @@
 // 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
 
 @Test class A {<caret>
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
index 859ca021d07..be3ae0e0949 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
@@ -1,5 +1,5 @@
 // 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.Test
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt
index 5adc76182d3..d6ef8d6657f 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt
@@ -1,5 +1,5 @@
 // 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
 
 @Test class A {<caret>
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
index 5ae952f029e..ee478d4b76f 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
@@ -1,5 +1,5 @@
 // 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.Test
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt
index 3e947d04231..66a7d69a256 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt
@@ -1,6 +1,6 @@
 // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
 // 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.Test
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt
index 8dca3ff24e2..4762301e69b 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt
@@ -1,5 +1,5 @@
 // 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
 
 open class A {
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt.after
index 31cc26f4e67..7fd155180f5 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt.after
@@ -1,5 +1,5 @@
 // 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.Test
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt
index 24e07f520b9..5986a4ac0c8 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt
@@ -1,5 +1,5 @@
 // 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
 
 @Test class A {<caret>
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
index a601b061672..301cac33b5d 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
@@ -1,5 +1,5 @@
 // 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.Test
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt
index 2625e573020..dfa57de0bf7 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt
@@ -1,6 +1,6 @@
 // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
 // 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.Test
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt
index 837f83e459f..b231db256f9 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt
@@ -1,5 +1,5 @@
 // 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
 
 @Test class A {<caret>
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
index 56f84e11198..be6e2e54319 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
@@ -1,5 +1,5 @@
 // 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
 
 @Test class A {
diff --git a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
index bed828669c0..2b4e7886b48 100644
--- a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
@@ -1,4 +1,4 @@
-// CONFIGURE_LIBRARY: TestNG@plugins/testng/lib/testng.jar
+// CONFIGURE_LIBRARY: TestNG@testng(-|[0-9]|\.)*jar
 package testing
 
 import org.testng.annotations.Test