Rename ultimate's GenerateTests -> GenerateUltimateTests, regenerate
This commit is contained in:
@@ -62,3 +62,9 @@ var Project.jvmTarget: String?
|
||||
var Project.javaHome: String?
|
||||
get() = extra.takeIf { it.has("javaHome") }?.get("javaHome") as? String
|
||||
set(v) { extra["javaHome"] = v }
|
||||
|
||||
fun Project.generator(fqName: String) = task<JavaExec> {
|
||||
classpath = the<JavaPluginConvention>().sourceSets["test"].runtimeClasspath
|
||||
main = fqName
|
||||
workingDir = rootDir
|
||||
}
|
||||
|
||||
@@ -61,12 +61,6 @@ projectTest {
|
||||
workingDir = rootDir
|
||||
}
|
||||
|
||||
fun generator(fqName: String) = task<JavaExec> {
|
||||
classpath = the<JavaPluginConvention>().sourceSets["test"].runtimeClasspath
|
||||
main = fqName
|
||||
workingDir = rootDir
|
||||
}
|
||||
|
||||
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt")
|
||||
|
||||
val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt")
|
||||
|
||||
@@ -165,3 +165,5 @@ projectTest {
|
||||
dependsOn(preparePluginXml)
|
||||
workingDir = rootDir
|
||||
}
|
||||
|
||||
val generateTests by generator("org.jetbrains.kotlin.tests.GenerateUltimateTestsKt")
|
||||
|
||||
-4
@@ -16,7 +16,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.idea.spring.tests.generate;
|
||||
|
||||
import com.intellij.idea.Bombed;
|
||||
import com.intellij.testFramework.TestDataPath;
|
||||
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||
@@ -50,9 +49,6 @@ public class GenerateSpringDependencyActionTestGenerated extends AbstractGenerat
|
||||
}
|
||||
|
||||
@TestMetadata("autowiredDependencies/multiplePropertiesAnnotationConfig.kt")
|
||||
@Bombed(day = 1, month = 10, year = 2017,
|
||||
description = "suffer from IDEA bug",
|
||||
user = "nicolay.mitropolsky")
|
||||
public void testAutowiredDependencies_MultiplePropertiesAnnotationConfig() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt");
|
||||
doTest(fileName);
|
||||
|
||||
-4
@@ -16,7 +16,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.idea.spring.tests.gutter;
|
||||
|
||||
import com.intellij.idea.Bombed;
|
||||
import com.intellij.testFramework.TestDataPath;
|
||||
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||
@@ -38,9 +37,6 @@ public class SpringClassAnnotatorTestGenerated extends AbstractSpringClassAnnota
|
||||
}
|
||||
|
||||
@TestMetadata("autowiredBeanCandidates/autowiredBeanCandidates.test")
|
||||
@Bombed(day = 1, month = 10, year = 2017,
|
||||
description = "flacky because SpringAutowireUtil#getAutowiredMembers() collecting duplicate elements for kotlin sometimes",
|
||||
user = "nicolay.mitropolsky")
|
||||
public void testAutowiredBeanCandidates_AutowiredBeanCandidates() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test");
|
||||
doTest(fileName);
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2016 JetBrains s.r.o.
|
||||
* Copyright 2010-2017 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
Reference in New Issue
Block a user