From ee9962ed706ab46ca62c34ac4d10a56b6bf2e29a Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Mon, 28 Dec 2015 16:28:31 +0300
Subject: [PATCH] Template for Junit4 framework doesn't have test prefix
 anymore

---
 .../actions/generate/KotlinGenerateTestSupportActionBase.kt   | 2 +-
 .../generate/testFrameworkSupport/jUnit4/testMethod.kt.after  | 2 +-
 .../generate/testFrameworkSupport/testNG/dataMethod.kt.after  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
index 6f9709e98bd..7cc8d960dfb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
@@ -144,7 +144,7 @@ abstract class KotlinGenerateTestSupportActionBase(
                 val fileTemplate = FileTemplateManager.getInstance(project).getCodeTemplate(fileTemplateDescriptor.fileName)
                 var templateText = fileTemplate.text.replace(BODY_VAR, "")
                 if (templateText.contains(NAME_VAR)) {
-                    var name = "Name"
+                    var name = if (templateText.contains("test$NAME_VAR")) "Name" else "name"
                     if (!ApplicationManager.getApplication().isUnitTestMode) {
                         name = Messages.showInputDialog("Choose test name: ", commandName, null, name, NAME_VALIDATOR)
                                 ?: return@executeWriteCommand
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
index 5a74fbd0dca..6027c72e905 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
@@ -4,7 +4,7 @@ import org.junit.Test
 // CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
 class A {
     @Test
-    fun testName() {
+    fun name() {
         throw UnsupportedOperationException()
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
index 163ec0930c8..e9b32057d09 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
@@ -4,8 +4,8 @@ import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
 
 @Test class A {
-    @DataProvider(name = "Name")
-    fun Name(): Array<Array<Any>> {
+    @DataProvider(name = "name")
+    fun name(): Array<Array<Any>> {
         throw UnsupportedOperationException()
     }
 }
\ No newline at end of file