Skip to content

Update unit and TAPI tests to avoid deprecated method calls #17102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2021
Merged

Update unit and TAPI tests to avoid deprecated method calls #17102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaBasePluginTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ class JavaBasePluginTest extends AbstractProjectBuilderSpec {
when:
project.pluginManager.apply(JavaBasePlugin)
project.sourceSets.create('custom')
project.sourceSets.custom.java.outputDir = classesDir
project.sourceSets.custom.java.destinationDirectory.set(classesDir)
project.sourceSets.custom.output.resourcesDir = resourcesDir

then:
Expand Down
14 changes: 13 additions & 1 deletion ...ing-api/src/crossVersionTest/groovy/org/gradle/integtests/tooling/TestLauncherSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,12 @@ abstract class TestLauncherSpec extends ToolingApiSpecification implements WithO
settingsFile << "rootProject.name = 'testproject'\n"
buildFile.text = simpleJavaProject()

def classesDir = 'file("build/classes/moreTests")'
buildFile << """
sourceSets {
moreTests {
java.srcDir "src/test"
${separateClassesDirs(targetVersion) ? "java.outputDir" : "output.classesDir"} = file("build/classes/moreTests")
${destinationDirectoryCode(classesDir)}
compileClasspath = compileClasspath + sourceSets.test.compileClasspath
runtimeClasspath = runtimeClasspath + sourceSets.test.runtimeClasspath
}
Expand Down Expand Up @@ -226,6 +227,17 @@ abstract class TestLauncherSpec extends ToolingApiSpecification implements WithO
version.baseVersion >= GradleVersion.version("4.0")
}

String destinationDirectoryCode(String destinationDirectory) {
//${separateClassesDirs(targetVersion) ? "java.outputDir" : "output.classesDir"} = file("build/classes/moreTests")
if (!separateClassesDirs(targetVersion)) {
return "output.classesDir = $destinationDirectory"
}
if (targetVersion.baseVersion < GradleVersion.version("6.1")) {
return "java.outputDir = $destinationDirectory"
}
return "java.destinationDirectory.set($destinationDirectory)"
}

def changeTestSource() {
// adding two more test methods
file("src/test/java/example/MyTest.java").text = """
Expand Down
3 changes: 2 additions & 1 deletion ...sVersionTest/groovy/org/gradle/integtests/tooling/r26/TestLauncherCrossVersionSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,12 @@ class TestLauncherCrossVersionSpec extends TestLauncherSpec {
settingsFile << "rootProject.name = 'testproject'\n"
buildFile.text = simpleJavaProject()

def classesDir = 'file("build/classes/moreTests")'
buildFile << """
sourceSets {
moreTests {
java.srcDir "src/test"
${separateClassesDirs(targetVersion) ? "java.outputDir" : "output.classesDir"} = file("build/classes/moreTests")
${destinationDirectoryCode(classesDir)}
compileClasspath = compileClasspath + sourceSets.test.compileClasspath
runtimeClasspath = runtimeClasspath + sourceSets.test.runtimeClasspath
}
Expand Down