diff --git a/ultimate/.gitignore b/ultimate/.gitignore deleted file mode 100644 index 25cdab965cb..00000000000 --- a/ultimate/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -.idea/shelf -dependencies -ideaSDK -out -tmp -workspace.xml -*.versionsBackup \ No newline at end of file diff --git a/ultimate/ReadMe.md b/ultimate/ReadMe.md deleted file mode 100644 index 6dbdb364656..00000000000 --- a/ultimate/ReadMe.md +++ /dev/null @@ -1,4 +0,0 @@ -# Kotlin Ultimate - -This project is a part of **Kotlin IntelliJ IDEA Plugin** -which provides support for Ultimate IDEA features from Kotlin side. \ No newline at end of file diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts deleted file mode 100644 index 13f7aa780a2..00000000000 --- a/ultimate/build.gradle.kts +++ /dev/null @@ -1,228 +0,0 @@ - -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -description = "Kotlin IDEA Ultimate plugin" - -plugins { - kotlin("jvm") -} - -val ideaProjectResources = provider { project(":idea").mainSourceSet.output.resourcesDir } -val intellijUltimateEnabled : Boolean by rootProject.extra - -val springClasspath by configurations.creating -val ideaPlugin by configurations.creating - -dependencies { - if (intellijUltimateEnabled) { - testRuntime(intellijUltimateDep()) - } - - compileOnly(project(":kotlin-reflect-api")) - compile(kotlinStdlib("jdk8")) - compile(project(":core:descriptors")) { isTransitive = false } - compile(project(":compiler:psi")) { isTransitive = false } - compile(project(":core:descriptors.jvm")) { isTransitive = false } - compile(project(":core:util.runtime")) { isTransitive = false } - compile(project(":compiler:light-classes")) { isTransitive = false } - compile(project(":core:type-system")) { isTransitive = false } - compile(project(":compiler:frontend")) { isTransitive = false } - compile(project(":compiler:frontend.common")) { isTransitive = false } - compile(project(":compiler:frontend.java")) { isTransitive = false } - compile(project(":compiler:util")) { isTransitive = false } - compile(project(":js:js.frontend")) { isTransitive = false } - compile(project(":idea")) { isTransitive = false } - compile(project(":idea:idea-jvm")) { isTransitive = false } - compile(project(":idea:idea-core")) { isTransitive = false } - compile(project(":idea:ide-common")) { isTransitive = false } - compile(project(":idea:idea-gradle")) { isTransitive = false } - compile(project(":compiler:util")) { isTransitive = false } - compile(project(":idea:idea-jps-common")) { isTransitive = false } - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - - if (intellijUltimateEnabled) { - compileOnly(nodeJSPlugin()) - compileOnly(intellijUltimateDep()) { includeJars("trove4j", "openapi", "platform-api", "platform-impl", "java-api", "java-impl", "idea", "util", "jdom") } - compileOnly(intellijUltimatePluginDep("CSS")) - compileOnly(intellijUltimatePluginDep("DatabaseTools")) - compileOnly(intellijUltimatePluginDep("JavaEE")) - compileOnly(intellijUltimatePluginDep("jsp")) - compileOnly(intellijUltimatePluginDep("PersistenceSupport")) - compileOnly(intellijUltimatePluginDep("Spring")) - compileOnly(intellijUltimatePluginDep("properties")) - compileOnly(intellijUltimatePluginDep("java-i18n")) - compileOnly(intellijUltimatePluginDep("gradle")) - compileOnly(intellijUltimatePluginDep("Groovy")) - compileOnly(intellijUltimatePluginDep("junit")) - compileOnly(intellijUltimatePluginDep("uml")) - compileOnly(intellijUltimatePluginDep("JavaScriptLanguage")) - compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) - } - - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":plugins:lint")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":idea")) { isTransitive = false } - testCompile(projectTests(":generators:test-generator")) - testCompile(commonDep("junit:junit")) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - if (intellijUltimateEnabled) { - testCompileOnly(intellijUltimateDep()) - } - - testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-script-runtime")) - testRuntimeOnly(project(":kotlin-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":plugins:android-extensions-compiler")) { isTransitive = false } - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":idea:idea-maven")) { isTransitive = false } - testRuntime(project(":idea:idea-jps-common")) { isTransitive = false } - testRuntime(project(":idea:jvm-debugger:eval4j")) { isTransitive = false } - testRuntime(project(":idea:jvm-debugger:jvm-debugger-util")) { isTransitive = false } - testRuntime(project(":idea:jvm-debugger:jvm-debugger-core")) { isTransitive = false } - testRuntime(project(":idea:jvm-debugger:jvm-debugger-evaluation")) { isTransitive = false } - testRuntime(project(":idea:jvm-debugger:jvm-debugger-sequence")) { isTransitive = false } - testRuntime(project(":idea:formatter")) { isTransitive = false } - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler-impl")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - testRuntime(project(":plugins:uast-kotlin-idea")) - testRuntime(intellijPluginDep("smali")) - - if (intellijUltimateEnabled) { - testCompile(nodeJSPlugin()) - testCompile(intellijUltimatePluginDep("CSS")) - testCompile(intellijUltimatePluginDep("DatabaseTools")) - testCompile(intellijUltimatePluginDep("JavaEE")) - testCompile(intellijUltimatePluginDep("jsp")) - testCompile(intellijUltimatePluginDep("PersistenceSupport")) - testCompile(intellijUltimatePluginDep("Spring")) - testCompile(intellijUltimatePluginDep("uml")) - testCompile(intellijUltimatePluginDep("JavaScriptLanguage")) - testCompile(intellijUltimatePluginDep("JavaScriptDebugger")) - testCompile(intellijUltimatePluginDep("properties")) - testCompile(intellijUltimatePluginDep("java-i18n")) - testCompile(intellijUltimatePluginDep("gradle")) - testCompile(intellijUltimatePluginDep("Groovy")) - testCompile(intellijUltimatePluginDep("junit")) - testRuntime(intellijUltimatePluginDep("coverage")) - testRuntime(intellijUltimatePluginDep("maven")) - testRuntime(intellijUltimatePluginDep("android")) - testRuntime(intellijUltimatePluginDep("testng")) - testRuntime(intellijUltimatePluginDep("IntelliLang")) - testRuntime(intellijUltimatePluginDep("copyright")) - testRuntime(intellijUltimatePluginDep("java-decompiler")) - } - - testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar")) - - springClasspath(commonDep("org.springframework", "spring-core")) - springClasspath(commonDep("org.springframework", "spring-beans")) - springClasspath(commonDep("org.springframework", "spring-context")) - springClasspath(commonDep("org.springframework", "spring-tx")) - springClasspath(commonDep("org.springframework", "spring-web")) - - ideaPlugin(project(":prepare:idea-plugin", configuration = "runtimeJar")) -} - -val preparedResources = File(buildDir, "prepResources") - -sourceSets { - "main" { projectDefault() } - "test" { - projectDefault() - resources.srcDir(preparedResources) - } -} - -val ultimatePluginXmlContent: String by lazy { - val sectRex = Regex("""^\s*\s*$""") - File(projectDir, "resources/META-INF/ultimate-plugin.xml") - .readLines() - .filterNot { it.matches(sectRex) } - .joinToString("\n") -} - -val prepareResources by task { - dependsOn(":idea:assemble") - from(ideaProjectResources, { - exclude("META-INF/plugin.xml") - }) - into(preparedResources) -} - -val preparePluginXml by task { - dependsOn(":idea:assemble") - from(ideaProjectResources, { include("META-INF/plugin.xml") }) - into(preparedResources) - filter { - it?.replace("", ultimatePluginXmlContent) - } -} - -val jar = runtimeJar { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - dependsOn(preparePluginXml) - dependsOn(ideaPlugin) - - from(provider { zipTree(ideaPlugin.singleFile) }) { - exclude("META-INF/plugin.xml") - } - - from(preparedResources, { include("META-INF/plugin.xml") }) - from(mainSourceSet.output) - archiveName = "kotlin-plugin.jar" -} - -val ideaPluginDir: File by rootProject.extra -val ideaUltimatePluginDir: File by rootProject.extra - -task("ideaUltimatePlugin") { - dependsOn(":ideaPlugin") - into(ideaUltimatePluginDir) - from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") } - from(jar, { into("lib") }) -} - -task("idea-ultimate-plugin") { - dependsOn("ideaUltimatePlugin") - doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") } -} - -task("ideaUltimatePluginTest") { - dependsOn("check") -} - -projectTest { - dependsOn(prepareResources) - dependsOn(preparePluginXml) - workingDir = rootDir - doFirst { - if (intellijUltimateEnabled) { - systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath) - } - systemProperty("spring.classpath", springClasspath.asPath) - } -} - -val generateTests by generator("org.jetbrains.kotlin.tests.GenerateUltimateTestsKt") diff --git a/ultimate/kotlin-ultimate.iml b/ultimate/kotlin-ultimate.iml deleted file mode 100644 index 880b79a5847..00000000000 --- a/ultimate/kotlin-ultimate.iml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/resources/META-INF/kotlin-nodejs.xml b/ultimate/resources/META-INF/kotlin-nodejs.xml deleted file mode 100644 index 6846e15c71d..00000000000 --- a/ultimate/resources/META-INF/kotlin-nodejs.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/ultimate/resources/META-INF/ultimate-injection.xml b/ultimate/resources/META-INF/ultimate-injection.xml deleted file mode 100644 index 004a38ea842..00000000000 --- a/ultimate/resources/META-INF/ultimate-injection.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ultimate/resources/META-INF/ultimate-plugin.xml b/ultimate/resources/META-INF/ultimate-plugin.xml deleted file mode 100644 index 1de2dfef1e5..00000000000 --- a/ultimate/resources/META-INF/ultimate-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ - - NodeJS - \ No newline at end of file diff --git a/ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html b/ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html deleted file mode 100644 index 6947383353d..00000000000 --- a/ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html +++ /dev/null @@ -1,9 +0,0 @@ - - -This inspection reports final Kotlin classes and functions annotated with Spring @Component, @Configuration or @Bean annotations. - -

-Deprecated. This inspection is deprecated in favour of more robust "Final declaration can't be overridden at runtime" inspection. -

- - diff --git a/ultimate/resources/inspectionDescriptions/KotlinSpringComponentScan.html b/ultimate/resources/inspectionDescriptions/KotlinSpringComponentScan.html deleted file mode 100644 index cec04e3e970..00000000000 --- a/ultimate/resources/inspectionDescriptions/KotlinSpringComponentScan.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Checks @ComponentScan (and similar annotations) for setup errors. - -

