MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: don't use versions in tests when it doesn't matter

Browse Source 
GitOrigin-RevId: c072a9c1580697547ffc0a7377c1d483e2d0afe7
This commit is contained in:
Sergei Vorobyov
2021-03-16 20:35:39 +03:00
committed by intellij-monorepo-bot
parent 1722bd4b76
commit c00be3c8d7
13 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/gradle/java/testSources/execution/build/GradleApplicationEnvironmentProviderTest.java
View File

@@ -54,7 +54,7 @@ public class GradleApplicationEnvironmentProviderTest extends GradleSettingsImpo
new GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withIdeaPlugin()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addImport("org.jetbrains.gradle.ext.*")
.addPostfix("idea {\n" +
" project.settings {\n" +

6
plugins/gradle/java/testSources/execution/test/runner/ExternalTestsModelCompatibilityTest.kt
View File

@@ -15,7 +15,7 @@ class ExternalTestsModelCompatibilityTest : GradleImportingTestCase() {
fun `test simple tests finding`() {
val buildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
importProject(buildScript.generate())
assertTestTasks(createProjectSubFile("src/test/java/package/TestCase.java", "class TestCase"),
listOf(":test"))
@@ -26,7 +26,7 @@ class ExternalTestsModelCompatibilityTest : GradleImportingTestCase() {
fun `test intellij tests finding`() {
val buildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addPrefix("""
sourceSets {
foo.java.srcDirs = ["foo-src", "foo-other-src"]
@@ -57,7 +57,7 @@ class ExternalTestsModelCompatibilityTest : GradleImportingTestCase() {
fun `test intellij tests finding new interface`() {
val buildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addPrefix("""
sourceSets {
foo.java.srcDirs = ["foo-src", "foo-other-src"]

8
plugins/gradle/java/testSources/execution/test/runner/GradleTestRunConfigurationProducerTestCase.kt
View File

@@ -148,8 +148,8 @@ abstract class GradleTestRunConfigurationProducerTestCase : GradleImportingTestC
val buildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withIdeaPlugin()
.withJUnit("4.12")
.withGroovyPlugin("2.4.14")
.withJUnit4()
.withGroovyPlugin()
.addPrefix("""
idea.module {
testSourceDirs += file('automation')
@@ -179,8 +179,8 @@ abstract class GradleTestRunConfigurationProducerTestCase : GradleImportingTestC
""".trimIndent())
val moduleBuildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withGroovyPlugin("2.4.14")
.withJUnit4()
.withGroovyPlugin()
.addDependency("testCompile project(path: ':', configuration: 'testArtifacts')")
createSettingsFile("""
rootProject.name = 'project'

6
plugins/gradle/java/testSources/execution/test/runner/GradleTestRunnerViewTest.kt
View File

@@ -69,7 +69,7 @@ class GradleTestRunnerViewTest : GradleImportingTestCase() {
val buildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.withTask("additionalTest", "Test") {
property("testClassesDirs", "sourceSets.test.output.classesDirs")
property("classpath", "sourceSets.test.runtimeClasspath")
@@ -114,7 +114,7 @@ class GradleTestRunnerViewTest : GradleImportingTestCase() {
val scriptOutputTextWOEol = "text w/o eol"
importProject(GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addBuildScriptPrefix("print(\"${escapeJava(scriptOutputText)}\")")
.addPostfix("print(\"${escapeJava(scriptOutputTextWOEol)}\")")
.generate())
@@ -202,7 +202,7 @@ class GradleTestRunnerViewTest : GradleImportingTestCase() {
importProject(GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.generate())
val testRunnerTree = runTasksAndGetTestRunnerTree(listOf("clean", "test"))

2
plugins/gradle/java/testSources/importing/GradleAttachSourcesProviderIntegrationTest.kt
View File

@@ -19,7 +19,7 @@ class GradleAttachSourcesProviderIntegrationTest : GradleImportingTestCase() {
importProject(GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withIdeaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addPrefix("idea.module.downloadSources = false")
.generate())

4
plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt
View File

@@ -35,7 +35,7 @@ class GradleBuildSrcImportingTest : GradleImportingTestCase() {
@Test
fun `test buildSrc project level dependencies are imported`() {
createProjectSubFile("buildSrc/build.gradle", GradleBuildScriptBuilderEx().withJUnit("4.12").generate())
createProjectSubFile("buildSrc/build.gradle", GradleBuildScriptBuilderEx().withJUnit4().generate())
importProject("")
assertModules("project",
"project.buildSrc", "project.buildSrc.main", "project.buildSrc.test")
@@ -47,7 +47,7 @@ class GradleBuildSrcImportingTest : GradleImportingTestCase() {
@Test
fun `test explore files after double importing`() {
createProjectSubFile("buildSrc/build.gradle", GradleBuildScriptBuilderEx().withJUnit("4.12").generate())
createProjectSubFile("buildSrc/build.gradle", GradleBuildScriptBuilderEx().withJUnit4().generate())
importProject("")
importProject("")

4
plugins/gradle/java/testSources/importing/GradleJavaSettingsImportingTest.java
View File

@@ -92,7 +92,7 @@ public class GradleJavaSettingsImportingTest extends GradleSettingsImportingTest
public void testArtifactsReferenceImport() throws Exception {
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addPostfix(
"idea.project.settings {",
" ideArtifacts {",
@@ -125,7 +125,7 @@ public class GradleJavaSettingsImportingTest extends GradleSettingsImportingTest
public void testModuleReferenceImport() throws Exception {
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addPostfix(
"idea.project.settings {",
" ideArtifacts {",

4
plugins/gradle/java/testSources/importing/TestGradleConfigurationProducerUtilTest.kt
View File

@@ -57,7 +57,7 @@ class TestGradleConfigurationProducerUtilTest : GradleImportingTestCase() {
""".trimIndent())
val moduleBuildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addPostfix("""
task myTestsJar(type: Jar, dependsOn: testClasses) {
baseName = "test-${'$'}{project.archivesBaseName}"
@@ -74,7 +74,7 @@ class TestGradleConfigurationProducerUtilTest : GradleImportingTestCase() {
""".trimIndent())
val depModuleBuildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addDependency("compile project(':module')")
.addDependency("testCompile project(path: ':module', configuration: 'testArtifacts')")
createProjectSubFile("module/build.gradle", moduleBuildScript.generate())

2
plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleRunAnythingProviderTest.kt
View File

@@ -21,7 +21,7 @@ class GradleRunAnythingProviderTest : GradleRunAnythingProviderTestCase() {
createTestJavaClass("ClassG")
val buildScript = GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12")
.withJUnit4()
importProject(buildScript.generate())
val wcCompletions = arrayOf(

45
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleBuildScriptBuilderEx.kt
View File

@@ -3,14 +3,15 @@ package org.jetbrains.plugins.gradle.importing
import com.intellij.openapi.util.io.FileUtil
import com.intellij.util.Consumer
import org.jetbrains.plugins.gradle.importing.GradleSettingsImportingTestCase.IDEA_EXT_PLUGIN_VERSION
import java.io.File
@Suppress("MemberVisibilityCanBePrivate", "unused")
class GradleBuildScriptBuilderEx : GradleBuildScriptBuilder() {
@Suppress("unused")
fun withGradleIdeaExtPluginIfCan(version: String) = apply {
fun withGradleIdeaExtPluginIfCan() = apply {
val localDirWithJar = System.getenv("GRADLE_IDEA_EXT_PLUGIN_DIR")?.let(::File)
if (localDirWithJar == null) {
withGradleIdeaExtPlugin(version)
withGradleIdeaExtPlugin()
return@apply
}
if (!localDirWithJar.exists()) throw RuntimeException("Directory $localDirWithJar not found")
@@ -22,7 +23,6 @@ class GradleBuildScriptBuilderEx : GradleBuildScriptBuilder() {
withLocalGradleIdeaExtPlugin(jarFile)
}
@Suppress("MemberVisibilityCanBePrivate")
fun withLocalGradleIdeaExtPlugin(jarFile: File) = apply {
withBuildScriptMavenCentral()
addBuildScriptDependency("classpath files('${FileUtil.toSystemIndependentName(jarFile.absolutePath)}')")
@@ -31,13 +31,13 @@ class GradleBuildScriptBuilderEx : GradleBuildScriptBuilder() {
applyPlugin("'org.jetbrains.gradle.plugin.idea-ext'")
}
fun withGradleIdeaExtPlugin(version: String) = apply {
addPlugin("id 'org.jetbrains.gradle.plugin.idea-ext' version '$version'")
fun withGradleIdeaExtPlugin() = apply {
addPlugin("id 'org.jetbrains.gradle.plugin.idea-ext' version '$IDEA_EXT_PLUGIN_VERSION'")
}
fun withTask(name: String, type: String? = null, configure: GroovyBuilder.() -> Unit = {}) = apply {
addPostfix("""
tasks.create("$name"${type?.let{", $it"} ?: ""}) {
tasks.create("$name"${type?.let { ", $it" } ?: ""}) {
${GroovyBuilder.generate(" ", configure)}
}
""".trimIndent())
@@ -76,15 +76,26 @@ class GradleBuildScriptBuilderEx : GradleBuildScriptBuilder() {
applyPlugin("'kotlin'")
}
fun withGroovyPlugin(version: String) = apply {
fun withGroovyPlugin() = apply {
applyPlugin("'groovy'")
withMavenCentral()
addDependency("compile 'org.codehaus.groovy:groovy-all:$version'")
implementation("'org.codehaus.groovy:groovy-all:3.0.5'")
}
fun withJUnit(version: String) = apply {
fun withJUnit() = withJUnit5()
fun withJUnit4() = apply {
withMavenCentral()
addDependency("testCompile 'junit:junit:$version'")
testImplementation("'junit:junit:4.12'")
}
fun withJUnit5() = apply {
withMavenCentral()
testImplementation("'org.junit.jupiter:junit-jupiter-api:5.7.0'")
testRuntimeOnly("'org.junit.jupiter:junit-jupiter-engine:1.7.0'")
withTaskConfiguration("test") {
call("useJUnitPlatform")
}
}
fun version(version: String) = apply {
@@ -94,6 +105,18 @@ class GradleBuildScriptBuilderEx : GradleBuildScriptBuilder() {
fun group(group: String) = apply {
addPrefix("group = '$group'")
}
fun implementation(dependency: String) = apply {
addDependency("implementation $dependency")
}
fun testImplementation(dependency: String) = apply {
addDependency("testImplementation $dependency")
}
fun testRuntimeOnly(dependency: String) = apply {
addDependency("testRuntimeOnly $dependency")
}
}
@JvmOverloads

4
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
View File

@@ -1724,7 +1724,7 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
public void testSourcesJavadocAttachmentFromGradleCache() throws Exception {
importProject(new GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withJUnit("4.12") // download classes and sources - the default import settings
.withJUnit4() // download classes and sources - the default import settings
.generate());
assertModules("project", "project.main", "project.test");
@@ -1737,7 +1737,7 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
importProject(new GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withIdeaPlugin()
.withJUnit("4.12")
.withJUnit4()
.addPrefix("idea.module {\n" +
" downloadJavadoc = true\n" +
" downloadSources = false\n" + // should be already available in Gradle cache

26
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleSettingsImportingTest.java
View File

@@ -117,7 +117,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createSettingsFile("rootProject.name = 'moduleName'");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPluginIfCan(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPluginIfCan()
.addPostfix(
"import org.jetbrains.gradle.ext.*",
"idea.project.settings {",
@@ -261,7 +261,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createSettingsFile("rootProject.name = 'moduleName'");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPluginIfCan(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPluginIfCan()
.addPostfix(
"import org.jetbrains.gradle.ext.*",
"idea.project.settings {",
@@ -414,7 +414,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
{
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addImport("org.jetbrains.gradle.ext.EncodingConfiguration.BomPolicy")
.addPostfix("idea {")
.addPostfix(" project {")
@@ -440,7 +440,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
{
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addImport("org.jetbrains.gradle.ext.EncodingConfiguration.BomPolicy")
.addPostfix("idea {")
.addPostfix(" project {")
@@ -478,7 +478,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
importProject(
new GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addImport("org.jetbrains.gradle.ext.EncodingConfiguration.BomPolicy")
.addPostfix("sourceSets {")
.addPostfix(" main.java.srcDirs += '../sub-project/src/main/java'")
@@ -508,7 +508,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
importProject(
new GradleBuildScriptBuilderEx()
.withJavaPlugin()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.addImport("org.jetbrains.gradle.ext.EncodingConfiguration.BomPolicy")
.addPostfix("sourceSets {")
.addPostfix(" main.java.srcDirs += '../sub-project/src/main/java'")
@@ -628,7 +628,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createProjectSubFile("src/main/java/Main.java", "");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.withJavaPlugin()
.withKotlinPlugin("1.3.50")
.addPostfix("idea {")
@@ -662,7 +662,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createProjectSubFile("src/main/kotlin/Main.kt", "");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.withJavaPlugin()
.withKotlinPlugin("1.3.50")
.addPostfix("idea {")
@@ -683,7 +683,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createProjectSubFile("../subproject/src/test/java/Main.java", "");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.withJavaPlugin()
.addPostfix("sourceSets {")
.addPostfix(" test.java.srcDirs += '../subproject/src/test/java'")
@@ -707,7 +707,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createProjectSubFile("src/main/java/Main.java", "");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.withJavaPlugin()
.addPostfix("idea {")
.addPostfix(" module {")
@@ -725,7 +725,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
createProjectSubFile("src/main/java/Main.java", "");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.withJavaPlugin()
.addPostfix("idea {")
.addPostfix(" module {")
@@ -738,7 +738,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
assertSourcePackagePrefix("project.main", "src/main/java", "prefix.package.some");
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPlugin(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPlugin()
.withJavaPlugin()
.addPostfix("idea {")
.addPostfix(" module {")
@@ -756,7 +756,7 @@ public class GradleSettingsImportingTest extends GradleSettingsImportingTestCase
public void testModuleTypesImport() throws Exception {
importProject(
new GradleBuildScriptBuilderEx()
.withGradleIdeaExtPluginIfCan(IDEA_EXT_PLUGIN_VERSION)
.withGradleIdeaExtPluginIfCan()
.withJavaPlugin()
.addPostfix(
"import org.jetbrains.gradle.ext.*",

10
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GroovyBuilder.kt
View File

@@ -1,12 +1,18 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.gradle.importing
import java.util.*
class GroovyBuilder(private val indent: String = "") {
private val builder = StringBuilder()
private val builder = StringJoiner("\n")
fun line(text: String) = apply {
builder.appendln(indent + text)
builder.add(indent + text)
}
fun call(name: String) = apply {
line("$name()")
}
fun call(name: String, value: Any?) = apply {