jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-23 08:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Template for Junit4 framework doesn't have test prefix anymore"

Browse Source 
This reverts commit ee9962ed70.

Conflicts:
	idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
	idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
This commit is contained in:
Nikolay Krasko
2016-05-30 17:39:19 +03:00
parent 4f980f4c47
commit 2d3da55525
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
View File

@@ -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 = if (templateText.contains("test$NAME_VAR")) "Name" else "name"
var name = "Name"
if (!ApplicationManager.getApplication().isUnitTestMode) {
name = Messages.showInputDialog("Choose test name: ", commandName, null, name, NAME_VALIDATOR)
?: return@executeWriteCommand

2
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after vendored
View File

@@ -4,7 +4,7 @@ import org.junit.Test
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
class A {
@Test
fun name() {
fun testName() {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}

4
idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after vendored
View File

@@ -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("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}