Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3209 from gradle/donat/ide/eclipse-cp-separation
Allow Buildship to separate runtime classpath based on source set information
- Loading branch information
Showing
28 changed files
with
857 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...radle/plugins/ide/tooling/r44/ToolingApiEclipseModelOutputLocationCrossVersionSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright 2017 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. | ||
| * 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.gradle.plugins.ide.tooling.r44 | ||
|
|
||
| import org.gradle.integtests.tooling.fixture.TargetGradleVersion | ||
| import org.gradle.integtests.tooling.fixture.ToolingApiSpecification | ||
| import org.gradle.integtests.tooling.fixture.ToolingApiVersion | ||
| import org.gradle.tooling.model.eclipse.EclipseOutputLocation | ||
| import org.gradle.tooling.model.eclipse.EclipseProject | ||
|
|
||
| @ToolingApiVersion('>=4.4') | ||
| @TargetGradleVersion(">=4.4") | ||
| class ToolingApiEclipseModelOutputLocationCrossVersionSpec extends ToolingApiSpecification { | ||
|
|
||
| def setup() { | ||
| settingsFile << 'rootProject.name = "root"' | ||
| } | ||
|
|
||
| def "Non-Java project has default output location"() { | ||
| when: | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
| EclipseOutputLocation output = project.getOutputLocation() | ||
|
|
||
| then: | ||
| output.path == 'bin/default' | ||
| } | ||
|
|
||
| def "Java project has default output location"() { | ||
| setup: | ||
| buildFile << "apply plugin: 'java'" | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
|
|
||
| when: | ||
| EclipseOutputLocation output = project.getOutputLocation() | ||
|
|
||
| then: | ||
| output.path == 'bin/default' | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
...lugins/ide/tooling/r44/ToolingApiEclipseModelSourceDirectoryOutputCrossVersionSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright 2017 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. | ||
| * 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.gradle.plugins.ide.tooling.r44 | ||
|
|
||
| import org.gradle.integtests.tooling.fixture.TargetGradleVersion | ||
| import org.gradle.integtests.tooling.fixture.ToolingApiSpecification | ||
| import org.gradle.integtests.tooling.fixture.ToolingApiVersion | ||
| import org.gradle.tooling.model.eclipse.EclipseProject | ||
|
|
||
| @ToolingApiVersion('>=4.4') | ||
| @TargetGradleVersion(">=4.4") | ||
| class ToolingApiEclipseModelSourceDirectoryOutputCrossVersionSpec extends ToolingApiSpecification { | ||
|
|
||
| def "Source directories have default output"() { | ||
| setup: | ||
| settingsFile << 'rootProject.name = "root"' | ||
| buildFile << "apply plugin: 'java'" | ||
| file('src/main/java').mkdirs() | ||
|
|
||
| when: | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
|
|
||
| then: | ||
| project.sourceDirectories.size() == 1 | ||
| project.sourceDirectories[0].output == 'bin/main' | ||
| } | ||
|
|
||
| def "Source directory has custom output"() { | ||
| setup: | ||
| settingsFile << 'rootProject.name = "root"' | ||
| buildFile << """ | ||
| apply plugin: 'java' | ||
| apply plugin: 'eclipse' | ||
| eclipse.classpath.file.whenMerged { | ||
| entries.find { entry -> entry.path == 'src/test/java' }.output = null | ||
| entries.find { entry -> entry.path == 'src/test/resources' }.output = 'out/test-resources' | ||
| } | ||
| """ | ||
|
|
||
| file('src/test/java').mkdirs() | ||
| file('src/test/resources').mkdirs() | ||
|
|
||
| when: | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
|
|
||
| then: | ||
| project.sourceDirectories.size() == 2 | ||
| project.sourceDirectories[0].output == null | ||
| project.sourceDirectories[1].output == 'out/test-resources' | ||
| } | ||
|
|
||
| } |
110 changes: 110 additions & 0 deletions
110
.../tooling/r44/ToolingApiEclipseModelSourceFolderClasspathAttributesCrossVersionSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Copyright 2017 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. | ||
| * 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.gradle.plugins.ide.tooling.r44 | ||
|
|
||
| import org.gradle.integtests.tooling.fixture.TargetGradleVersion | ||
| import org.gradle.integtests.tooling.fixture.ToolingApiSpecification | ||
| import org.gradle.integtests.tooling.fixture.ToolingApiVersion | ||
| import org.gradle.tooling.model.eclipse.EclipseProject | ||
|
|
||
| @ToolingApiVersion('>=4.4') | ||
| @TargetGradleVersion(">=4.4") | ||
| class ToolingApiEclipseModelSourceFolderClasspathAttributesCrossVersionSpec extends ToolingApiSpecification { | ||
|
|
||
| def "Source folder contains source set information in classpath attributes"() { | ||
| setup: | ||
| buildFile << "apply plugin: 'java'" | ||
| file('src/main/java').mkdirs() | ||
| file('src/test/java').mkdirs() | ||
|
|
||
| when: | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
| def mainDirAttributes = project.sourceDirectories.find { it.path == 'src/main/java' }.classpathAttributes | ||
| def testDirAttributes = project.sourceDirectories.find { it.path == 'src/test/java' }.classpathAttributes | ||
|
|
||
| then: | ||
| mainDirAttributes.size() == 2 | ||
| mainDirAttributes[0].name == 'gradle_scope' | ||
| mainDirAttributes[0].value == 'main' | ||
| mainDirAttributes[1].name == 'gradle_used_by_scope' | ||
| mainDirAttributes[1].value == 'main,test' | ||
|
|
||
| testDirAttributes.size() == 2 | ||
| testDirAttributes[0].name == 'gradle_scope' | ||
| testDirAttributes[0].value == 'test' | ||
| testDirAttributes[1].name == 'gradle_used_by_scope' | ||
| testDirAttributes[1].value == 'test' | ||
| } | ||
|
|
||
| def "Source folder defines additional classpath attributes"() { | ||
| buildFile << | ||
| """apply plugin: 'java' | ||
| apply plugin: 'eclipse' | ||
| eclipse { | ||
| classpath { | ||
| file { | ||
| whenMerged { classpath -> | ||
| classpath.entries.find { it.kind == 'src' && it.path == 'src/main/java' }.entryAttributes.key1 = 'value1' | ||
| classpath.entries.find { it.kind == 'src' && it.path == 'src/main/java' }.entryAttributes.key2 = 'value2' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| file('src/main/java').mkdirs() | ||
|
|
||
| when: | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
|
|
||
| then: | ||
| project.sourceDirectories.size() == 1 | ||
| project.sourceDirectories[0].classpathAttributes.size() == 4 | ||
| project.sourceDirectories[0].classpathAttributes.find { it.name == 'gradle_scope' && it.value == 'main'} | ||
| project.sourceDirectories[0].classpathAttributes.find { it.name == 'gradle_used_by_scope' && it.value == 'main,test'} | ||
| project.sourceDirectories[0].classpathAttributes.find { it.name == 'key1' && it.value == 'value1'} | ||
| project.sourceDirectories[0].classpathAttributes.find { it.name == 'key2' && it.value == 'value2'} | ||
| } | ||
|
|
||
|
|
||
| def "Source dir information can be modified in whenMerged block"() { | ||
| buildFile << | ||
| """apply plugin: 'java' | ||
| apply plugin: 'eclipse' | ||
| eclipse { | ||
| classpath { | ||
| file { | ||
| whenMerged { classpath -> | ||
| def entry = classpath.entries.find { it.kind == 'src' && it.path == 'src/main/java' } | ||
| entry.entryAttributes['gradle_scope'] = 'foo' | ||
| entry.entryAttributes['gradle_used_by_scope'] = 'foo,bar' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| file('src/main/java').mkdirs() | ||
|
|
||
| when: | ||
| EclipseProject project = loadToolingModel(EclipseProject) | ||
|
|
||
| then: | ||
| project.sourceDirectories.size() == 1 | ||
| project.sourceDirectories[0].classpathAttributes.size() == 2 | ||
| project.sourceDirectories[0].classpathAttributes.find { it.name == 'gradle_scope' && it.value == 'foo'} | ||
| project.sourceDirectories[0].classpathAttributes.find { it.name == 'gradle_used_by_scope' && it.value == 'foo,bar'} | ||
| } | ||
| } |
Oops, something went wrong.