Revert IDEA's unnecessary FQN-ing in moved tests

dongbinghua · Jul 28, 2023 · 4c7d1cb · 4c7d1cb
1 parent 3622be3
commit 4c7d1cb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/...src/testFixtures/groovy/org/gradle/groovy/compile/ApiGroovyCompilerIntegrationSpec.groovy b/...src/testFixtures/groovy/org/gradle/groovy/compile/ApiGroovyCompilerIntegrationSpec.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
 package org.gradle.groovy.compile
 
 import org.gradle.integtests.fixtures.DefaultTestExecutionResult
-import org.gradle.integtests.fixtures.MultiVersionIntegrationSpec
 
 abstract class ApiGroovyCompilerIntegrationSpec extends GroovyCompilerIntegrationSpec {
     def canEnableAndDisableIntegerOptimization() {
         if (versionLowerThan('1.8')) {
             return
         }
         // Integer optimizations don't seem to have an effect in Groovy 4 anymore
-        if (MultiVersionIntegrationSpec.versionNumber.major >= 4) {
+        if (versionNumber.major >= 4) {
             return
         }
 

diff --git a/...c/testFixtures/groovy/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec.groovy b/...c/testFixtures/groovy/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.precondition.Requires
 import org.gradle.test.preconditions.UnitTestPreconditions
 import org.gradle.testing.fixture.GroovyCoverage
-import org.gradle.util.internal.GroovyDependencyUtil
 import org.junit.Assume
 import org.junit.Rule
 import spock.lang.Ignore
@@ -46,22 +45,22 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
     String groovyDependency
 
     String getGroovyVersionNumber() {
-        org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.version.split(":", 2)[0]
+        version.split(":", 2)[0]
     }
 
     def setup() {
         // necessary for picking up some of the output/errorOutput when forked executer is used
         executer.withArgument("-i")
         executer.withRepositoryMirrors()
-        groovyDependency = GroovyDependencyUtil.groovyModuleDependency("groovy", org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.versionNumber)
+        groovyDependency = groovyModuleDependency("groovy", versionNumber)
     }
 
     def "compileGoodCode"() {
         if (module == "groovy-all") {
             // No groovy-all for indy variant
-            Assume.assumeTrue(org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.versionClassifier != "indy")
+            Assume.assumeTrue(versionClassifier != "indy")
         }
-        groovyDependency = GroovyDependencyUtil.groovyModuleDependency(module, org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.versionNumber)
+        groovyDependency = groovyModuleDependency(module, versionNumber)
 
         expect:
         succeeds("compileGroovy")
@@ -367,7 +366,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         failure.assertHasErrorOutput('unable to resolve class groovy.ant.AntBuilder')
 
         when:
-        buildFile << "dependencies { implementation '${GroovyDependencyUtil.groovyModuleDependency("groovy-ant", org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.versionNumber)}' }"
+        buildFile << "dependencies { implementation '${groovyModuleDependency("groovy-ant", versionNumber)}' }"
 
         then:
         succeeds("compileGroovy")
@@ -392,7 +391,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
     def "canCompileAgainstGroovyClassThatDependsOnExternalClass"() {
         Assume.assumeFalse(versionLowerThan("3.0"))
 
-        buildFile << "dependencies { implementation '${GroovyDependencyUtil.groovyModuleDependency("groovy-test", org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.versionNumber)}' }"
+        buildFile << "dependencies { implementation '${groovyModuleDependency("groovy-test", versionNumber)}' }"
         expect:
         succeeds("test")
     }
@@ -463,7 +462,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         def gradleBaseServicesClass = Action
         buildScript """
             apply plugin: 'groovy'
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
         """
 
         when:
@@ -484,7 +483,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         def gradleBaseServicesClass = Action
         buildScript """
             apply plugin: 'groovy'
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
             dependencies {
                 implementation 'org.codehaus.groovy:groovy:2.4.3:grooid'
             }
@@ -504,7 +503,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         given:
         buildFile << """
             apply plugin: "groovy"
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
             compileGroovy.options.failOnError = false
         """.stripIndent()
 
@@ -519,7 +518,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         given:
         buildFile << """
             apply plugin: "groovy"
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
             compileGroovy.groovyOptions.failOnError = false
         """.stripIndent()
 
@@ -534,7 +533,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         given:
         buildFile << """
             apply plugin: "groovy"
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
             compileGroovy.options.failOnError = false
         """.stripIndent()
 
@@ -550,7 +549,7 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
         given:
         buildFile << """
             apply plugin: "groovy"
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
             compileGroovy.groovyOptions.failOnError = false
         """.stripIndent()
 
@@ -751,7 +750,7 @@ ${annotationProcessorExtraSetup()}
     def writeAnnotationProcessingBuild(String java, String groovy) {
         buildFile << """
             apply plugin: "groovy"
-            ${org.gradle.integtests.fixtures.AbstractIntegrationSpec.mavenCentralRepository()}
+            ${mavenCentralRepository()}
             compileGroovy {
                 groovyOptions.with {
                     stubDir = file("\$buildDir/classes/stub")

diff --git a/...vy/src/testFixtures/groovy/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec.groovy b/...vy/src/testFixtures/groovy/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.gradle.groovy.compile
 import org.gradle.internal.jvm.Jvm
-import org.gradle.util.internal.GroovyDependencyUtil
 import org.junit.Assume
 import spock.lang.Issue
 
@@ -69,7 +68,7 @@ abstract class GroovyCompilerIntegrationSpec extends BasicGroovyCompilerIntegrat
             return
         }
 
-        buildFile << "dependencies { implementation '${GroovyDependencyUtil.groovyModuleDependency("groovy-test", org.gradle.integtests.fixtures.MultiVersionIntegrationSpec.versionNumber)}' }"
+        buildFile << "dependencies { implementation '${groovyModuleDependency("groovy-test", versionNumber)}' }"
         when:
         run("test")