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

Specify test framework to use explicitly in generate test tests

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-10-19 17:04:42 +02:00
parent 4793f71da2
commit f933cf5395
16 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+15 -3
View File
@@ -127,11 +127,23 @@ abstract class KotlinGenerateTestSupportActionBase(
override fun invoke(project: Project, editor: Editor, file: PsiFile) {
val klass = findTargetClass(editor, file) ?: return
val frameworks = findSuitableFrameworks(klass)
.filter { methodKind.getFileTemplateDescriptor(it) != null && isApplicableTo(it, klass) }
chooseAndPerform(editor, frameworks) { doGenerate(editor, file, klass, it) }
if (testFrameworkToUse != null) {
val frameworkToUse = findSuitableFrameworks(klass).first { it.name == testFrameworkToUse }
if (isApplicableTo(frameworkToUse, klass)) {
doGenerate(editor, file, klass, frameworkToUse)
}
}
else {
val frameworks = findSuitableFrameworks(klass)
.filter { methodKind.getFileTemplateDescriptor(it) != null && isApplicableTo(it, klass) }
chooseAndPerform(editor, frameworks) { doGenerate(editor, file, klass, it) }
}
}
var testFrameworkToUse: String? = null
private val DUMMY_NAME = "__KOTLIN_RULEZZZ__"
private fun doGenerate(editor: Editor, file: PsiFile, klass: KtClassOrObject, framework: TestFramework) {
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Data
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {<caret>
}
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
Vendored
+1
View File
@@ -2,6 +2,7 @@ import org.junit.runners.Parameterized
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Data
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {
@Parameterized.Parameters
fun data(): Collection<Array<Any>> {
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {<caret>
}
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
Vendored
+1
View File
@@ -2,6 +2,7 @@ import org.junit.Before
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {
@Before
fun setUp() {
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
import org.junit.Before
class A {<caret>
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
Vendored
+1 -5
View File
@@ -1,13 +1,9 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
import org.junit.Before
class A {
@org.testng.annotations.BeforeMethod
fun setUp() {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
@Before
fun setUp() {
throw UnsupportedOperationException()
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
open class A {
open fun setUp() {
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt.after
Vendored
+1
View File
@@ -2,6 +2,7 @@ import org.junit.Before
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$SetUp
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
open class A {
open fun setUp() {
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {<caret>
}
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
Vendored
+1
View File
@@ -2,6 +2,7 @@ import org.junit.After
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {
@After
fun tearDown() {
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
import org.junit.After
class A {<caret>
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
Vendored
+1 -5
View File
@@ -1,13 +1,9 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$TearDown
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
import org.junit.After
class A {
@org.testng.annotations.AfterMethod
fun tearDown() {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
@After
fun tearDown() {
throw UnsupportedOperationException()
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Test
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {<caret>
}
idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
Vendored
+1
View File
@@ -2,6 +2,7 @@ import org.junit.Test
// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase$Test
// CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
// TEST_FRAMEWORK: JUnit4
class A {
@Test
fun name() {
idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt
+7
View File
@@ -17,7 +17,9 @@
package org.jetbrains.kotlin.idea.codeInsight.generate
import com.intellij.openapi.roots.ModuleRootManager
import org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.test.InTextDirectivesUtils
abstract class AbstractGenerateTestSupportMethodActionTest : AbstractCodeInsightActionTest() {
private fun setUpTestSourceRoot() {
@@ -33,6 +35,11 @@ abstract class AbstractGenerateTestSupportMethodActionTest : AbstractCodeInsight
}
}
override fun createAction(fileText: String) =
(super.createAction(fileText) as KotlinGenerateTestSupportActionBase).apply {
testFrameworkToUse = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// TEST_FRAMEWORK:")
}
override fun doTest(path: String) {
setUpTestSourceRoot()
super.doTest(path)