- - \ No newline at end of file diff --git a/ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html b/ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html deleted file mode 100644 index 18eea8e150d..00000000000 --- a/ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html +++ /dev/null @@ -1 +0,0 @@ -Checks Spring code configuration files setup in Spring facet. \ No newline at end of file diff --git a/ultimate/resources/inspectionDescriptions/SpringKotlinAutowiredMembers.html b/ultimate/resources/inspectionDescriptions/SpringKotlinAutowiredMembers.html deleted file mode 100644 index cf8139e2c40..00000000000 --- a/ultimate/resources/inspectionDescriptions/SpringKotlinAutowiredMembers.html +++ /dev/null @@ -1 +0,0 @@ -Checks that autowired members are defined in valid Spring bean (@Component|@Service|...). \ No newline at end of file diff --git a/ultimate/resources/inspectionDescriptions/SpringKotlinAutowiring.html b/ultimate/resources/inspectionDescriptions/SpringKotlinAutowiring.html deleted file mode 100644 index 5af909dbe5b..00000000000 --- a/ultimate/resources/inspectionDescriptions/SpringKotlinAutowiring.html +++ /dev/null @@ -1 +0,0 @@ -Checks autowiring problems in a bean class. \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/cli/KotlinNodeJsRunConfigurationProducer.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/cli/KotlinNodeJsRunConfigurationProducer.kt deleted file mode 100644 index 778e851de6b..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/cli/KotlinNodeJsRunConfigurationProducer.kt +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.nodejs.cli - -import com.intellij.execution.actions.ConfigurationContext -import com.intellij.execution.actions.RunConfigurationProducer -import com.intellij.openapi.module.Module -import com.intellij.openapi.util.Ref -import com.intellij.openapi.util.io.FileUtil -import com.intellij.psi.PsiElement -import com.jetbrains.nodejs.run.NodeJsRunConfiguration -import com.jetbrains.nodejs.run.NodeJsRunConfigurationType -import org.jetbrains.kotlin.idea.MainFunctionDetector -import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationData -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider -import org.jetbrains.kotlin.idea.js.asJsModule -import org.jetbrains.kotlin.idea.js.jsProductionOutputFilePath -import org.jetbrains.kotlin.idea.nodejs.TestElementPath -import org.jetbrains.kotlin.idea.nodejs.getNodeJsEnvironmentVars -import org.jetbrains.kotlin.idea.project.languageVersionSettings -import org.jetbrains.kotlin.idea.run.addBuildTask -import org.jetbrains.kotlin.psi.KtNamedDeclaration -import org.jetbrains.kotlin.psi.KtNamedFunction -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType - -class NodeJsConfigData( - override val element: PsiElement, - override val module: Module, - override val jsOutputFilePath: String -) : KotlinJSRunConfigurationData - -private class KotlinNodeJsRunConfigurationProducer : - RunConfigurationProducer(NodeJsRunConfigurationType.getInstance()), - KotlinJSRunConfigurationDataProvider { - private val ConfigurationContext?.isAcceptable: Boolean - get() { - val original = this?.getOriginalConfiguration(null) - return original == null || original is NodeJsRunConfiguration - } - - override val isForTests: Boolean - get() = false - - override fun getConfigurationData(context: ConfigurationContext): NodeJsConfigData? { - if (!context.isAcceptable) return null - val element = context.psiLocation ?: return null - val module = context.module?.asJsModule() ?: return null - - val jsFilePath = module.jsProductionOutputFilePath ?: return null - val declaration = element.getNonStrictParentOfType() - if (declaration is KtNamedFunction) { - val detector = MainFunctionDetector(declaration.languageVersionSettings) { it.resolveToDescriptorIfAny() } - if (!detector.isMain(declaration, false)) return null - } else if (!TestElementPath.isModuleAssociatedDir(element, module)) return null - return NodeJsConfigData(element, module, jsFilePath) - } - - override fun setupConfigurationFromContext( - configuration: NodeJsRunConfiguration, - context: ConfigurationContext, - sourceElement: Ref - ): Boolean { - val psiElement = sourceElement.get() ?: return false - val configData = getConfigurationData(context) ?: return false - - if (configuration.workingDirectory.isNullOrBlank()) { - configuration.workingDirectory = FileUtil.toSystemDependentName(psiElement.project.baseDir.path) - } - configuration.inputPath = configData.jsOutputFilePath - configuration.envs = configData.module.getNodeJsEnvironmentVars(false).envs - configuration.setGeneratedName() - configuration.addBuildTask() - - return true - } - - override fun isConfigurationFromContext(configuration: NodeJsRunConfiguration, context: ConfigurationContext): Boolean { - val configData = getConfigurationData(context) ?: return false - return configuration.inputPath == configData.jsOutputFilePath - } -} diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/jest/KotlinJestRunConfigurationProducer.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/jest/KotlinJestRunConfigurationProducer.kt deleted file mode 100644 index fe9f8e072ed..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/jest/KotlinJestRunConfigurationProducer.kt +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.nodejs.jest - -import com.intellij.execution.actions.ConfigurationContext -import com.intellij.javascript.jest.JestRunConfiguration -import com.intellij.javascript.jest.JestRunConfigurationProducer -import com.intellij.javascript.jest.JestRunSettings -import com.intellij.javascript.jest.scope.JestScopeKind -import com.intellij.openapi.module.Module -import com.intellij.openapi.util.Ref -import com.intellij.openapi.util.io.FileUtil -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationData -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider -import org.jetbrains.kotlin.idea.js.asJsModule -import org.jetbrains.kotlin.idea.js.jsTestOutputFilePath -import org.jetbrains.kotlin.idea.nodejs.TestElementInfo -import org.jetbrains.kotlin.idea.nodejs.TestElementPath -import org.jetbrains.kotlin.idea.nodejs.getNodeJsEnvironmentVars -import org.jetbrains.kotlin.idea.run.addBuildTask -import org.jetbrains.kotlin.idea.util.sourceRoots - -typealias JestTestElementInfo = TestElementInfo - -class JestConfigData( - override val element: PsiElement, - override val module: Module, - override val jsOutputFilePath: String, - val testElementPath: TestElementPath -) : KotlinJSRunConfigurationData - -class KotlinJestRunConfigurationProducer : - JestRunConfigurationProducer(), - KotlinJSRunConfigurationDataProvider { - private fun createTestElementRunInfo( - configData: JestConfigData, - originalSettings: JestRunSettings - ): JestTestElementInfo { - val project = configData.module.project - - val settings = if (originalSettings.workingDirSystemDependentPath.isBlank()) { - val workingDir = FileUtil.toSystemDependentName(project.baseDir.path) - originalSettings.toBuilder().setWorkingDir(workingDir).build() - } else originalSettings - - val builder = settings.toBuilder() - builder.setTestFilePath(configData.jsOutputFilePath) - when (configData.testElementPath) { - is TestElementPath.BySuite -> { - val (suiteNames, testName) = configData.testElementPath - if (testName == null) { - builder.setScopeKind(JestScopeKind.SUITE) - builder.setTestNames(suiteNames) - } else { - builder.setScopeKind(JestScopeKind.TEST) - builder.setTestNames(suiteNames + testName) - } - } - - is TestElementPath.BySingleFile -> { - builder.setScopeKind(JestScopeKind.TEST_FILE) - } - } - builder.setEnvData(configData.module.getNodeJsEnvironmentVars(true)) - - return JestTestElementInfo(builder.build(), configData.element) - } - - override val isForTests: Boolean - get() = true - - override fun getConfigurationData( - context: ConfigurationContext - ): JestConfigData? { - val element = context.psiLocation ?: return null - val module = context.module?.asJsModule() ?: return null - - if (module.sourceRoots.none { isTestRunnerPackageAvailableFor(module.project, it) }) return null - - val testFilePath = module.jsTestOutputFilePath ?: return null - val testElementPath = TestElementPath.forElement(element, module) ?: return null - - return JestConfigData(element, module, testFilePath, testElementPath) - } - - override fun isConfigurationFromCompatibleContext(configuration: JestRunConfiguration, context: ConfigurationContext): Boolean { - val configData = getConfigurationData(context) ?: return false - val (thisRunSettings, _) = createTestElementRunInfo(configData, configuration.runSettings) - val thatRunSettings = configuration.runSettings - - if (thisRunSettings.configFileSystemDependentPath != thatRunSettings.configFileSystemDependentPath) return false - if (thatRunSettings.scopeKind != thisRunSettings.scopeKind) return false - return when (thisRunSettings.scopeKind) { - JestScopeKind.ALL -> true - JestScopeKind.TEST_FILE -> thisRunSettings.testFileSystemDependentPath == thatRunSettings.testFileSystemDependentPath - JestScopeKind.SUITE, JestScopeKind.TEST -> - thisRunSettings.testFileSystemDependentPath == thatRunSettings.testFileSystemDependentPath && - thisRunSettings.testNames == thatRunSettings.testNames - else -> false - } - } - - override fun setupConfigurationFromCompatibleContext( - configuration: JestRunConfiguration, - context: ConfigurationContext, - sourceElement: Ref - ): Boolean { - val configData = getConfigurationData(context) ?: return false - val (runSettings, enclosingTestElement) = createTestElementRunInfo(configData, configuration.runSettings) - configuration.runSettings = runSettings - sourceElement.set(enclosingTestElement) - configuration.setGeneratedName() - configuration.addBuildTask() - return true - } -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/jsTestUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/jsTestUtils.kt deleted file mode 100644 index 4b558d35200..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/jsTestUtils.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.nodejs - -import com.intellij.openapi.module.Module -import com.intellij.openapi.roots.ModuleRootManager -import com.intellij.psi.PsiDirectory -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.util.projectStructure.getModuleDir -import org.jetbrains.kotlin.psi.KtClassOrObject -import org.jetbrains.kotlin.psi.KtNamedDeclaration -import org.jetbrains.kotlin.psi.KtNamedFunction -import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf - -data class TestElementInfo(val runSettings: Settings, val enclosingTestElement: PsiElement) - -sealed class TestElementPath { - data class BySuite(val suiteNames: List, val testName: String?) : TestElementPath() - object BySingleFile : TestElementPath() - - companion object { - fun isModuleAssociatedDir(element: PsiElement, module: Module): Boolean { - if (element !is PsiDirectory) return false - val virtualFile = element.virtualFile - return (module.getModuleDir() == virtualFile.path - || virtualFile == ModuleRootManager.getInstance(module).contentRoots.singleOrNull()) - } - - fun forElement(element: PsiElement, module: Module): TestElementPath? { - if (isModuleAssociatedDir(element, module)) return TestElementPath.BySingleFile - - val declaration = element.getNonStrictParentOfType() ?: return null - val klass = when (declaration) { - is KtClassOrObject -> declaration - is KtNamedFunction -> declaration.containingClassOrObject ?: return null - else -> return null - } - val suiteNames = klass.parentsWithSelf - .filterIsInstance() - .mapNotNull { it.name } - .toList() - .asReversed() - val testName = (declaration as? KtNamedFunction)?.name - return TestElementPath.BySuite(suiteNames, testName) - } - } -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt deleted file mode 100644 index 9aac1af8d59..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt +++ /dev/null @@ -1,167 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.mocha - -import com.intellij.execution.RunManager -import com.intellij.execution.actions.ConfigurationContext -import com.intellij.openapi.module.Module -import com.intellij.openapi.project.Project -import com.intellij.openapi.util.Ref -import com.intellij.openapi.util.io.FileUtil -import com.intellij.openapi.vfs.LocalFileSystem -import com.intellij.openapi.vfs.VfsUtilCore -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.psi.PsiElement -import com.intellij.util.SmartList -import com.intellij.util.containers.SmartHashSet -import com.jetbrains.nodejs.mocha.MochaUtil -import com.jetbrains.nodejs.mocha.execution.* -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationData -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider -import org.jetbrains.kotlin.idea.js.asJsModule -import org.jetbrains.kotlin.idea.js.jsTestOutputFilePath -import org.jetbrains.kotlin.idea.nodejs.TestElementInfo -import org.jetbrains.kotlin.idea.nodejs.TestElementPath -import org.jetbrains.kotlin.idea.nodejs.getNodeJsEnvironmentVars -import org.jetbrains.kotlin.idea.run.addBuildTask -import org.jetbrains.kotlin.idea.util.sourceRoots - -private typealias MochaTestElementInfo = TestElementInfo - -class MochaConfigData( - override val element: PsiElement, - override val module: Module, - override val jsOutputFilePath: String, - val testElementPath: TestElementPath -) : KotlinJSRunConfigurationData - -class KotlinMochaRunConfigurationProducer : MochaRunConfigurationProducer(), KotlinJSRunConfigurationDataProvider { - // Copied from MochaRunConfigurationProducer.collectMochaTestRoots() - private fun collectMochaTestRoots(project: Project): List { - return RunManager - .getInstance(project) - .getConfigurationsList(MochaConfigurationType.getInstance()) - .filterIsInstance() - .mapNotNullTo(SmartList()) { configuration -> - val settings = configuration.runSettings - val path = when (settings.testKind) { - MochaTestKind.DIRECTORY -> settings.testDirPath - MochaTestKind.TEST_FILE, - MochaTestKind.SUITE, - MochaTestKind.TEST -> settings.testFilePath - else -> null - } - if (path.isNullOrBlank()) return@mapNotNullTo null - LocalFileSystem.getInstance().findFileByPath(path!!) - } - } - - private fun createTestElementRunInfo(configData: MochaConfigData, originalSettings: MochaRunSettings): MochaTestElementInfo { - val project = configData.module.project - val settings = if (originalSettings.workingDir.isBlank()) { - val workingDir = FileUtil.toSystemDependentName(project.baseDir.path) - originalSettings.builder().setWorkingDir(workingDir).build() - } else originalSettings - val builder = settings.builder() - builder.setTestFilePath(configData.jsOutputFilePath) - if (settings.ui.isEmpty()) { - builder.setUi(MochaUtil.UI_BDD) - } - when (configData.testElementPath) { - is TestElementPath.BySuite -> { - val (suiteNames, testName) = configData.testElementPath - if (testName == null) { - builder.setTestKind(MochaTestKind.SUITE) - builder.setSuiteNames(suiteNames) - } else { - builder.setTestKind(MochaTestKind.TEST) - builder.setTestNames(suiteNames + testName) - } - } - - is TestElementPath.BySingleFile -> { - builder.setTestKind(MochaTestKind.TEST_FILE) - } - } - - builder.setEnvData(configData.module.getNodeJsEnvironmentVars(true)) - - return MochaTestElementInfo(builder.build(), configData.element) - } - - override fun getConfigurationData(context: ConfigurationContext): MochaConfigData? { - val module = context.module?.asJsModule() ?: return null - val element = context.psiLocation ?: return null - val file = module.moduleFile ?: return null - val project = module.project - - val testFilePath = module.jsTestOutputFilePath ?: return null - val testElementPath = TestElementPath.forElement(element, module) ?: return null - - val configData = MochaConfigData(element, module, testFilePath, testElementPath) - - if (context.getOriginalConfiguration(MochaConfigurationType.getInstance()) is MochaRunConfiguration) return configData - - if (module.sourceRoots.any { isTestRunnerPackageAvailableFor(project, it) }) return configData - - val roots = collectMochaTestRoots(project) - if (roots.isEmpty()) return null - - val dirs = SmartHashSet() - for (root in roots) { - when { - root.isDirectory -> dirs.add(root) - root == file -> return configData - } - } - return if (VfsUtilCore.isUnder(file, dirs)) configData else null - } - - override val isForTests: Boolean - get() = true - - override fun isConfigurationFromCompatibleContext(configuration: MochaRunConfiguration, context: ConfigurationContext): Boolean { - val configData = getConfigurationData(context) ?: return false - val (thisRunSettings, _) = createTestElementRunInfo(configData, configuration.runSettings) - val thatRunSettings = configuration.runSettings - val thisTestKind = thisRunSettings.testKind - if (thisTestKind != thatRunSettings.testKind) return false - return when { - thisTestKind == MochaTestKind.DIRECTORY -> thisRunSettings.testDirPath == thatRunSettings.testDirPath - thisTestKind == MochaTestKind.PATTERN -> thisRunSettings.testFilePattern == thatRunSettings.testFilePattern - thisTestKind == MochaTestKind.TEST_FILE -> thisRunSettings.testFilePath == thatRunSettings.testFilePath - thisTestKind == MochaTestKind.SUITE -> thisRunSettings.testFilePath == thatRunSettings.testFilePath && thisRunSettings.suiteNames == thatRunSettings.suiteNames - thisTestKind != MochaTestKind.TEST -> false - else -> thisRunSettings.testFilePath == thatRunSettings.testFilePath && thisRunSettings.testNames == thatRunSettings.testNames - } - } - - override fun setupConfigurationFromCompatibleContext( - configuration: MochaRunConfiguration, - context: ConfigurationContext, - sourceElement: Ref - ): Boolean { - val configData = getConfigurationData(context) ?: return false - val (runSettings, enclosingTestElement) = createTestElementRunInfo(configData, configuration.runSettings) - if (runSettings.testKind == MochaTestKind.DIRECTORY) return false - configuration.runSettings = runSettings - sourceElement.set(enclosingTestElement) - configuration.setGeneratedName() - configuration.addBuildTask() - return true - } -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt deleted file mode 100644 index e763ac37deb..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.nodejs - -import com.intellij.execution.configuration.EnvironmentVariablesData -import com.intellij.openapi.module.Module -import com.intellij.openapi.roots.CompilerModuleExtension -import com.intellij.openapi.roots.ModuleRootManager -import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.idea.js.shouldUseJpsOutput -import org.jetbrains.kotlin.utils.addIfNotNull -import java.io.File -import java.util.* - -const val NODE_PATH_VAR = "NODE_PATH" - -fun Module.getNodeJsEnvironmentVars(isForTests: Boolean): EnvironmentVariablesData { - val nodeJsClasspath = getNodeJsClasspath(this, isForTests).joinToString(File.pathSeparator) { - val basePath = project.basePath ?: return@joinToString it - FileUtil.getRelativePath(basePath, it, '/') ?: it - } - return EnvironmentVariablesData.create(mapOf(NODE_PATH_VAR to nodeJsClasspath), true) -} - -private fun addSingleModulePaths( - target: Module, - isForTests: Boolean, - result: MutableList -) { - val compilerExtension = CompilerModuleExtension.getInstance(target) ?: return - if (isForTests) { - result.addIfNotNull(compilerExtension.compilerOutputPath?.path) - result.addIfNotNull(compilerExtension.compilerOutputPathForTests?.let { "${it.path}/lib" }) - } else { - result.addIfNotNull(compilerExtension.compilerOutputPath?.let { "${it.path}/lib" }) - } -} - -private fun getNodeJsClasspath(module: Module, isForTests: Boolean): List { - if (!module.shouldUseJpsOutput) return emptyList() - - val result = ArrayList() - ModuleRootManager.getInstance(module).orderEntries().recursively().forEachModule { - addSingleModulePaths(it, isForTests, result) - true - } - return result -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorConfigurationType.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorConfigurationType.kt deleted file mode 100644 index 2a7aa3013b6..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorConfigurationType.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.protractor - -import com.intellij.execution.configuration.ConfigurationFactoryEx -import com.intellij.execution.configurations.ConfigurationFactory -import com.intellij.execution.configurations.ConfigurationTypeBase -import com.intellij.execution.configurations.ConfigurationTypeUtil -import com.intellij.openapi.project.Project -import icons.JavaScriptLanguageIcons - -class KotlinProtractorConfigurationType : ConfigurationTypeBase( - "KotlinJavaScriptTestRunnerProtractor", - "Protractor (Kotlin)", - NAME, - JavaScriptLanguageIcons.Protractor.Protractor -) { - init { - addFactory(object : ConfigurationFactoryEx(this) { - override fun createTemplateConfiguration(project: Project) = KotlinProtractorRunConfiguration(project, this, NAME) - - override fun isConfigurationSingletonByDefault() = true - - override fun canConfigurationBeSingleton() = false - - override fun onNewConfigurationCreated(configuration: KotlinProtractorRunConfiguration) = configuration.initialize() - }) - } - - companion object { - private val NAME = "Protractor" - - fun getInstance() = ConfigurationTypeUtil.findConfigurationType(KotlinProtractorConfigurationType::class.java) - - val factory: ConfigurationFactory - get() = getInstance().configurationFactories.first() - } -} diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfiguration.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfiguration.kt deleted file mode 100644 index 7b39214f9c2..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfiguration.kt +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.protractor - -import com.intellij.execution.Executor -import com.intellij.execution.configurations.ConfigurationFactory -import com.intellij.execution.configurations.LocatableConfigurationBase -import com.intellij.execution.configurations.RuntimeConfigurationError -import com.intellij.execution.runners.ExecutionEnvironment -import com.intellij.javascript.nodejs.interpreter.local.NodeJsLocalInterpreter -import com.intellij.javascript.nodejs.util.NodePackage -import com.intellij.javascript.protractor.ProtractorUtil -import com.intellij.openapi.project.Project -import com.intellij.util.PathUtil -import org.jdom.Element -import org.jetbrains.kotlin.idea.run.LocatableConfigurationBaseAny -import java.io.File - -// Based on com.intellij.javascript.protractor.ProtractorRunConfiguration -class KotlinProtractorRunConfiguration( - project: Project, - factory: ConfigurationFactory, - name: String -) : LocatableConfigurationBaseAny(project, factory, name) { - var runSettings = KotlinProtractorRunSettings() - - val protractorPackage: NodePackage - get() { - val project = project - val interpreter = runSettings.interpreterRef.resolve(project) - return ProtractorUtil.getProtractorPackage(project, null, interpreter, true) - } - - override fun getState(executor: Executor, environment: ExecutionEnvironment) = - KotlinProtractorRunState(this, environment, protractorPackage) - - override fun getConfigurationEditor() = KotlinProtractorRunConfigurationEditor(project) - - override fun readExternal(element: Element) { - super.readExternal(element) - runSettings = KotlinProtractorRunSettings.readFromXML(element) - } - - override fun writeExternal(element: Element) { - super.writeExternal(element) - runSettings.writeToXML(element) - } - - fun initialize() { - setNameChangedByUser(false) - } - - override fun checkConfiguration() { - val isOptionalConfig = runSettings.testFileSystemDependentPath.isNotBlank() || runSettings.seleniumAddress.isNotBlank() - if (isOptionalConfig) { - validatePath("test file", runSettings.testFileSystemDependentPath, true, false) - if (runSettings.seleniumAddress.isBlank()) { - throw RuntimeConfigurationError("Unspecified Selenium address") - } - } - if (!isOptionalConfig || runSettings.configFileSystemDependentPath.isNotBlank()) { - validatePath("configuration file", runSettings.configFileSystemDependentPath, true, false) - } - - val interpreter = runSettings.interpreterRef.resolve(project) - NodeJsLocalInterpreter.checkForRunConfiguration(interpreter) - - validatePath("protractor package", protractorPackage.systemDependentPath, true, true) - } - - override fun suggestedName(): String? { - val name = PathUtil.getFileName(runSettings.testFileSystemDependentPath) - return if (name.isNotBlank()) name else null - } - - private fun validatePath(name: String, - path: String?, - shouldBeAbsolute: Boolean, - shouldBeDirectory: Boolean - ) { - if (path.isNullOrBlank()) throw RuntimeConfigurationError("Unspecified " + name) - - val file = File(path!!) - - if (shouldBeAbsolute && !file.isAbsolute) throw RuntimeConfigurationError("No such " + name) - - val exists = if (shouldBeDirectory) file.isDirectory else file.isFile - if (!exists) throw RuntimeConfigurationError("No such " + name) - } -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfigurationEditor.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfigurationEditor.kt deleted file mode 100644 index 3082aae25c7..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfigurationEditor.kt +++ /dev/null @@ -1,144 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.protractor - -import com.intellij.execution.configuration.EnvironmentVariablesTextFieldWithBrowseButton -import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterField -import com.intellij.javascript.nodejs.util.NodePackageField -import com.intellij.javascript.protractor.ProtractorUtil -import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory -import com.intellij.openapi.options.SettingsEditor -import com.intellij.openapi.options.ex.SingleConfigurableEditor -import com.intellij.openapi.project.Project -import com.intellij.openapi.ui.DialogWrapper -import com.intellij.openapi.util.io.FileUtil -import com.intellij.ui.RawCommandLineEditor -import com.intellij.ui.TextFieldWithHistoryWithBrowseButton -import com.intellij.util.containers.ContainerUtil -import com.intellij.util.ui.FormBuilder -import com.intellij.util.ui.JBUI -import com.intellij.util.ui.SwingHelper - -import javax.swing.* -import java.util.Collections - -// Based com.intellij.javascript.protractor.ProtractorRunConfigurationEditor -class KotlinProtractorRunConfigurationEditor(private val myProject: Project) : SettingsEditor() { - private val testFilePathTextFieldWithBrowseButton: TextFieldWithHistoryWithBrowseButton - private val seleniumAddressTextField: JTextField - private val extraOptionsEditor: RawCommandLineEditor - private val configPathTextFieldWithBrowseButton: TextFieldWithHistoryWithBrowseButton - private val interpreterField: NodeJsInterpreterField - private val protractorPackageField: NodePackageField - private val envVarsComponent: EnvironmentVariablesTextFieldWithBrowseButton - private val panel: JPanel - - init { - testFilePathTextFieldWithBrowseButton = createTestFileTextField(myProject) - seleniumAddressTextField = JTextField() - extraOptionsEditor = RawCommandLineEditor().apply { dialogCaption = "Extra Protractor Options" } - configPathTextFieldWithBrowseButton = createConfigurationFileTextField(myProject) - interpreterField = NodeJsInterpreterField(myProject, false) - protractorPackageField = NodePackageField(myProject, ProtractorUtil.PACKAGE_NAME) { interpreterField.interpreter } - envVarsComponent = EnvironmentVariablesTextFieldWithBrowseButton() - panel = FormBuilder() - .setAlignLabelOnRight(false) - .addLabeledComponent("&Test file:", testFilePathTextFieldWithBrowseButton) - .addLabeledComponent("&Selenium address:", seleniumAddressTextField) - .addLabeledComponent("E&xtra Protractor options:", extraOptionsEditor) - .addComponent(JSeparator(), JBUI.scale(8)) - .addLabeledComponent("&Configuration file:", configPathTextFieldWithBrowseButton) - .addComponent(JSeparator(), JBUI.scale(8)) - .addLabeledComponent("Node &interpreter:", interpreterField, JBUI.scale(8)) - .addLabeledComponent("&Protractor package:", protractorPackageField) - .addLabeledComponent("&Environment variables:", envVarsComponent) - .panel - } - - private fun createConfigurationFileTextField(project: Project) = TextFieldWithHistoryWithBrowseButton().apply { - val textFieldWithHistory = childComponent - textFieldWithHistory.setHistorySize(-1) - textFieldWithHistory.setMinimumAndPreferredWidth(0) - SwingHelper.addHistoryOnExpansion(textFieldWithHistory) { - val newFiles = ProtractorUtil.listPossibleConfigFilesInProject(project) - val newFilePaths = ContainerUtil.map(newFiles) { file -> FileUtil.toSystemDependentName(file.path) } - Collections.sort(newFilePaths) - newFilePaths - } - - SwingHelper.installFileCompletionAndBrowseDialog( - project, - this, - "Select Protractor Configuration File", - FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor() - ) - } - - private fun createTestFileTextField(project: Project) = TextFieldWithHistoryWithBrowseButton().apply { - val textFieldWithHistory = childComponent - textFieldWithHistory.setHistorySize(-1) - textFieldWithHistory.setMinimumAndPreferredWidth(0) - - SwingHelper.installFileCompletionAndBrowseDialog( - project, - this, - "Select Protractor Configuration File", - FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor() - ) - } - - override fun resetEditorFrom(runConfiguration: KotlinProtractorRunConfiguration) { - with(runConfiguration.runSettings) { - testFilePathTextFieldWithBrowseButton.setTextAndAddToHistory(testFileSystemDependentPath) - seleniumAddressTextField.text = seleniumAddress - extraOptionsEditor.text = extraOptions - configPathTextFieldWithBrowseButton.setTextAndAddToHistory(configFileSystemDependentPath) - interpreterField.interpreterRef = interpreterRef - protractorPackageField.selected = runConfiguration.protractorPackage - envVarsComponent.data = envData - } - updatePreferredWidth() - } - - private fun updatePreferredWidth() { - val dialogWrapper = DialogWrapper.findInstance(panel) - if (dialogWrapper is SingleConfigurableEditor) { - // dialog for single run configuration - interpreterField.setPreferredWidthToFitText() - protractorPackageField.setPreferredWidthToFitText() - SwingHelper.setPreferredWidthToFitText(testFilePathTextFieldWithBrowseButton) - SwingHelper.setPreferredWidthToFitText(seleniumAddressTextField) - SwingHelper.setPreferredWidthToFitText(configPathTextFieldWithBrowseButton) - ApplicationManager.getApplication().invokeLater { SwingHelper.adjustDialogSizeToFitPreferredSize(dialogWrapper) } - } - } - - override fun applyEditorTo(runConfiguration: KotlinProtractorRunConfiguration) { - ProtractorUtil.setProtractorPackage(myProject, protractorPackageField.selected) - runConfiguration.runSettings = runConfiguration.runSettings.copy( - interpreterRef = interpreterField.interpreterRef, - configFilePath = configPathTextFieldWithBrowseButton.text, - testFilePath = testFilePathTextFieldWithBrowseButton.text, - seleniumAddress = seleniumAddressTextField.text, - extraOptions = extraOptionsEditor.text, - envData = envVarsComponent.data - ) - } - - override fun createEditor() = panel -} diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfigurationProducer.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfigurationProducer.kt deleted file mode 100644 index 481c54057a7..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunConfigurationProducer.kt +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.protractor - -import com.intellij.execution.actions.CompatibleRunConfigurationProducer -import com.intellij.execution.actions.ConfigurationContext -import com.intellij.openapi.module.Module -import com.intellij.openapi.util.Ref -import com.intellij.openapi.util.io.FileUtil -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationData -import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider -import org.jetbrains.kotlin.idea.js.asJsModule -import org.jetbrains.kotlin.idea.js.jsTestOutputFilePath -import org.jetbrains.kotlin.idea.nodejs.TestElementPath -import org.jetbrains.kotlin.idea.nodejs.getNodeJsEnvironmentVars -import org.jetbrains.kotlin.idea.run.addBuildTask - -class ProtractorConfigData( - override val element: PsiElement, - override val module: Module, - override val jsOutputFilePath: String -) : KotlinJSRunConfigurationData - -class KotlinProtractorRunConfigurationProducer : - CompatibleRunConfigurationProducer(KotlinProtractorConfigurationType.getInstance()), - KotlinJSRunConfigurationDataProvider { - override val isForTests: Boolean - get() = true - - override fun getConfigurationData( - context: ConfigurationContext - ): ProtractorConfigData? { - val module = context.module?.asJsModule() ?: return null - val element = context.psiLocation ?: return null - if (!TestElementPath.isModuleAssociatedDir(element, module)) return null - val testFilePath = module.jsTestOutputFilePath ?: return null - return ProtractorConfigData(element, module, testFilePath) - } - - override fun isConfigurationFromCompatibleContext( - configuration: KotlinProtractorRunConfiguration, - context: ConfigurationContext - ): Boolean { - val configData = getConfigurationData(context) ?: return false - return configuration.runSettings.testFileSystemDependentPath == FileUtil.toSystemDependentName(configData.jsOutputFilePath) - } - - override fun setupConfigurationFromCompatibleContext( - configuration: KotlinProtractorRunConfiguration, - context: ConfigurationContext, - sourceElement: Ref - ): Boolean { - val element = context.psiLocation ?: return false - val configData = getConfigurationData(context) ?: return false - sourceElement.set(element) - configuration.runSettings = configuration.runSettings.copy( - testFilePath = configData.jsOutputFilePath, - envData = configData.module.getNodeJsEnvironmentVars(true) - ) - configuration.name = configuration.suggestedName() ?: "Unknown" - configuration.addBuildTask() - return true - } -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunSettings.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunSettings.kt deleted file mode 100644 index f58041b0a91..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunSettings.kt +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.protractor - -import com.intellij.execution.configuration.EnvironmentVariablesData -import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterRef -import com.intellij.openapi.util.JDOMExternalizerUtil.* -import com.intellij.openapi.util.io.FileUtil -import org.jdom.Element - -data class KotlinProtractorRunSettings( - val interpreterRef: NodeJsInterpreterRef = NodeJsInterpreterRef.createProjectRef(), - private val configFilePath: String = "", - private val testFilePath: String = "", - val seleniumAddress: String = "", - val extraOptions: String = "", - val envData: EnvironmentVariablesData = EnvironmentVariablesData.DEFAULT -) { - val configFileSystemDependentPath get() = FileUtil.toSystemDependentName(configFilePath) - val testFileSystemDependentPath get() = FileUtil.toSystemDependentName(testFilePath) - - fun writeToXML(element: Element) { - addElementWithValueAttribute(element, "config-file", FileUtil.toSystemIndependentName(configFileSystemDependentPath)) - addElementWithValueAttribute(element, "test-file", FileUtil.toSystemIndependentName(testFileSystemDependentPath)) - addElementWithValueAttribute(element, "selenium-address", seleniumAddress) - addElementWithValueAttribute(element, "extra-protractor-options", extraOptions) - addElementWithValueAttribute(element, "node-interpreter", interpreterRef.referenceName) - envData.writeExternal(element) - } - - companion object { - fun readFromXML(element: Element): KotlinProtractorRunSettings { - val configFilePath = getFirstChildValueAttribute(element, "config-file") - val testFilePath = getFirstChildValueAttribute(element, "test-file") - val seleniumAddress = getFirstChildValueAttribute(element, "selenium-address") - val extraOptions = getFirstChildValueAttribute(element, "extra-protractor-options") - val interpreterRefName = getFirstChildValueAttribute(element, "node-interpreter") - val envData = EnvironmentVariablesData.readExternal(element) - return KotlinProtractorRunSettings( - NodeJsInterpreterRef.create(interpreterRefName ?: "project"), - configFilePath ?: "", - testFilePath ?: "", - seleniumAddress ?: "", - extraOptions ?: "", - envData - ) - } - } -} \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunState.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunState.kt deleted file mode 100644 index 863e3ae1581..00000000000 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/protractor/KotlinProtractorRunState.kt +++ /dev/null @@ -1,178 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.nodejs.protractor - -import com.intellij.execution.DefaultExecutionResult -import com.intellij.execution.ExecutionException -import com.intellij.execution.ExecutionResult -import com.intellij.execution.Executor -import com.intellij.execution.configurations.GeneralCommandLine -import com.intellij.execution.configurations.RunProfileState -import com.intellij.execution.process.ProcessHandler -import com.intellij.execution.process.ProcessTerminatedListener -import com.intellij.execution.runners.ExecutionEnvironment -import com.intellij.execution.testframework.TestConsoleProperties -import com.intellij.execution.testframework.autotest.ToggleAutoTestAction -import com.intellij.execution.testframework.sm.SMCustomMessagesParsing -import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil -import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties -import com.intellij.execution.testframework.sm.runner.SMTestLocator -import com.intellij.execution.ui.ConsoleView -import com.intellij.javascript.HelperFilesLocator -import com.intellij.javascript.nodejs.NodeCommandLineUtil -import com.intellij.javascript.nodejs.debug.NodeLocalDebugRunProfileState -import com.intellij.javascript.nodejs.interpreter.local.NodeJsLocalInterpreter -import com.intellij.javascript.nodejs.util.NodePackage -import com.intellij.javascript.protractor.ProtractorConsoleFilter -import com.intellij.javascript.protractor.ProtractorOutputToGeneralTestEventsConverter -import com.intellij.javascript.protractor.ProtractorUtil -import com.intellij.javascript.testFramework.navigation.JSTestLocationProvider -import com.intellij.lang.javascript.buildTools.base.JsbtUtil -import com.intellij.openapi.util.Disposer -import com.intellij.util.PathUtil -import com.intellij.util.execution.ParametersListUtil -import java.io.File -import java.io.IOException -import java.nio.charset.StandardCharsets - -class KotlinProtractorRunState( - private val runConfiguration: KotlinProtractorRunConfiguration, - private val environment: ExecutionEnvironment, - private val protractorPackage: NodePackage -) : RunProfileState, NodeLocalDebugRunProfileState { - companion object { - val FRAMEWORK_NAME = "KotlinProtractorJavaScriptTestRunner" - private val INTELLIJ_CONFIG_FILE_PATH = "protractor-intellij/lib/protractor-intellij-config.js" - } - - private val project = runConfiguration.project - private val runSettings = runConfiguration.runSettings - - override fun execute(debugPort: Int): ExecutionResult { - val interpreter = runSettings.interpreterRef.resolveAsLocal(project) - val commandLine = createCommandLine(interpreter, debugPort) - val processHandler = NodeCommandLineUtil.createProcessHandler(commandLine, false) - val consoleView = createSmtRunnerConsoleView(commandLine.workDirectory) - ProcessTerminatedListener.attach(processHandler) - consoleView.attachToProcess(processHandler) - foldCommandLine(consoleView, processHandler) - val executionResult = DefaultExecutionResult(consoleView, processHandler) - executionResult.setRestartActions(ToggleAutoTestAction()) - return executionResult - } - - private fun createSmtRunnerConsoleView(workingDirectory: File?): ConsoleView { - val testConsoleProperties = ProtractorConsoleProperties(runConfiguration, environment.executor, JSTestLocationProvider()) - val consoleView = SMTestRunnerConnectionUtil.createConsole(FRAMEWORK_NAME, testConsoleProperties) - consoleView.addMessageFilter(ProtractorConsoleFilter(project, workingDirectory)) - Disposer.register(environment, consoleView) - return consoleView - } - - override fun foldCommandLine(consoleView: ConsoleView, processHandler: ProcessHandler) { - val configFileName = PathUtil.getFileName(runSettings.configFileSystemDependentPath) - val testFileName = PathUtil.getFileName(runSettings.testFileSystemDependentPath) - val seleniumAddress = runSettings.seleniumAddress - val parameters = ArrayList().apply { - add("protractor") - if (configFileName.isNotBlank()) { - add(configFileName) - } - if (testFileName.isNotBlank()) { - add("--specs=$testFileName") - } - if (seleniumAddress.isNotBlank()) { - add("--seleniumAddress=$seleniumAddress") - } - addAll(ParametersListUtil.parse(runSettings.extraOptions.trim())) - } - val foldedCommandLine = ParametersListUtil.join(parameters) - JsbtUtil.foldCommandLine(consoleView, processHandler, foldedCommandLine) - } - - private fun createCommandLine(interpreter: NodeJsLocalInterpreter, debugPort: Int): GeneralCommandLine { - val commandLine = GeneralCommandLine().apply { charset = StandardCharsets.UTF_8 } - - runSettings.envData.configureCommandLine(commandLine, true) - - val originalConfigFilePath = runSettings.configFileSystemDependentPath - val testFilePath = runSettings.testFileSystemDependentPath - val seleniumAddress = runSettings.seleniumAddress - val withConfigFile = originalConfigFilePath.isNotBlank() - commandLine.setWorkDirectory(project.basePath) - - commandLine.exePath = interpreter.interpreterSystemDependentPath - NodeCommandLineUtil.addNodeOptionsForDebugging(commandLine, emptyList(), debugPort, true, interpreter, true) - NodeCommandLineUtil.configureUsefulEnvironment(commandLine) - commandLine.addParameter(ProtractorUtil.getProtractorMainJsFile(protractorPackage).absolutePath) - - val intellijConfigFile = try { - HelperFilesLocator.getFileRelativeToHelpersDir(INTELLIJ_CONFIG_FILE_PATH) - } - catch (e: IOException) { - throw ExecutionException("Cannot locate wrapper config file", e) - } - - commandLine.addParameter(intellijConfigFile.absolutePath) - - val actualConfigFilePath = if (withConfigFile) { - originalConfigFilePath - } - else { - val tempConfigFile = File.createTempFile("protractor", "conf.js") - tempConfigFile.writeText("exports.config = {}") - tempConfigFile.absolutePath - } - - commandLine.addParameter("--intellijOriginalConfigFile=$actualConfigFilePath") - - if (testFilePath.isNotBlank()) { - commandLine.addParameter("--specs=$testFilePath") - } - - if (seleniumAddress.isNotBlank()) { - commandLine.addParameter("--seleniumAddress=$seleniumAddress") - } - - commandLine.addParameters(ParametersListUtil.parse(runSettings.extraOptions.trim())) - - commandLine.addParameter("--disableChecks") - - return commandLine - } - - private class ProtractorConsoleProperties( - configuration: KotlinProtractorRunConfiguration, - executor: Executor, - private val myLocator: SMTestLocator - ) : SMTRunnerConsoleProperties(configuration, FRAMEWORK_NAME, executor), SMCustomMessagesParsing { - init { - isUsePredefinedMessageFilter = false - setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false) - setIfUndefined(TestConsoleProperties.HIDE_IGNORED_TEST, true) - setIfUndefined(TestConsoleProperties.SCROLL_TO_SOURCE, true) - setIfUndefined(TestConsoleProperties.SELECT_FIRST_DEFECT, true) - isIdBasedTestTree = true - isPrintTestingStartedTime = false - } - - override fun getTestLocator() = myLocator - - override fun createTestEventsConverter(testFrameworkName: String, consoleProperties: TestConsoleProperties) = - ProtractorOutputToGeneralTestEventsConverter(testFrameworkName, consoleProperties.isEditable) - } -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/expected.xml b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/expected.xml deleted file mode 100644 index 27b993c66d3..00000000000 --- a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/expected.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - test.kt - 9 - light_idea_test_case - - Autowired members defined in invalid Spring bean (Kotlin) - Autowired members must be defined in valid Spring bean (@Component|@Service|...) - - diff --git a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test deleted file mode 100644 index 93b10c2c128..00000000000 --- a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test +++ /dev/null @@ -1,2 +0,0 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.autowire.SpringUastAutowiredMembersInspection -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/test.kt b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/test.kt deleted file mode 100644 index eabce3aad5e..00000000000 --- a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/test.kt +++ /dev/null @@ -1,19 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.stereotype.Component -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.web.context.support.SpringBeanAutowiringSupport - -open class KtBean1 { - @Autowired var foo: Int = 1 -} - -@Component -open class KtBean2 { - @Autowired var foo: Int = 1 -} - -open class KtBean3 : SpringBeanAutowiringSupport() { - @Autowired var foo: Int = 1 -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/incompleteAutowired.kt b/ultimate/testData/inspections/spring/autowiring/incompleteAutowired.kt deleted file mode 100644 index 949a0d878e3..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/incompleteAutowired.kt +++ /dev/null @@ -1,25 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import org.springframework.beans.factory.annotation.Qualifier - -@Configuration -@ComponentScan -open class InvalidAutowiredByTypeQualifiers - -abstract class AbstractBarBean -@Component -open class BarBean1 : AbstractBarBean() -@Component -open class BarBean2 : AbstractBarBean() - -@Component -open class IncompleteClassAutowiring() { - @Autowired - lateinit var : String - -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml deleted file mode 100644 index 589f18259fa..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - invalidAutowiredResource.kt - 24 - - Autowiring for Bean Class (Kotlin) - Could not autowire. Bean should be of 'invalidAutowiredResource.BarBean' type - - - invalidAutowiredResource.kt - 31 - - Autowiring for Bean Class (Kotlin) - Cannot resolve bean 'fooBeannn' - - - - invalidAutowiredQualifier.kt - 23 - - Autowiring for Bean Class (Kotlin) - Could not autowire. Qualified bean must be of 'BarBean' type. - - - invalidAutowiredQualifier.kt - 30 - - Autowiring for Bean Class (Kotlin) - Cannot find bean with qualifier 'fooBeannn' - - - invalidAutowiredQualifier.kt - 37 - - Autowiring for Bean Class (Kotlin) - Cannot find bean qualified with @Qualifier - - - - invalidAutowiredByType.kt - 23 - - Autowiring for Bean Class (Kotlin) - Could not autowire. No beans of 'String' type found. - - - invalidAutowiredByType.kt - 29 - - Autowiring for Bean Class (Kotlin) - <html><table><tr><td>Could not autowire. There is more than one bean of 'AbstractBarBean' type.</td></tr><tr><td><table><tr><td valign='top'>Beans:</td><td>abstractBarBean&nbsp;&nbsp; (invalidAutowiredByType.kt)<br>barBean1&nbsp;&nbsp; (invalidAutowiredByType.kt)<br>barBean2&nbsp;&nbsp; (invalidAutowiredByType.kt)<br></td></tr></table></td></tr></table></html> - - diff --git a/ultimate/testData/inspections/spring/autowiring/inspectionData/inspections.test b/ultimate/testData/inspections/spring/autowiring/inspectionData/inspections.test deleted file mode 100644 index 1170f2a27be..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/inspectionData/inspections.test +++ /dev/null @@ -1,4 +0,0 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.autowire.SpringUastInjectionPointsAutowiringInspection -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// CONFIGURE_SPRING_FILE_SET -// RUNTIME_WITH_FULL_JDK \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/invalidAutowiredByType.kt b/ultimate/testData/inspections/spring/autowiring/invalidAutowiredByType.kt deleted file mode 100644 index da5d5774f1e..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/invalidAutowiredByType.kt +++ /dev/null @@ -1,30 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import org.springframework.beans.factory.annotation.Qualifier - -@Configuration -@ComponentScan -open class InvalidAutowiredByTypeQualifiers - -abstract class AbstractBarBean -@Component -open class BarBean1 : AbstractBarBean() -@Component -open class BarBean2 : AbstractBarBean() - -@Component -open class NoAutowiredCandidates() { - @Autowired - lateinit var bean: String -} - -@Component -open class MultipleAutowiredCandidates() { - @Autowired - lateinit var bean: AbstractBarBean -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/invalidAutowiredQualifier.kt b/ultimate/testData/inspections/spring/autowiring/invalidAutowiredQualifier.kt deleted file mode 100644 index 999dfb23e2f..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/invalidAutowiredQualifier.kt +++ /dev/null @@ -1,39 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import org.springframework.beans.factory.annotation.Qualifier - -@Configuration -@ComponentScan -open class MismatchedTypes - -@Component -open class FooBean - -@Component -open class BarBean - -@Component -open class MismatchedType() { - @Autowired - @Qualifier("fooBean") - lateinit var bean1: BarBean -} - -@Component -open class UnresolvedBeanRef() { - @Autowired - @Qualifier("fooBeannn") - lateinit var bean1: FooBean -} - -@Component -open class NamelessQualifier() { - @Autowired - @Qualifier - lateinit var bean1: FooBean -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/invalidAutowiredResource.kt b/ultimate/testData/inspections/spring/autowiring/invalidAutowiredResource.kt deleted file mode 100644 index 27003a4b215..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/invalidAutowiredResource.kt +++ /dev/null @@ -1,33 +0,0 @@ - -// WITH_RUNTIME -// FULL_JDK - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import javax.annotation.Resource - -@Configuration -@ComponentScan -open class MismatchedTypes - -@Component -open class FooBean - -@Component -open class BarBean - -@Component -open class MismatchedType() { - @Autowired - @Resource(name = "fooBean") - lateinit var bean1: BarBean -} - -@Component -open class UnresolvedBeanRef() { - @Autowired - @Resource(name = "fooBeannn") - lateinit var bean1: FooBean -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/parameterlessFunction.kt b/ultimate/testData/inspections/spring/autowiring/parameterlessFunction.kt deleted file mode 100644 index d57aff0e4e6..00000000000 --- a/ultimate/testData/inspections/spring/autowiring/parameterlessFunction.kt +++ /dev/null @@ -1,16 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan -open class ParameterlessFunctions - -@Component -open class ParameterlessFunction { - @Autowired fun foo() = 1 -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/componentScan/foo/beans.kt b/ultimate/testData/inspections/spring/componentScan/foo/beans.kt deleted file mode 100644 index 82874a1ce6f..00000000000 --- a/ultimate/testData/inspections/spring/componentScan/foo/beans.kt +++ /dev/null @@ -1,6 +0,0 @@ -package foo - -// Make PsiPackage not empty -fun dummyFun() { - -} \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml b/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml deleted file mode 100644 index 7b45656e2b0..00000000000 --- a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - test.kt - 14 - <default> - - @ComponentScan setup - Cannot resolve symbol 'bar' - - - test.kt - 18 - <default> - - @ComponentScan setup - Cannot resolve symbol 'bar' - - diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test b/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test deleted file mode 100644 index 3f1dea3c44a..00000000000 --- a/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test +++ /dev/null @@ -1,3 +0,0 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.jam.SpringComponentScanInspection -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// CONFIGURE_SPRING_FILE_SET \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/componentScan/test.kt b/ultimate/testData/inspections/spring/componentScan/test.kt deleted file mode 100644 index bc23e390234..00000000000 --- a/ultimate/testData/inspections/spring/componentScan/test.kt +++ /dev/null @@ -1,19 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("foo")) -open class App1 - -@Configuration -@ComponentScan(basePackages = arrayOf("foo", "bar")) -open class App2 - -@Configuration -@ComponentScan(basePackages = arrayOf("bar")) -open class App3 \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml deleted file mode 100644 index 8a6bda4697b..00000000000 --- a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - test.kt - 12 - light_idea_test_case - - Spring Facet Code Configuration (Kotlin) - Application context not configured for this file - - - test.kt - 15 - light_idea_test_case - - Spring Facet Code Configuration (Kotlin) - Application context not configured for this file - - diff --git a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test deleted file mode 100644 index dbe03e885bd..00000000000 --- a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test +++ /dev/null @@ -1,3 +0,0 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.config.SpringFacetUastInspection -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// FORBID_SPRING_FILE_SET_AUTOCONFIGURE \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/unconfiguredFacet/test.kt b/ultimate/testData/inspections/spring/unconfiguredFacet/test.kt deleted file mode 100644 index 1c78223ef09..00000000000 --- a/ultimate/testData/inspections/spring/unconfiguredFacet/test.kt +++ /dev/null @@ -1,15 +0,0 @@ - -// WITH_RUNTIME - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan -annotation class MyConfiguration - -@Configuration -class Application1 - -@MyConfiguration -class Application2 \ No newline at end of file diff --git a/ultimate/testData/quickFixes/spring/addQualifierAnnotation/.inspection b/ultimate/testData/quickFixes/spring/addQualifierAnnotation/.inspection deleted file mode 100644 index 4b2e63563aa..00000000000 --- a/ultimate/testData/quickFixes/spring/addQualifierAnnotation/.inspection +++ /dev/null @@ -1 +0,0 @@ -com.intellij.spring.model.highlighting.autowire.SpringUastInjectionPointsAutowiringInspection \ No newline at end of file diff --git a/ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt b/ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt deleted file mode 100644 index a25b5d36761..00000000000 --- a/ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt +++ /dev/null @@ -1,30 +0,0 @@ -// "Add qualifier" "true" -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// CONFIGURE_SPRING_FILE_SET -// WITH_RUNTIME -// DISABLE-ERRORS -// FORCE_PACKAGE_FOLDER - -package pkg - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import org.springframework.beans.factory.annotation.Qualifier - -@Configuration -@ComponentScan -open class InvalidAutowiredByTypeQualifiers - -abstract class BaseBarBean -@Component -open class BarBean1 : BaseBarBean() -@Component -open class BarBean2 : BaseBarBean() - -@Component -open class MultipleAutowiredCandidates() { - @Autowired - lateinit var bean: BaseBarBean -} \ No newline at end of file diff --git a/ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt.after b/ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt.after deleted file mode 100644 index e043d12d4cb..00000000000 --- a/ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt.after +++ /dev/null @@ -1,31 +0,0 @@ -// "Add qualifier" "true" -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// CONFIGURE_SPRING_FILE_SET -// WITH_RUNTIME -// DISABLE-ERRORS -// FORCE_PACKAGE_FOLDER - -package pkg - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import org.springframework.beans.factory.annotation.Qualifier - -@Configuration -@ComponentScan -open class InvalidAutowiredByTypeQualifiers - -abstract class BaseBarBean -@Component -open class BarBean1 : BaseBarBean() -@Component -open class BarBean2 : BaseBarBean() - -@Component -open class MultipleAutowiredCandidates() { - @Qualifier("barBean1") - @Autowired - lateinit var bean: BaseBarBean -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/classXml-config.xml b/ultimate/testData/spring/core/findUsages/classXml-config.xml deleted file mode 100644 index a0358e22a83..00000000000 --- a/ultimate/testData/spring/core/findUsages/classXml-config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/classXml.kt b/ultimate/testData/spring/core/findUsages/classXml.kt deleted file mode 100644 index 996c488c7ca..00000000000 --- a/ultimate/testData/spring/core/findUsages/classXml.kt +++ /dev/null @@ -1,6 +0,0 @@ -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass -// OPTIONS: usages -package a - -class KotlinSpringBean \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/classXml.results.txt b/ultimate/testData/spring/core/findUsages/classXml.results.txt deleted file mode 100644 index 30446677bb6..00000000000 --- a/ultimate/testData/spring/core/findUsages/classXml.results.txt +++ /dev/null @@ -1 +0,0 @@ -Usage in XML descriptor 5 \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml-config.xml b/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml-config.xml deleted file mode 100644 index eaf33c31f00..00000000000 --- a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.kt b/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.kt deleted file mode 100644 index 0258aa0f7c5..00000000000 --- a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.kt +++ /dev/null @@ -1,6 +0,0 @@ -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter -// OPTIONS: usages -package a - -class KotlinSpringBean(var value: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt b/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt deleted file mode 100644 index 7a3c68f2683..00000000000 --- a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt +++ /dev/null @@ -1,2 +0,0 @@ -Usage in XML descriptor 6 -Usage in XML descriptor 7 \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/propertyXml-config.xml b/ultimate/testData/spring/core/findUsages/propertyXml-config.xml deleted file mode 100644 index d52dc4ae40c..00000000000 --- a/ultimate/testData/spring/core/findUsages/propertyXml-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/propertyXml.kt b/ultimate/testData/spring/core/findUsages/propertyXml.kt deleted file mode 100644 index 5bf3e0e252a..00000000000 --- a/ultimate/testData/spring/core/findUsages/propertyXml.kt +++ /dev/null @@ -1,8 +0,0 @@ -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty -// OPTIONS: usages -package a - -class KotlinSpringBean { - var foo: Int = 1 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/propertyXml.results.txt b/ultimate/testData/spring/core/findUsages/propertyXml.results.txt deleted file mode 100644 index af8e1385418..00000000000 --- a/ultimate/testData/spring/core/findUsages/propertyXml.results.txt +++ /dev/null @@ -1 +0,0 @@ -Usage in XML descriptor 6 \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/setterFunXml-config.xml b/ultimate/testData/spring/core/findUsages/setterFunXml-config.xml deleted file mode 100644 index 5ca9c80d876..00000000000 --- a/ultimate/testData/spring/core/findUsages/setterFunXml-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/setterFunXml.kt b/ultimate/testData/spring/core/findUsages/setterFunXml.kt deleted file mode 100644 index 2f4bc8cee34..00000000000 --- a/ultimate/testData/spring/core/findUsages/setterFunXml.kt +++ /dev/null @@ -1,10 +0,0 @@ -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction -// OPTIONS: usages -package a - -class KotlinSpringBean { - fun setBar(value: Int) { - - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt b/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt deleted file mode 100644 index 92fc23a904c..00000000000 --- a/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt +++ /dev/null @@ -1 +0,0 @@ -Usage in XML descriptor 6 \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt b/ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt deleted file mode 100644 index 7a2ef938744..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt +++ /dev/null @@ -1,11 +0,0 @@ -// ELEMENT: lang -// CHAR: \n - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("java.lang")) -open class App { - -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt.after b/ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt.after deleted file mode 100644 index 76d5d929ea4..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt.after +++ /dev/null @@ -1,11 +0,0 @@ -// ELEMENT: lang -// CHAR: \n - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("java.langng")) -open class App { - -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt b/ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt deleted file mode 100644 index 818a7196632..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt +++ /dev/null @@ -1,11 +0,0 @@ -// ELEMENT: lang -// CHAR: \t - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("java.lang")) -open class App { - -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt.after b/ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt.after deleted file mode 100644 index 0b4dec69a5c..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt.after +++ /dev/null @@ -1,11 +0,0 @@ -// ELEMENT: lang -// CHAR: \t - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("java.lang")) -open class App { - -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt b/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt deleted file mode 100644 index b1290ffa9b1..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt +++ /dev/null @@ -1,12 +0,0 @@ -// ELEMENT: existingBean1 -// CHAR: \n -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existing") @Autowired lateinit var multi1: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt.after b/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt.after deleted file mode 100644 index c9fc7144ca9..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt.after +++ /dev/null @@ -1,12 +0,0 @@ -// ELEMENT: existingBean1 -// CHAR: \n -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existingBean1ing") @Autowired lateinit var multi1: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt b/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt deleted file mode 100644 index 39af7f3af95..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt +++ /dev/null @@ -1,12 +0,0 @@ -// ELEMENT: existingBean1 -// CHAR: \t -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existing") @Autowired lateinit var multi1: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt.after b/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt.after deleted file mode 100644 index 62055aa9aa1..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt.after +++ /dev/null @@ -1,12 +0,0 @@ -// ELEMENT: existingBean1 -// CHAR: \t -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existingBean1") @Autowired lateinit var multi1: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt b/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt deleted file mode 100644 index 57a792359c2..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt +++ /dev/null @@ -1,7 +0,0 @@ -// ELEMENT: singleton -package test - -import org.springframework.context.annotation.Scope - -@Scope("") -class ScopedBean \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after b/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after deleted file mode 100644 index e8b62870d1c..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -// ELEMENT: singleton -package test - -import org.springframework.context.annotation.Scope - -@Scope("singleton") -class ScopedBean \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/spring-config.xml b/ultimate/testData/spring/core/references/completion/handler/spring-config.xml deleted file mode 100644 index e75e0155c82..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/spring-config.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt deleted file mode 100644 index 8e60f0bd691..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt +++ /dev/null @@ -1,14 +0,0 @@ -// ELEMENT: fooBean -// CHAR: \n -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - factory.getBean("foo") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after deleted file mode 100644 index f83d065dc0d..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after +++ /dev/null @@ -1,14 +0,0 @@ -// ELEMENT: fooBean -// CHAR: \n -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - factory.getBean("fooBeano") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt deleted file mode 100644 index d5c9415da75..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt +++ /dev/null @@ -1,14 +0,0 @@ -// ELEMENT: fooBean -// CHAR: \t -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - factory.getBean("foo") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after deleted file mode 100644 index 90eafe886ec..00000000000 --- a/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after +++ /dev/null @@ -1,14 +0,0 @@ -// ELEMENT: fooBean -// CHAR: \t -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - factory.getBean("fooBean") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/beanWithDefaultName.kt b/ultimate/testData/spring/core/references/completion/variants/beanWithDefaultName.kt deleted file mode 100644 index 5e76a257a97..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/beanWithDefaultName.kt +++ /dev/null @@ -1,24 +0,0 @@ -// NUMBER: 1 -// EXIST: { lookupString:"buildBar" } - -package a - -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.AnnotationConfigApplicationContext - -class FooBean -class BarBean - -@Configuration -open class KotlinAnnotated { - @Bean(name=arrayOf("annFooBean")) open fun buildFoo(): FooBean = FooBean() - @Bean open fun buildBar(): BarBean = BarBean() -} - -class Test { - fun test() { - val context = AnnotationConfigApplicationContext("a"); - context.getBean("build") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/beanWithExplicitName.kt b/ultimate/testData/spring/core/references/completion/variants/beanWithExplicitName.kt deleted file mode 100644 index 88bac89ef05..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/beanWithExplicitName.kt +++ /dev/null @@ -1,25 +0,0 @@ -// NUMBER: 2 -// EXIST: { lookupString:"annFooBean" } -// EXIST: { lookupString:"kotlinAnnotated" } - -package a - -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.AnnotationConfigApplicationContext - -class FooBean -class BarBean - -@Configuration -open class KotlinAnnotated { - @Bean(name=arrayOf("annFooBean")) open fun buildFoo(): FooBean = FooBean() - @Bean open fun buildBar(): BarBean = BarBean() -} - -class Test { - fun test() { - val context = AnnotationConfigApplicationContext("a"); - context.getBean("ann") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/packageReference.kt b/ultimate/testData/spring/core/references/completion/variants/packageReference.kt deleted file mode 100644 index 9815f09dde8..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/packageReference.kt +++ /dev/null @@ -1,13 +0,0 @@ -// NUMBER: 3 -// EXIST: { lookupString:"lang" } -// EXIST: { lookupString:"util" } -// EXIST: { lookupString:"sql" } - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("java.lang")) -open class App { - -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml-config.xml b/ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml-config.xml deleted file mode 100644 index ace07fd4d29..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml-config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml.kt b/ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml.kt deleted file mode 100644 index 28e27714f8a..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml.kt +++ /dev/null @@ -1,15 +0,0 @@ -// NUMBER: 3 -// EXIST: { lookupString:"anotherBean" } -// EXIST: { lookupString:"existingBean1" } -// EXIST: { lookupString:"existingBean2" } - -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existingBean1") @Autowired lateinit var multi1: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml-config.xml b/ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml-config.xml deleted file mode 100644 index ace07fd4d29..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml-config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml.kt b/ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml.kt deleted file mode 100644 index b64a3b0d523..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml.kt +++ /dev/null @@ -1,14 +0,0 @@ -// NUMBER: 2 -// EXIST: { lookupString:"existingBean1" } -// EXIST: { lookupString:"existingBean2" } - -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existingBean2") @Autowired lateinit var multi2: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml-config.xml b/ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml-config.xml deleted file mode 100644 index b3fb31598a4..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml.kt b/ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml.kt deleted file mode 100644 index 6a8e5d626f3..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml.kt +++ /dev/null @@ -1,9 +0,0 @@ -// NUMBER: 2 -// EXIST: { lookupString:"singleton" } -// EXIST: { lookupString:"prototype" } -package test - -import org.springframework.context.annotation.Scope - -@Scope("") -class ScopedBean \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml-config.xml b/ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml-config.xml deleted file mode 100644 index b3fb31598a4..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml.kt b/ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml.kt deleted file mode 100644 index eb587c52a04..00000000000 --- a/ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml.kt +++ /dev/null @@ -1,15 +0,0 @@ -// NUMBER: 2 -// EXIST: { lookupString:"fooBean" } -// EXIST: { lookupString:"fooBean2" } -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - factory.getBean("foo") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt deleted file mode 100644 index 5b7ed134fbf..00000000000 --- a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt +++ /dev/null @@ -1,9 +0,0 @@ -// NO_XML_CONFIG -// REF: /src.fileReferenceInClasspathResource.test.xml -import org.springframework.core.io.ClassPathResource - -class Bean { - init { - ClassPathResource("fileReferenceInClasspathResource.test.xml") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml deleted file mode 100644 index 5f79f12a9aa..00000000000 --- a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt deleted file mode 100644 index 7fc2d302e59..00000000000 --- a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt +++ /dev/null @@ -1,9 +0,0 @@ -// NO_XML_CONFIG -// REF: /src.fileReferenceInClasspathXmlContext.test.xml -import org.springframework.context.support.ClassPathXmlApplicationContext - -class Bean { - init { - ClassPathXmlApplicationContext("fileReferenceInClasspathXmlContext.test.xml") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml deleted file mode 100644 index 5f79f12a9aa..00000000000 --- a/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt b/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt deleted file mode 100644 index 34f0550032e..00000000000 --- a/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt +++ /dev/null @@ -1,12 +0,0 @@ -// NO_XML_CONFIG -// REF: java -// REF: java.java - -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@Configuration -@ComponentScan(basePackages = arrayOf("java")) -open class App { - -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/qualifierReference.kt b/ultimate/testData/spring/core/references/navigation/qualifierReference.kt deleted file mode 100644 index 8ade443396e..00000000000 --- a/ultimate/testData/spring/core/references/navigation/qualifierReference.kt +++ /dev/null @@ -1,11 +0,0 @@ -// REF: \n \n -package bean - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier - -class MultiHolder(var thing: String) - -class AutoMultiUser() { - @Qualifier("existingBean1") @Autowired lateinit var multi1: MultiHolder -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/qualifierReference_config.xml b/ultimate/testData/spring/core/references/navigation/qualifierReference_config.xml deleted file mode 100644 index ace07fd4d29..00000000000 --- a/ultimate/testData/spring/core/references/navigation/qualifierReference_config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/scopeReference.kt b/ultimate/testData/spring/core/references/navigation/scopeReference.kt deleted file mode 100644 index 34a710a0311..00000000000 --- a/ultimate/testData/spring/core/references/navigation/scopeReference.kt +++ /dev/null @@ -1,7 +0,0 @@ -// REF: singleton -package test - -import org.springframework.context.annotation.Scope - -@Scope("singleton") -class Bean \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/scopeReference_config.xml b/ultimate/testData/spring/core/references/navigation/scopeReference_config.xml deleted file mode 100644 index aacac5ca9a6..00000000000 --- a/ultimate/testData/spring/core/references/navigation/scopeReference_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt deleted file mode 100644 index 6b5fa35e76f..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt +++ /dev/null @@ -1,13 +0,0 @@ -// REF: -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - if (factory.containsBean("fooBean")) println("FooBean") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml deleted file mode 100644 index 5d68c8ea557..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt deleted file mode 100644 index bf12f85b0bd..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt +++ /dev/null @@ -1,13 +0,0 @@ -// REF: -import org.springframework.beans.factory.BeanFactory -import org.springframework.beans.factory.xml.XmlBeanFactory -import org.springframework.core.io.FileSystemResource -import org.springframework.core.io.Resource - -class FooBeanClass { - init { - val configFile = FileSystemResource("spring-config.xml") - val factory = XmlBeanFactory(configFile) - factory.getBean("fooBean") - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml deleted file mode 100644 index 8f56c744117..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt deleted file mode 100644 index 4f79d7dbb6f..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt +++ /dev/null @@ -1,11 +0,0 @@ -// JAVAX_ANNOTATION_RESOURCE -// REF: -package test - -import javax.annotation.Resource - -class Bean - -class Test { - @Resource(name= "fooBean") lateinit var name: String -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml deleted file mode 100644 index aacac5ca9a6..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt b/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt deleted file mode 100644 index 55dd5023aa0..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt +++ /dev/null @@ -1,11 +0,0 @@ -// JAVAX_ANNOTATION_RESOURCE -// REF: -package test - -import javax.annotation.Resource - -class Bean - -class Test { - @Resource(name= "&fooBean") lateinit var name: String -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml b/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml deleted file mode 100644 index aacac5ca9a6..00000000000 --- a/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/BeanA.java b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/BeanA.java deleted file mode 100644 index 0f693c0bcdf..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/BeanA.java +++ /dev/null @@ -1,4 +0,0 @@ -package bean; - -public class BeanA { -} diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/JavaRef.java b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/JavaRef.java deleted file mode 100644 index 1520f9d7ae5..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/JavaRef.java +++ /dev/null @@ -1,8 +0,0 @@ -package bean; - -import org.springframework.beans.factory.annotation.Value; - -public class JavaRef { - @Value("#{ nameJ }") private BeanA valueA; - @Value("#{ nameK2 }") private BeanA valueK; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/KotlinConfig.kt b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/KotlinConfig.kt deleted file mode 100644 index bb095845190..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/KotlinConfig.kt +++ /dev/null @@ -1,8 +0,0 @@ -package bean - -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration - -@Configuration open class KotlinConfig { - @Bean(name = arrayOf("nameK2")) open fun createBeanK() = BeanA() -} diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/spring-config.xml b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/spring-config.xml deleted file mode 100644 index 8db5217300b..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/after/bean/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/annotationArgBySpELRefInXMLConf.test b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/annotationArgBySpELRefInXMLConf.test deleted file mode 100644 index b1ad5aeb2cc..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/annotationArgBySpELRefInXMLConf.test +++ /dev/null @@ -1,11 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "bean/spring-config.xml", - "springFileSet": ["bean/spring-config.xml", "bean/KotlinConfig.kt"], - "newName": "nameK2", - "byRef": "true", - "withRuntime": "true", - "searchInComments": "false", - "searchInTextOccurrences": "false" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/BeanA.java b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/BeanA.java deleted file mode 100644 index 0f693c0bcdf..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/BeanA.java +++ /dev/null @@ -1,4 +0,0 @@ -package bean; - -public class BeanA { -} diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/JavaRef.java b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/JavaRef.java deleted file mode 100644 index 79f3697fa4e..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/JavaRef.java +++ /dev/null @@ -1,8 +0,0 @@ -package bean; - -import org.springframework.beans.factory.annotation.Value; - -public class JavaRef { - @Value("#{ nameJ }") private BeanA valueA; - @Value("#{ nameK }") private BeanA valueK; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/KotlinConfig.kt b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/KotlinConfig.kt deleted file mode 100644 index ad2edfd76f0..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/KotlinConfig.kt +++ /dev/null @@ -1,8 +0,0 @@ -package bean - -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration - -@Configuration open class KotlinConfig { - @Bean(name = arrayOf("nameK")) open fun createBeanK() = BeanA() -} diff --git a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/spring-config.xml b/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/spring-config.xml deleted file mode 100644 index 7a1508825f6..00000000000 --- a/ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/before/bean/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefs/after/spring-config.xml b/ultimate/testData/spring/core/rename/classWithXmlRefs/after/spring-config.xml deleted file mode 100644 index 1e35b72204a..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefs/after/spring-config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefs/after/test.kt b/ultimate/testData/spring/core/rename/classWithXmlRefs/after/test.kt deleted file mode 100644 index 0321ef20a49..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefs/after/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean2 \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefs/before/spring-config.xml b/ultimate/testData/spring/core/rename/classWithXmlRefs/before/spring-config.xml deleted file mode 100644 index a0358e22a83..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefs/before/spring-config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefs/before/test.kt b/ultimate/testData/spring/core/rename/classWithXmlRefs/before/test.kt deleted file mode 100644 index fceedad6a43..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefs/before/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class /*rename*/KotlinSpringBean \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefs/classWithXmlRef.test b/ultimate/testData/spring/core/rename/classWithXmlRefs/classWithXmlRef.test deleted file mode 100644 index d56390b1af1..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefs/classWithXmlRef.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test.kt", - "springFileSet": ["spring-config.xml"], - "newName": "KotlinSpringBean2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/after/spring-config.xml b/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/after/spring-config.xml deleted file mode 100644 index 1e35b72204a..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/after/spring-config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/after/test.kt b/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/after/test.kt deleted file mode 100644 index 0321ef20a49..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/after/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean2 \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/before/spring-config.xml b/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/before/spring-config.xml deleted file mode 100644 index aa2eed3a993..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/before/spring-config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/before/test.kt b/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/before/test.kt deleted file mode 100644 index 67958d2e596..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/before/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/classWithXmlRefByRef.test b/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/classWithXmlRefByRef.test deleted file mode 100644 index 1e56c4e3499..00000000000 --- a/ultimate/testData/spring/core/rename/classWithXmlRefsByRef/classWithXmlRefByRef.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "spring-config.xml", - "springFileSet": ["spring-config.xml"], - "newName": "KotlinSpringBean2", - "byRef": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParam/after/spring-config.xml b/ultimate/testData/spring/core/rename/factoryMethodParam/after/spring-config.xml deleted file mode 100644 index 6887d61aef2..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParam/after/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParam/after/test.kt b/ultimate/testData/spring/core/rename/factoryMethodParam/after/test.kt deleted file mode 100644 index 309157c0c95..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParam/after/test.kt +++ /dev/null @@ -1,6 +0,0 @@ -package a - -class Construction(param: Int) -object FactoryObject { - @JvmStatic fun buildObject(param2: Int) = Construction(param2) -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParam/before/spring-config.xml b/ultimate/testData/spring/core/rename/factoryMethodParam/before/spring-config.xml deleted file mode 100644 index 3e02bffeb50..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParam/before/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParam/before/test.kt b/ultimate/testData/spring/core/rename/factoryMethodParam/before/test.kt deleted file mode 100644 index f6efaebb764..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParam/before/test.kt +++ /dev/null @@ -1,6 +0,0 @@ -package a - -class Construction(param: Int) -object FactoryObject { - @JvmStatic fun buildObject(/*rename*/param: Int) = Construction(param) -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParam/factoryMethodParam.test b/ultimate/testData/spring/core/rename/factoryMethodParam/factoryMethodParam.test deleted file mode 100644 index b6f5eeba880..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParam/factoryMethodParam.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test.kt", - "springFileSet": ["spring-config.xml"], - "newName": "param2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/after/spring-config.xml b/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/after/spring-config.xml deleted file mode 100644 index 6887d61aef2..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/after/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/after/test.kt b/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/after/test.kt deleted file mode 100644 index 309157c0c95..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/after/test.kt +++ /dev/null @@ -1,6 +0,0 @@ -package a - -class Construction(param: Int) -object FactoryObject { - @JvmStatic fun buildObject(param2: Int) = Construction(param2) -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/before/spring-config.xml b/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/before/spring-config.xml deleted file mode 100644 index 2f76fa257ff..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/before/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/before/test.kt b/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/before/test.kt deleted file mode 100644 index 6cf3cf26394..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/before/test.kt +++ /dev/null @@ -1,6 +0,0 @@ -package a - -class Construction(param: Int) -object FactoryObject { - @JvmStatic fun buildObject(param: Int) = Construction(param) -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/factoryMethodParamByXmlRef.test b/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/factoryMethodParamByXmlRef.test deleted file mode 100644 index 447065ea15e..00000000000 --- a/ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/factoryMethodParamByXmlRef.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "spring-config.xml", - "springFileSet": ["spring-config.xml"], - "newName": "param2", - "byRef": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/J.java b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/J.java deleted file mode 100644 index becbee315a8..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/J.java +++ /dev/null @@ -1,9 +0,0 @@ -package a; - -public class J { - static void test() { - KotlinSpringBean bean = new KotlinSpringBean(1); - bean.isFooNew(); - bean.setFooNew(true); - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/spring-config.xml b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/spring-config.xml deleted file mode 100644 index f0398ba8edb..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/spring-config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/test.kt b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/test.kt deleted file mode 100644 index 09db585764b..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/after/a/test.kt +++ /dev/null @@ -1,11 +0,0 @@ -package a - -class KotlinSpringBean(value: Int) { - var isFooNew: Boolean = false -} - -fun test() { - val bean = KotlinSpringBean(1) - bean.isFooNew - bean.isFooNew = true -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/J.java b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/J.java deleted file mode 100644 index 22d19c4c6cf..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/J.java +++ /dev/null @@ -1,9 +0,0 @@ -package a; - -public class J { - static void test() { - KotlinSpringBean bean = new KotlinSpringBean(1); - bean.isFoo(); - bean.setFoo(true); - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/spring-config.xml b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/spring-config.xml deleted file mode 100644 index 7dc8b407a10..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/spring-config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/test.kt b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/test.kt deleted file mode 100644 index b4f5b4676e8..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/before/a/test.kt +++ /dev/null @@ -1,11 +0,0 @@ -package a - -class KotlinSpringBean(value: Int) { - var isFoo: Boolean = false -} - -fun test() { - val bean = KotlinSpringBean(1) - bean.isFoo - bean.isFoo = true -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/isPropertyWithXmlRefBySpelRef.test b/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/isPropertyWithXmlRefBySpelRef.test deleted file mode 100644 index d7418b55207..00000000000 --- a/ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/isPropertyWithXmlRefBySpelRef.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "a/spring-config.xml", - "springFileSet": ["a/spring-config.xml"], - "newName": "isFooNew", - "byRef": "true", - "injected": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/JavaAnnotated.java deleted file mode 100644 index ba58556ac00..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean public JavaSpringBean buildBeanJNew() { return new JavaSpringBean(3); } - @Value("#{buildBeanJNew.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/KotlinAnnotated.kt deleted file mode 100644 index 20e4cc98699..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{buildBeanJNew.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/JavaAnnotated.java deleted file mode 100644 index 9347cf5e728..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean public JavaSpringBean buildBeanJ() { return new JavaSpringBean(3); } - @Value("#{/*rename*/buildBeanJ.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/KotlinAnnotated.kt deleted file mode 100644 index 18e97c80d6c..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{buildBeanJ.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJava/javaSpelRefToJava.test b/ultimate/testData/spring/core/rename/javaSpelRefToJava/javaSpelRefToJava.test deleted file mode 100644 index 7ec3775f4a5..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJava/javaSpelRefToJava.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/JavaAnnotated.java", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "buildBeanJNew", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/JavaAnnotated.java deleted file mode 100644 index 04df29ab7c0..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean(name = {"annJavaBean2"}) public JavaSpringBean buildBeanJ() { return new JavaSpringBean(3); } - @Value("#{annJavaBean2.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/KotlinAnnotated.kt deleted file mode 100644 index c712b5fbaab..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{annJavaBean2.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/JavaAnnotated.java deleted file mode 100644 index 810d24e4caa..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean(name = { "annJavaBean" }) public JavaSpringBean buildBeanJ() { return new JavaSpringBean(3); } - @Value("#{/*rename*/annJavaBean.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/KotlinAnnotated.kt deleted file mode 100644 index f5d321ece96..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{annJavaBean.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/javaSpelRefToJavaAnnotated.test b/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/javaSpelRefToJavaAnnotated.test deleted file mode 100644 index b33e52a6de6..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/javaSpelRefToJavaAnnotated.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/JavaAnnotated.java", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "annJavaBean2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/JavaAnnotated.java deleted file mode 100644 index 0abec8e23cb..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{buildBeanJNew.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/KotlinAnnotated.kt deleted file mode 100644 index 11625ea8be7..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean - fun buildBeanJNew() = JavaSpringBean(3) - - @Value("#{buildBeanJNew.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/JavaAnnotated.java deleted file mode 100644 index 88196affd1f..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{/*rename*/buildBeanJ.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/KotlinAnnotated.kt deleted file mode 100644 index c89235ec91c..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean - fun buildBeanJ() = JavaSpringBean(3) - - @Value("#{buildBeanJ.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKt/javaSpelRefToKt.test b/ultimate/testData/spring/core/rename/javaSpelRefToKt/javaSpelRefToKt.test deleted file mode 100644 index 7ec3775f4a5..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKt/javaSpelRefToKt.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/JavaAnnotated.java", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "buildBeanJNew", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/JavaAnnotated.java deleted file mode 100644 index 22e19e3de6c..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{annJavaBean2.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/KotlinAnnotated.kt deleted file mode 100644 index 8c94a9f5cfe..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean(name = arrayOf("annJavaBean2")) - fun buildBeanJ() = JavaSpringBean(3) - - @Value("#{annJavaBean2.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/JavaAnnotated.java deleted file mode 100644 index b471305f077..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{/*rename*/annJavaBean.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/KotlinAnnotated.kt deleted file mode 100644 index 172f1583e3c..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean(name = arrayOf("annJavaBean")) - fun buildBeanJ() = JavaSpringBean(3) - - @Value("#{annJavaBean.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/javaSpelRefToKtAnnotated.test b/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/javaSpelRefToKtAnnotated.test deleted file mode 100644 index b33e52a6de6..00000000000 --- a/ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/javaSpelRefToKtAnnotated.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/JavaAnnotated.java", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "annJavaBean2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/JavaAnnotated.java deleted file mode 100644 index ba58556ac00..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean public JavaSpringBean buildBeanJNew() { return new JavaSpringBean(3); } - @Value("#{buildBeanJNew.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/KotlinAnnotated.kt deleted file mode 100644 index 20e4cc98699..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{buildBeanJNew.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/JavaAnnotated.java deleted file mode 100644 index 6e19c7f69d7..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean public JavaSpringBean buildBeanJ() { return new JavaSpringBean(3); } - @Value("#{buildBeanJ.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/KotlinAnnotated.kt deleted file mode 100644 index 0d9d3129624..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{/*rename*/buildBeanJ.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJava/ktSpelRefToJava.test b/ultimate/testData/spring/core/rename/ktSpelRefToJava/ktSpelRefToJava.test deleted file mode 100644 index 0caf957cd11..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJava/ktSpelRefToJava.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/KotlinAnnotated.kt", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "buildBeanJNew", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/JavaAnnotated.java deleted file mode 100644 index 04df29ab7c0..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean(name = {"annJavaBean2"}) public JavaSpringBean buildBeanJ() { return new JavaSpringBean(3); } - @Value("#{annJavaBean2.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/KotlinAnnotated.kt deleted file mode 100644 index c712b5fbaab..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{annJavaBean2.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/JavaAnnotated.java deleted file mode 100644 index 4884ffb3e22..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/JavaAnnotated.java +++ /dev/null @@ -1,11 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Bean(name = { "annJavaBean" }) public JavaSpringBean buildBeanJ() { return new JavaSpringBean(3); } - @Value("#{annJavaBean.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/KotlinAnnotated.kt deleted file mode 100644 index 1ad1cd254f4..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration - -@Configuration -open class KotlinAnnotated { - @Value("#{/*rename*/annJavaBean.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/ktSpelRefToJavaAnnotated.test b/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/ktSpelRefToJavaAnnotated.test deleted file mode 100644 index e43966245d8..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/ktSpelRefToJavaAnnotated.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/KotlinAnnotated.kt", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "annJavaBean2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/JavaAnnotated.java deleted file mode 100644 index 0abec8e23cb..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{buildBeanJNew.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/KotlinAnnotated.kt deleted file mode 100644 index 11625ea8be7..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean - fun buildBeanJNew() = JavaSpringBean(3) - - @Value("#{buildBeanJNew.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/JavaAnnotated.java deleted file mode 100644 index c3ae9949f0b..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{buildBeanJ.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/KotlinAnnotated.kt deleted file mode 100644 index db769e39f2b..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean - fun buildBeanJ() = JavaSpringBean(3) - - @Value("#{/*rename*/buildBeanJ.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKt/ktSpelRefToKt.test b/ultimate/testData/spring/core/rename/ktSpelRefToKt/ktSpelRefToKt.test deleted file mode 100644 index 0caf957cd11..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKt/ktSpelRefToKt.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/KotlinAnnotated.kt", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "buildBeanJNew", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/JavaAnnotated.java deleted file mode 100644 index 22e19e3de6c..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{annJavaBean2.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/KotlinAnnotated.kt deleted file mode 100644 index 8c94a9f5cfe..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/after/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean(name = arrayOf("annJavaBean2")) - fun buildBeanJ() = JavaSpringBean(3) - - @Value("#{annJavaBean2.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/JavaAnnotated.java b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/JavaAnnotated.java deleted file mode 100644 index 6496db107f3..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/JavaAnnotated.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JavaAnnotated { - @Value("#{annJavaBean.value + 1}") private int newValue; -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/JavaSpringBean.java b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/JavaSpringBean.java deleted file mode 100644 index 400c40b6d1d..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/JavaSpringBean.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class JavaSpringBean { - public final int value; - public JavaSpringBean(int p) { value = p; } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/KotlinAnnotated.kt b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/KotlinAnnotated.kt deleted file mode 100644 index 5ac8566c963..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/before/test/KotlinAnnotated.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -import org.springframework.beans.factory.annotation.Value -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -open class KotlinAnnotated { - @Bean(name = arrayOf("annJavaBean")) - fun buildBeanJ() = JavaSpringBean(3) - - @Value("#{/*rename*/annJavaBean.value + 1}") private var newValue: Int = 0 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/ktSpelRefToKtAnnotated.test b/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/ktSpelRefToKtAnnotated.test deleted file mode 100644 index e43966245d8..00000000000 --- a/ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/ktSpelRefToKtAnnotated.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test/KotlinAnnotated.kt", - "springFileSet": ["test/JavaAnnotated.java", "test/KotlinAnnotated.kt"], - "injected": "true", - "byRef": "true", - "newName": "annJavaBean2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/J.java b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/J.java deleted file mode 100644 index 0e1bcf11e4e..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/J.java +++ /dev/null @@ -1,9 +0,0 @@ -package a; - -public class J { - static void test() { - KotlinSpringBean bean = new KotlinSpringBean(1); - bean.getFooNew(); - bean.setFooNew(2); - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/spring-config.xml b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/spring-config.xml deleted file mode 100644 index d396fccdee0..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/spring-config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/test.kt b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/test.kt deleted file mode 100644 index 9beca296f4d..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/after/a/test.kt +++ /dev/null @@ -1,9 +0,0 @@ -package a - -class KotlinSpringBean(var fooNew: Int) - -fun test() { - val bean = KotlinSpringBean(1) - bean.fooNew - bean.fooNew = 2 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/J.java b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/J.java deleted file mode 100644 index 5587ad4417d..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/J.java +++ /dev/null @@ -1,9 +0,0 @@ -package a; - -public class J { - static void test() { - KotlinSpringBean bean = new KotlinSpringBean(1); - bean.getFoo(); - bean.setFoo(2); - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/spring-config.xml b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/spring-config.xml deleted file mode 100644 index b6774812251..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/spring-config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/test.kt b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/test.kt deleted file mode 100644 index 519ac291368..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/before/a/test.kt +++ /dev/null @@ -1,9 +0,0 @@ -package a - -class KotlinSpringBean(var foo: Int) - -fun test() { - val bean = KotlinSpringBean(1) - bean.foo - bean.foo = 2 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/parameterWithXmlRefBySpelRef.test b/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/parameterWithXmlRefBySpelRef.test deleted file mode 100644 index 13075cf362d..00000000000 --- a/ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/parameterWithXmlRefBySpelRef.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "a/spring-config.xml", - "springFileSet": ["a/spring-config.xml"], - "newName": "fooNew", - "byRef": "true", - "injected": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/after/spring-config.xml b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/after/spring-config.xml deleted file mode 100644 index 41a32b8f29a..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/after/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/after/test.kt b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/after/test.kt deleted file mode 100644 index bd4861b9084..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/after/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean(var value2: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/before/spring-config.xml b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/before/spring-config.xml deleted file mode 100644 index eaf33c31f00..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/before/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/before/test.kt b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/before/test.kt deleted file mode 100644 index 32f44021cb0..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/before/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean(var /*rename*/value: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/primaryConstructorArgWithXmlRef.test b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/primaryConstructorArgWithXmlRef.test deleted file mode 100644 index 318eae5cc90..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/primaryConstructorArgWithXmlRef.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test.kt", - "springFileSet": ["spring-config.xml"], - "newName": "value2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/after/spring-config.xml b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/after/spring-config.xml deleted file mode 100644 index 41a32b8f29a..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/after/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/after/test.kt b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/after/test.kt deleted file mode 100644 index bd4861b9084..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/after/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean(var value2: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/before/spring-config.xml b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/before/spring-config.xml deleted file mode 100644 index 0847dc549af..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/before/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/before/test.kt b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/before/test.kt deleted file mode 100644 index 5b0a3cb08ba..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/before/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean(var value: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/primaryConstructorArgWithXmlRefByRef1.test b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/primaryConstructorArgWithXmlRefByRef1.test deleted file mode 100644 index 067af5add1b..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/primaryConstructorArgWithXmlRefByRef1.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "spring-config.xml", - "springFileSet": ["spring-config.xml"], - "newName": "value2", - "byRef": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/after/spring-config.xml b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/after/spring-config.xml deleted file mode 100644 index 41a32b8f29a..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/after/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/after/test.kt b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/after/test.kt deleted file mode 100644 index bd4861b9084..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/after/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean(var value2: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/before/spring-config.xml b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/before/spring-config.xml deleted file mode 100644 index b6d8997f9d1..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/before/spring-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/before/test.kt b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/before/test.kt deleted file mode 100644 index 5b0a3cb08ba..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/before/test.kt +++ /dev/null @@ -1,3 +0,0 @@ -package a - -class KotlinSpringBean(var value: Int) \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/primaryConstructorArgWithXmlRefByRef2.test b/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/primaryConstructorArgWithXmlRefByRef2.test deleted file mode 100644 index 067af5add1b..00000000000 --- a/ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/primaryConstructorArgWithXmlRefByRef2.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "spring-config.xml", - "springFileSet": ["spring-config.xml"], - "newName": "value2", - "byRef": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/after/spring-config.xml b/ultimate/testData/spring/core/rename/propertyWithXmlRefs/after/spring-config.xml deleted file mode 100644 index e4c5d044d86..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/after/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/after/test.kt b/ultimate/testData/spring/core/rename/propertyWithXmlRefs/after/test.kt deleted file mode 100644 index e6e7f7cda07..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/after/test.kt +++ /dev/null @@ -1,5 +0,0 @@ -package a - -class KotlinSpringBean { - var foo2: Int = 1 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/before/spring-config.xml b/ultimate/testData/spring/core/rename/propertyWithXmlRefs/before/spring-config.xml deleted file mode 100644 index d52dc4ae40c..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/before/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/before/test.kt b/ultimate/testData/spring/core/rename/propertyWithXmlRefs/before/test.kt deleted file mode 100644 index 12f4b079d8a..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/before/test.kt +++ /dev/null @@ -1,5 +0,0 @@ -package a - -class KotlinSpringBean { - var /*rename*/foo: Int = 1 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/propertyWithXmlRef.test b/ultimate/testData/spring/core/rename/propertyWithXmlRefs/propertyWithXmlRef.test deleted file mode 100644 index f43a4fd526f..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefs/propertyWithXmlRef.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test.kt", - "springFileSet": ["spring-config.xml"], - "newName": "foo2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/after/spring-config.xml b/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/after/spring-config.xml deleted file mode 100644 index e4c5d044d86..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/after/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/after/test.kt b/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/after/test.kt deleted file mode 100644 index e6e7f7cda07..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/after/test.kt +++ /dev/null @@ -1,5 +0,0 @@ -package a - -class KotlinSpringBean { - var foo2: Int = 1 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/before/spring-config.xml b/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/before/spring-config.xml deleted file mode 100644 index 362c33f7870..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/before/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/before/test.kt b/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/before/test.kt deleted file mode 100644 index 14f0d8b5d15..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/before/test.kt +++ /dev/null @@ -1,5 +0,0 @@ -package a - -class KotlinSpringBean { - var foo: Int = 1 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/propertyWithXmlRefByRef.test b/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/propertyWithXmlRefByRef.test deleted file mode 100644 index e3370430eb1..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/propertyWithXmlRefByRef.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "spring-config.xml", - "springFileSet": ["spring-config.xml"], - "newName": "foo2", - "byRef": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/J.java b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/J.java deleted file mode 100644 index 0e1bcf11e4e..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/J.java +++ /dev/null @@ -1,9 +0,0 @@ -package a; - -public class J { - static void test() { - KotlinSpringBean bean = new KotlinSpringBean(1); - bean.getFooNew(); - bean.setFooNew(2); - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/spring-config.xml b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/spring-config.xml deleted file mode 100644 index f0398ba8edb..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/spring-config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/test.kt b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/test.kt deleted file mode 100644 index 75d741b0b78..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/after/a/test.kt +++ /dev/null @@ -1,11 +0,0 @@ -package a - -class KotlinSpringBean(value: Int) { - var fooNew: Int = 0 -} - -fun test() { - val bean = KotlinSpringBean(1) - bean.fooNew - bean.fooNew = 2 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/J.java b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/J.java deleted file mode 100644 index 5587ad4417d..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/J.java +++ /dev/null @@ -1,9 +0,0 @@ -package a; - -public class J { - static void test() { - KotlinSpringBean bean = new KotlinSpringBean(1); - bean.getFoo(); - bean.setFoo(2); - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/spring-config.xml b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/spring-config.xml deleted file mode 100644 index 7dc8b407a10..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/spring-config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/test.kt b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/test.kt deleted file mode 100644 index 48dee5c2875..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/before/a/test.kt +++ /dev/null @@ -1,11 +0,0 @@ -package a - -class KotlinSpringBean(value: Int) { - var foo: Int = 0 -} - -fun test() { - val bean = KotlinSpringBean(1) - bean.foo - bean.foo = 2 -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/propertyWithXmlRefBySpelRef.test b/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/propertyWithXmlRefBySpelRef.test deleted file mode 100644 index 13075cf362d..00000000000 --- a/ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/propertyWithXmlRefBySpelRef.test +++ /dev/null @@ -1,10 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "a/spring-config.xml", - "springFileSet": ["a/spring-config.xml"], - "newName": "fooNew", - "byRef": "true", - "injected": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/after/spring-config.xml b/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/after/spring-config.xml deleted file mode 100644 index b8f739d527d..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/after/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/after/test.kt b/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/after/test.kt deleted file mode 100644 index c9ecfc422f7..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/after/test.kt +++ /dev/null @@ -1,7 +0,0 @@ -package a - -class KotlinSpringBean { - fun setBar2(value: Int) { - - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/before/spring-config.xml b/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/before/spring-config.xml deleted file mode 100644 index 5ca9c80d876..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/before/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/before/test.kt b/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/before/test.kt deleted file mode 100644 index b8ed4d08e7f..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/before/test.kt +++ /dev/null @@ -1,7 +0,0 @@ -package a - -class KotlinSpringBean { - fun /*rename*/setBar(value: Int) { - - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/setterFunWithXmlRef.test b/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/setterFunWithXmlRef.test deleted file mode 100644 index a5993ace12f..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefs/setterFunWithXmlRef.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "test.kt", - "springFileSet": ["spring-config.xml"], - "newName": "setBar2", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/after/spring-config.xml b/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/after/spring-config.xml deleted file mode 100644 index b8f739d527d..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/after/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/after/test.kt b/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/after/test.kt deleted file mode 100644 index c9ecfc422f7..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/after/test.kt +++ /dev/null @@ -1,7 +0,0 @@ -package a - -class KotlinSpringBean { - fun setBar2(value: Int) { - - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/before/spring-config.xml b/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/before/spring-config.xml deleted file mode 100644 index de41b1caf92..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/before/spring-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/before/test.kt b/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/before/test.kt deleted file mode 100644 index 8bdeb19a33c..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/before/test.kt +++ /dev/null @@ -1,7 +0,0 @@ -package a - -class KotlinSpringBean { - fun setBar(value: Int) { - - } -} \ No newline at end of file diff --git a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/setterFunWithXmlRefByRef.test b/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/setterFunWithXmlRefByRef.test deleted file mode 100644 index e446fdd8a88..00000000000 --- a/ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/setterFunWithXmlRefByRef.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fixtureClasses": ["org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension"], - "type": "MARKED_ELEMENT", - "mainFile": "spring-config.xml", - "springFileSet": ["spring-config.xml"], - "newName": "setBar2", - "byRef": "true", - "withRuntime": "true" -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/rename/AbstractUltimateRenameTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/rename/AbstractUltimateRenameTest.kt deleted file mode 100644 index 46bdab465de..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/rename/AbstractUltimateRenameTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.rename - -import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest -import org.jetbrains.kotlin.tests.ULTIMATE_TEST_DATA_DIR - -abstract class AbstractUltimateRenameTest : AbstractRenameTest() { - override fun getTestDataPath() = ULTIMATE_TEST_DATA_DIR -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt deleted file mode 100644 index 115a9c082ec..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests - -import com.intellij.facet.impl.FacetUtil -import com.intellij.openapi.module.Module -import com.intellij.openapi.project.Project -import com.intellij.openapi.util.io.FileUtil -import com.intellij.psi.PsiFile -import com.intellij.spring.facet.SpringFacet -import com.intellij.spring.facet.SpringFileSet -import com.intellij.spring.settings.SpringGeneralSettings -import com.intellij.testFramework.fixtures.CodeInsightTestFixture -import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import com.intellij.util.PathUtil -import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import org.jetbrains.kotlin.test.InTextDirectivesUtils -import java.io.File - -@Suppress("unused") -class SpringTestFixtureExtension() : TestFixtureExtension { - private var module: Module? = null - - override fun setUp(module: Module) { - this.module = module - - val springClasspath = System.getProperty("spring.classpath") - ?: throw RuntimeException("Unable to get a valid classpath from 'spring.classpath' property, please set it accordingly"); - - ConfigLibraryUtil.addLibrary(module, "spring", null, springClasspath.split(File.pathSeparator).toTypedArray()) - - FacetUtil.addFacet(module, SpringFacet.getSpringFacetType()) - } - - fun configureFileSet(fixture: CodeInsightTestFixture, configFiles: Collection): SpringFileSet { - return configureFileSet(fixture, "default", module!!, configFiles) - } - - fun configureFileSet(fixture: CodeInsightTestFixture, id: String, module: Module, configFiles: Collection): SpringFileSet { - return module.getSpringFacetWithAssertion().addFileSet(id, id).apply { - configFiles.forEach { addFile(fixture.copyFileToProject(it)) } - } - } - - fun Module.getSpringFacetWithAssertion() = SpringFacet.getInstance(this) ?: error("No Spring facet in ${this}") - - override fun tearDown() { - try { - // clear existing SpringFacet configuration before running next test - module?.let { module -> - SpringFacet.getInstance(module)?.let { facet -> - facet.removeFileSets() - FacetUtil.deleteFacet(facet) - } - ConfigLibraryUtil.removeLibrary(module, "spring") - } - } - finally { - module = null - } - } -} - -fun SpringTestFixtureExtension.loadConfigByMainFilePath(testPath: String, fixture: JavaCodeInsightTestFixture) { - val mainFileName = PathUtil.getFileName(testPath) - val baseName = FileUtil.getNameWithoutExtension(mainFileName) - val configFileName = if (baseName.endsWith("Xml")) "$baseName-config.xml" else mainFileName - configureFileSet(fixture, listOf(PathUtil.toSystemIndependentName("${PathUtil.getParentPath(testPath)}/$configFileName"))) -} - -fun configureSpringFileSetByDirective(module: Module, directives: String, psiFiles: Collection) { - if (!InTextDirectivesUtils.isDirectiveDefined(directives, "// CONFIGURE_SPRING_FILE_SET")) return - val fileSet = SpringFacet.getInstance(module)!!.addFileSet("default", "default")!! - psiFiles.forEach { fileSet.addFile(it.virtualFile) } -} - -fun forbidSpringFileSetAutoConfigureByDirective(project: Project, directives: String) { - if (!InTextDirectivesUtils.isDirectiveDefined(directives, "// FORBID_SPRING_FILE_SET_AUTOCONFIGURE")) return - SpringGeneralSettings.getInstance(project).isAllowAutoConfigurationMode = false -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/findUsages/AbstractSpringFindUsagesTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/findUsages/AbstractSpringFindUsagesTest.kt deleted file mode 100644 index 8eea7cf6fc0..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/findUsages/AbstractSpringFindUsagesTest.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.findUsages - -import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.spring.tests.loadConfigByMainFilePath -import org.jetbrains.kotlin.idea.test.TestFixtureExtension - -abstract class AbstractSpringFindUsagesTest : AbstractFindUsagesTest() { - override fun extraConfig(path: String) { - TestFixtureExtension.getFixture()!!.loadConfigByMainFilePath(path, myFixture) - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/findUsages/SpringFindUsagesTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/findUsages/SpringFindUsagesTestGenerated.java deleted file mode 100644 index 970a4cd6a2a..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/findUsages/SpringFindUsagesTestGenerated.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.findUsages; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/spring/core/findUsages") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringFindUsagesTestGenerated extends AbstractSpringFindUsagesTest { - public void testAllFilesPresentInFindUsages() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/findUsages"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("classXml.kt") - public void testClassXml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/findUsages/classXml.kt"); - doTest(fileName); - } - - @TestMetadata("primaryConstructorArgXml.kt") - public void testPrimaryConstructorArgXml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.kt"); - doTest(fileName); - } - - @TestMetadata("propertyXml.kt") - public void testPropertyXml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/findUsages/propertyXml.kt"); - doTest(fileName); - } - - @TestMetadata("setterFunXml.kt") - public void testSetterFunXml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/findUsages/setterFunXml.kt"); - doTest(fileName); - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt deleted file mode 100644 index 00c6269a4b9..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.kotlin.idea.spring.tests.inspections - -import com.intellij.psi.PsiFile -import org.jetbrains.kotlin.idea.codeInsight.AbstractInspectionTest -import org.jetbrains.kotlin.idea.spring.tests.configureSpringFileSetByDirective -import org.jetbrains.kotlin.idea.spring.tests.forbidSpringFileSetAutoConfigureByDirective - -abstract class AbstractSpringInspectionTest : AbstractInspectionTest() { - - override val forceUsePackageFolder: Boolean = true - - override fun configExtra(psiFiles: List, options: String) { - forbidSpringFileSetAutoConfigureByDirective(project, options) - configureSpringFileSetByDirective(myFixture.module, options, psiFiles) - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/SpringInspectionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/SpringInspectionTestGenerated.java deleted file mode 100644 index 31bc674cd33..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/SpringInspectionTestGenerated.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.inspections; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/inspections/spring") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringInspectionTestGenerated extends AbstractSpringInspectionTest { - public void testAllFilesPresentInSpring() throws Exception { - KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/inspections/spring"), Pattern.compile("^(inspections\\.test)$"), TargetBackend.ANY); - } - - @TestMetadata("autowiredMembersInInvalidClass/inspectionData/inspections.test") - public void testAutowiredMembersInInvalidClass_inspectionData_Inspections_test() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test"); - doTest(fileName); - } - - @TestMetadata("autowiring/inspectionData/inspections.test") - public void testAutowiring_inspectionData_Inspections_test() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/autowiring/inspectionData/inspections.test"); - doTest(fileName); - } - - @TestMetadata("componentScan/inspectionData/inspections.test") - public void testComponentScan_inspectionData_Inspections_test() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test"); - doTest(fileName); - } - - @TestMetadata("unconfiguredFacet/inspectionData/inspections.test") - public void testUnconfiguredFacet_inspectionData_Inspections_test() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test"); - doTest(fileName); - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/quickfixes/AbstractSpringQuickFixTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/quickfixes/AbstractSpringQuickFixTest.kt deleted file mode 100644 index 41a62b4e175..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/quickfixes/AbstractSpringQuickFixTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.jetbrains.kotlin.idea.spring.tests.quickfixes - -import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest -import org.jetbrains.kotlin.idea.spring.tests.configureSpringFileSetByDirective - -abstract class AbstractSpringQuickFixTest : AbstractQuickFixTest() { - override fun configExtra(options: String) { - configureSpringFileSetByDirective(module, options, listOf(getFile())) - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/quickfixes/SpringQuickFixTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/quickfixes/SpringQuickFixTestGenerated.java deleted file mode 100644 index bd3784fd389..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/quickfixes/SpringQuickFixTestGenerated.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.quickfixes; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/quickFixes/spring") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringQuickFixTestGenerated extends AbstractSpringQuickFixTest { - public void testAllFilesPresentInSpring() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes/spring"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("ultimate/testData/quickFixes/spring/addQualifierAnnotation") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class AddQualifierAnnotation extends AbstractSpringQuickFixTest { - public void testAllFilesPresentInAddQualifierAnnotation() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes/spring/addQualifierAnnotation"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("ambiguousBean.kt") - public void testAmbiguousBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/addQualifierAnnotation/ambiguousBean.kt"); - doTest(fileName); - } - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt deleted file mode 100644 index 156a945ad3d..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references - -import com.intellij.util.PathUtil -import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractBasicCompletionHandlerTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import java.io.File - -abstract class AbstractSpringReferenceCompletionHandlerTest : AbstractBasicCompletionHandlerTest() { - override fun setUpFixture(testPath: String) { - super.setUpFixture(testPath) - - TestFixtureExtension - .loadFixture(myModule) - .configureFileSet(myFixture, listOf(PathUtil.toSystemIndependentName(File(testPath).parent + "/spring-config.xml"))) - } - - override fun tearDownFixture() { - TestFixtureExtension.unloadFixture() - - super.tearDownFixture() - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt.192 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt.192 deleted file mode 100644 index e79bc41f263..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt.192 +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references - -import com.intellij.util.PathUtil -import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractBasicCompletionHandlerTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import java.io.File - -abstract class AbstractSpringReferenceCompletionHandlerTest : AbstractBasicCompletionHandlerTest() { - override fun setUpFixture(testPath: String) { - super.setUpFixture(testPath) - - TestFixtureExtension - .loadFixture(module) - .configureFileSet(myFixture, listOf(PathUtil.toSystemIndependentName(File(testPath).parent + "/spring-config.xml"))) - } - - override fun tearDownFixture() { - TestFixtureExtension.unloadFixture() - - super.tearDownFixture() - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt deleted file mode 100644 index ae71e583b0f..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references - -import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.spring.tests.loadConfigByMainFilePath -import org.jetbrains.kotlin.idea.test.TestFixtureExtension - -abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletionTest() { - override fun setUpFixture(testPath: String) { - TestFixtureExtension.loadFixture(myModule).loadConfigByMainFilePath(testPath, myFixture) - super.setUpFixture(testPath) - } - - override fun tearDownFixture() { - TestFixtureExtension.unloadFixture() - super.tearDownFixture() - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt.192 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt.192 deleted file mode 100644 index e8b37e01c5d..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt.192 +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references - -import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.spring.tests.loadConfigByMainFilePath -import org.jetbrains.kotlin.idea.test.TestFixtureExtension - -abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletionTest() { - override fun setUpFixture(testPath: String) { - TestFixtureExtension.loadFixture(module).loadConfigByMainFilePath(testPath, myFixture) - super.setUpFixture(testPath) - } - - override fun tearDownFixture() { - TestFixtureExtension.unloadFixture() - super.tearDownFixture() - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt deleted file mode 100644 index 9f5ea0b3c05..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references - -import com.intellij.codeInsight.navigation.GotoTargetHandler -import com.intellij.openapi.editor.Editor -import com.intellij.psi.PsiFile -import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.actions.AbstractNavigationTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import org.jetbrains.kotlin.psi.KtStringTemplateExpression -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.test.InTextDirectivesUtils - -abstract class AbstractSpringReferenceNavigationTest : AbstractNavigationTest() { - override fun getSourceAndTargetElements(editor: Editor, file: PsiFile): GotoTargetHandler.GotoData? { - val stringTemplate = file.findElementAt(editor.caretModel.offset)!!.getNonStrictParentOfType()!! - return GotoTargetHandler.GotoData(stringTemplate, - stringTemplate.references.mapNotNull { it.resolve() }.distinct().toTypedArray(), - emptyList()) - } - - override fun setUp() { - super.setUp() - TestFixtureExtension.loadFixture(myModule) - } - - override fun configureExtra(mainFileBaseName: String, mainFileText: String) { - if (!InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// NO_XML_CONFIG")) { - TestFixtureExtension - .getFixture()!! - .configureFileSet(myFixture, listOf("${mainFileBaseName}_config.xml")) - } - if (InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// JAVAX_ANNOTATION_RESOURCE")) { - myFixture.configureByText( - KotlinFileType.INSTANCE, - """package javax.annotation; annotation class Resource(val name: String = "")""" - ) - } - } - - override fun tearDown() { - TestFixtureExtension.unloadFixture() - super.tearDown() - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt.192 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt.192 deleted file mode 100644 index ab5899e96b0..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt.192 +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references - -import com.intellij.codeInsight.navigation.GotoTargetHandler -import com.intellij.openapi.editor.Editor -import com.intellij.psi.PsiFile -import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.actions.AbstractNavigationTest -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import org.jetbrains.kotlin.psi.KtStringTemplateExpression -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.test.InTextDirectivesUtils - -abstract class AbstractSpringReferenceNavigationTest : AbstractNavigationTest() { - override fun getSourceAndTargetElements(editor: Editor, file: PsiFile): GotoTargetHandler.GotoData? { - val stringTemplate = file.findElementAt(editor.caretModel.offset)!!.getNonStrictParentOfType()!! - return GotoTargetHandler.GotoData(stringTemplate, - stringTemplate.references.mapNotNull { it.resolve() }.distinct().toTypedArray(), - emptyList()) - } - - override fun setUp() { - super.setUp() - TestFixtureExtension.loadFixture(module) - } - - override fun configureExtra(mainFileBaseName: String, mainFileText: String) { - if (!InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// NO_XML_CONFIG")) { - TestFixtureExtension - .getFixture()!! - .configureFileSet(myFixture, listOf("${mainFileBaseName}_config.xml")) - } - if (InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// JAVAX_ANNOTATION_RESOURCE")) { - myFixture.configureByText( - KotlinFileType.INSTANCE, - """package javax.annotation; annotation class Resource(val name: String = "")""" - ) - } - } - - override fun tearDown() { - TestFixtureExtension.unloadFixture() - super.tearDown() - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java deleted file mode 100644 index 0e98bdaa425..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/spring/core/references/completion/handler") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringReferenceCompletionHandlerTestGenerated extends AbstractSpringReferenceCompletionHandlerTest { - public void testAllFilesPresentInHandler() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/completion/handler"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("packageReferenceEnter.kt") - public void testPackageReferenceEnter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/packageReferenceEnter.kt"); - doTest(fileName); - } - - @TestMetadata("packageReferenceTab.kt") - public void testPackageReferenceTab() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/packageReferenceTab.kt"); - doTest(fileName); - } - - @TestMetadata("qualifierReferenceEnter.kt") - public void testQualifierReferenceEnter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/qualifierReferenceEnter.kt"); - doTest(fileName); - } - - @TestMetadata("qualifierReferenceTab.kt") - public void testQualifierReferenceTab() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/qualifierReferenceTab.kt"); - doTest(fileName); - } - - @TestMetadata("scopeReference.kt") - public void testScopeReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/scopeReference.kt"); - doTest(fileName); - } - - @TestMetadata("springBeanReferenceEnter.kt") - public void testSpringBeanReferenceEnter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt"); - doTest(fileName); - } - - @TestMetadata("springBeanReferenceTab.kt") - public void testSpringBeanReferenceTab() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt"); - doTest(fileName); - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java deleted file mode 100644 index 4a68a577d33..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/spring/core/references/completion/variants") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringReferenceCompletionTestGenerated extends AbstractSpringReferenceCompletionTest { - public void testAllFilesPresentInVariants() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/completion/variants"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("beanWithDefaultName.kt") - public void testBeanWithDefaultName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/beanWithDefaultName.kt"); - doTest(fileName); - } - - @TestMetadata("beanWithExplicitName.kt") - public void testBeanWithExplicitName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/beanWithExplicitName.kt"); - doTest(fileName); - } - - @TestMetadata("packageReference.kt") - public void testPackageReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/packageReference.kt"); - doTest(fileName); - } - - @TestMetadata("qualifierReference1Xml.kt") - public void testQualifierReference1Xml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/qualifierReference1Xml.kt"); - doTest(fileName); - } - - @TestMetadata("qualifierReference2Xml.kt") - public void testQualifierReference2Xml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/qualifierReference2Xml.kt"); - doTest(fileName); - } - - @TestMetadata("scopeReferenceXml.kt") - public void testScopeReferenceXml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/scopeReferenceXml.kt"); - doTest(fileName); - } - - @TestMetadata("springBeanReferenceXml.kt") - public void testSpringBeanReferenceXml() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/springBeanReferenceXml.kt"); - doTest(fileName); - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java deleted file mode 100644 index b83d7e38886..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.references; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/spring/core/references/navigation") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringReferenceNavigationTestGenerated extends AbstractSpringReferenceNavigationTest { - public void testAllFilesPresentInNavigation() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/navigation"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("fileReferenceInClasspathResource.kt") - public void testFileReferenceInClasspathResource() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt"); - doTest(fileName); - } - - @TestMetadata("fileReferenceInClasspathXmlContext.kt") - public void testFileReferenceInClasspathXmlContext() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt"); - doTest(fileName); - } - - @TestMetadata("packageReferenceInComponentScan.kt") - public void testPackageReferenceInComponentScan() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt"); - doTest(fileName); - } - - @TestMetadata("qualifierReference.kt") - public void testQualifierReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/qualifierReference.kt"); - doTest(fileName); - } - - @TestMetadata("scopeReference.kt") - public void testScopeReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/scopeReference.kt"); - doTest(fileName); - } - - @TestMetadata("springBeanRefInFactoryContainsBean.kt") - public void testSpringBeanRefInFactoryContainsBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt"); - doTest(fileName); - } - - @TestMetadata("springBeanRefInFactoryGetBean.kt") - public void testSpringBeanRefInFactoryGetBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt"); - doTest(fileName); - } - - @TestMetadata("springBeanRefInResource.kt") - public void testSpringBeanRefInResource() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt"); - doTest(fileName); - } - - @TestMetadata("springFactoryBeanRefInResource.kt") - public void testSpringFactoryBeanRefInResource() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt"); - doTest(fileName); - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/rename/AbstractSpringRenameTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/rename/AbstractSpringRenameTest.kt deleted file mode 100644 index 5a3239ab52e..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/rename/AbstractSpringRenameTest.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.spring.tests.rename - -import com.google.gson.JsonObject -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.spring.facet.SpringFacet -import org.jetbrains.kotlin.idea.rename.AbstractUltimateRenameTest - -abstract class AbstractSpringRenameTest : AbstractUltimateRenameTest() { - override fun getTestDataPath() = super.getTestDataPath() + "/spring/core/rename/" - - override fun configExtra(rootDir: VirtualFile, renameParamsObject: JsonObject) { - val fileSet = SpringFacet.getInstance(module)!!.addFileSet("default", "default")!! - for (filePath in renameParamsObject.getAsJsonArray("springFileSet")) { - fileSet.addFile(rootDir.findFileByRelativePath(filePath.asString)!!) - } - } -} \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/rename/SpringRenameTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/rename/SpringRenameTestGenerated.java deleted file mode 100644 index 1b5fbc8bcd6..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/rename/SpringRenameTestGenerated.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.spring.tests.rename; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("ultimate/testData/spring/core/rename") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringRenameTestGenerated extends AbstractSpringRenameTest { - public void testAllFilesPresentInRename() throws Exception { - KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/spring/core/rename"), Pattern.compile("^(.+)\\.test$"), TargetBackend.ANY); - } - - @TestMetadata("annotationArgBySpELRefInXMLConf/annotationArgBySpELRefInXMLConf.test") - public void testAnnotationArgBySpELRefInXMLConf_AnnotationArgBySpELRefInXMLConf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/annotationArgBySpELRefInXMLConf/annotationArgBySpELRefInXMLConf.test"); - doTest(fileName); - } - - @TestMetadata("classWithXmlRefs/classWithXmlRef.test") - public void testClassWithXmlRefs_ClassWithXmlRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/classWithXmlRefs/classWithXmlRef.test"); - doTest(fileName); - } - - @TestMetadata("classWithXmlRefsByRef/classWithXmlRefByRef.test") - public void testClassWithXmlRefsByRef_ClassWithXmlRefByRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/classWithXmlRefsByRef/classWithXmlRefByRef.test"); - doTest(fileName); - } - - @TestMetadata("factoryMethodParam/factoryMethodParam.test") - public void testFactoryMethodParam_FactoryMethodParam() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/factoryMethodParam/factoryMethodParam.test"); - doTest(fileName); - } - - @TestMetadata("factoryMethodParamByXmlRef/factoryMethodParamByXmlRef.test") - public void testFactoryMethodParamByXmlRef_FactoryMethodParamByXmlRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/factoryMethodParamByXmlRef/factoryMethodParamByXmlRef.test"); - doTest(fileName); - } - - @TestMetadata("isPropertyWithXmlRefsBySpelRef/isPropertyWithXmlRefBySpelRef.test") - public void testIsPropertyWithXmlRefsBySpelRef_IsPropertyWithXmlRefBySpelRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/isPropertyWithXmlRefsBySpelRef/isPropertyWithXmlRefBySpelRef.test"); - doTest(fileName); - } - - @TestMetadata("javaSpelRefToJava/javaSpelRefToJava.test") - public void testJavaSpelRefToJava_JavaSpelRefToJava() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/javaSpelRefToJava/javaSpelRefToJava.test"); - doTest(fileName); - } - - @TestMetadata("javaSpelRefToJavaAnnotated/javaSpelRefToJavaAnnotated.test") - public void testJavaSpelRefToJavaAnnotated_JavaSpelRefToJavaAnnotated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/javaSpelRefToJavaAnnotated/javaSpelRefToJavaAnnotated.test"); - doTest(fileName); - } - - @TestMetadata("javaSpelRefToKt/javaSpelRefToKt.test") - public void testJavaSpelRefToKt_JavaSpelRefToKt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/javaSpelRefToKt/javaSpelRefToKt.test"); - doTest(fileName); - } - - @TestMetadata("javaSpelRefToKtAnnotated/javaSpelRefToKtAnnotated.test") - public void testJavaSpelRefToKtAnnotated_JavaSpelRefToKtAnnotated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/javaSpelRefToKtAnnotated/javaSpelRefToKtAnnotated.test"); - doTest(fileName); - } - - @TestMetadata("ktSpelRefToJava/ktSpelRefToJava.test") - public void testKtSpelRefToJava_KtSpelRefToJava() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/ktSpelRefToJava/ktSpelRefToJava.test"); - doTest(fileName); - } - - @TestMetadata("ktSpelRefToJavaAnnotated/ktSpelRefToJavaAnnotated.test") - public void testKtSpelRefToJavaAnnotated_KtSpelRefToJavaAnnotated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/ktSpelRefToJavaAnnotated/ktSpelRefToJavaAnnotated.test"); - doTest(fileName); - } - - @TestMetadata("ktSpelRefToKt/ktSpelRefToKt.test") - public void testKtSpelRefToKt_KtSpelRefToKt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/ktSpelRefToKt/ktSpelRefToKt.test"); - doTest(fileName); - } - - @TestMetadata("ktSpelRefToKtAnnotated/ktSpelRefToKtAnnotated.test") - public void testKtSpelRefToKtAnnotated_KtSpelRefToKtAnnotated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/ktSpelRefToKtAnnotated/ktSpelRefToKtAnnotated.test"); - doTest(fileName); - } - - @TestMetadata("parameterWithXmlRefsBySpelRef/parameterWithXmlRefBySpelRef.test") - public void testParameterWithXmlRefsBySpelRef_ParameterWithXmlRefBySpelRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/parameterWithXmlRefsBySpelRef/parameterWithXmlRefBySpelRef.test"); - doTest(fileName); - } - - @TestMetadata("primaryConstructorArgWithXmlRefs/primaryConstructorArgWithXmlRef.test") - public void testPrimaryConstructorArgWithXmlRefs_PrimaryConstructorArgWithXmlRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefs/primaryConstructorArgWithXmlRef.test"); - doTest(fileName); - } - - @TestMetadata("primaryConstructorArgWithXmlRefsByRef1/primaryConstructorArgWithXmlRefByRef1.test") - public void testPrimaryConstructorArgWithXmlRefsByRef1_PrimaryConstructorArgWithXmlRefByRef1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef1/primaryConstructorArgWithXmlRefByRef1.test"); - doTest(fileName); - } - - @TestMetadata("primaryConstructorArgWithXmlRefsByRef2/primaryConstructorArgWithXmlRefByRef2.test") - public void testPrimaryConstructorArgWithXmlRefsByRef2_PrimaryConstructorArgWithXmlRefByRef2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/primaryConstructorArgWithXmlRefsByRef2/primaryConstructorArgWithXmlRefByRef2.test"); - doTest(fileName); - } - - @TestMetadata("propertyWithXmlRefs/propertyWithXmlRef.test") - public void testPropertyWithXmlRefs_PropertyWithXmlRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/propertyWithXmlRefs/propertyWithXmlRef.test"); - doTest(fileName); - } - - @TestMetadata("propertyWithXmlRefsByRef/propertyWithXmlRefByRef.test") - public void testPropertyWithXmlRefsByRef_PropertyWithXmlRefByRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/propertyWithXmlRefsByRef/propertyWithXmlRefByRef.test"); - doTest(fileName); - } - - @TestMetadata("propertyWithXmlRefsBySpelRef/propertyWithXmlRefBySpelRef.test") - public void testPropertyWithXmlRefsBySpelRef_PropertyWithXmlRefBySpelRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/propertyWithXmlRefsBySpelRef/propertyWithXmlRefBySpelRef.test"); - doTest(fileName); - } - - @TestMetadata("setterFunWithXmlRefs/setterFunWithXmlRef.test") - public void testSetterFunWithXmlRefs_SetterFunWithXmlRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/setterFunWithXmlRefs/setterFunWithXmlRef.test"); - doTest(fileName); - } - - @TestMetadata("setterFunWithXmlRefsByRef/setterFunWithXmlRefByRef.test") - public void testSetterFunWithXmlRefsByRef_SetterFunWithXmlRefByRef() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/rename/setterFunWithXmlRefsByRef/setterFunWithXmlRefByRef.test"); - doTest(fileName); - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt deleted file mode 100644 index ea8e33807d5..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.tests - -import org.jetbrains.kotlin.generators.tests.generator.* -import org.jetbrains.kotlin.idea.spring.tests.findUsages.AbstractSpringFindUsagesTest -import org.jetbrains.kotlin.idea.spring.tests.inspections.AbstractSpringInspectionTest -import org.jetbrains.kotlin.idea.spring.tests.quickfixes.AbstractSpringQuickFixTest -import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest -import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionTest -import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceNavigationTest -import org.jetbrains.kotlin.idea.spring.tests.rename.AbstractSpringRenameTest - -fun main(args: Array) { - System.setProperty("java.awt.headless", "true") - - testGroup("ultimate/tests", "ultimate/testData") { - testClass { - model("inspections/spring", pattern = "^(inspections\\.test)$", singleClass = true) - } - - testClass { - model("quickFixes/spring", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true) - } - - testClass() { - model("spring/core/references/completion/handler") - } - - testClass() { - model("spring/core/references/completion/variants") - } - - testClass() { - model("spring/core/references/navigation") - } - - testClass() { - model("spring/core/rename", extension = "test", singleClass = true) - } - - testClass() { - model("spring/core/findUsages", pattern = """^(.+)\.kt$""") - } - } -} diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt b/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt deleted file mode 100644 index 1b97b244bd4..00000000000 --- a/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.tests - -import org.jetbrains.kotlin.test.KotlinTestUtils - -val ULTIMATE_TEST_ROOT: String - get() = "${KotlinTestUtils.getHomeDirectory()}/ultimate" - -val ULTIMATE_TEST_DATA_DIR: String - get() = "$ULTIMATE_TEST_ROOT/testData" \ No newline at end of file diff --git a/ultimate/ultimate-runner/build.gradle.kts b/ultimate/ultimate-runner/build.gradle.kts deleted file mode 100644 index d0969bf28cf..00000000000 --- a/ultimate/ultimate-runner/build.gradle.kts +++ /dev/null @@ -1,25 +0,0 @@ - -plugins { - kotlin("jvm") -} - -dependencies { - compileOnly(project(":idea")) - compileOnly(project(":idea:idea-maven")) - compileOnly(project(":idea:idea-gradle")) - compileOnly(project(":idea:idea-jvm")) - - runtimeOnly(intellijDep()) - runtimeOnly(files(toolsJar())) -} - -val intellijUltimateEnabled : Boolean by rootProject.extra - -val ideaUltimatePluginDir: File by rootProject.extra -val ideaUltimateSandboxDir: File by rootProject.extra - -if (intellijUltimateEnabled) { - runIdeTask("runUltimate", ideaUltimatePluginDir, ideaUltimateSandboxDir) { - dependsOn(":dist", ":ideaPlugin", ":ultimate:ideaUltimatePlugin") - } -}