Skip to content

Enable IP tests for java-platform #32803

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
Mar 21, 2025
Merged

Enable IP tests for java-platform #32803

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
3 changes: 0 additions & 3 deletions platforms/jvm/java-platform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,3 @@ dependencies {
packageCycles {
excludePatterns.add("org/gradle/api/internal/java/**")
}
tasks.isolatedProjectsIntegTest {
enabled = false
}
19 changes: 13 additions & 6 deletions .../groovy/org/gradle/integtests/resolve/platforms/JavaPlatformResolveIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.gradle.integtests.resolve.platforms

import org.gradle.api.attributes.Category
import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
import org.gradle.integtests.fixtures.ToBeFixedForIsolatedProjects
import org.gradle.integtests.fixtures.resolve.ResolveTestFixture
import org.hamcrest.Matchers

Expand All @@ -27,20 +28,22 @@ class JavaPlatformResolveIntegrationTest extends AbstractHttpDependencyResolutio
ResolveTestFixture resolve

def setup() {
settingsFile << "rootProject.name = 'test'"
buildFile << """
apply plugin: 'java-library'

allprojects {
settingsFile << """
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💅

Suggested change
settingsFile << """
settingsFile """

rootProject.name = 'test'
gradle.lifecycle.beforeProject {
repositories {
maven { url = "${mavenHttpRepo.uri}" }
}
group = 'org.test'
version = '1.9'
}
"""
buildFile << """
apply plugin: 'java-library'
"""
}

@ToBeFixedForIsolatedProjects(because = "ResolveTestFixture#prepare isn't IP compatible")
def "can get recommendations from a platform subproject"() {
def module = mavenHttpRepo.module("org", "foo", "1.1").publish()

Expand Down Expand Up @@ -80,6 +83,7 @@ class JavaPlatformResolveIntegrationTest extends AbstractHttpDependencyResolutio
}
}

@ToBeFixedForIsolatedProjects(because = "ResolveTestFixture#prepare isn't IP compatible")
def "can get different recommendations from a platform runtime subproject"() {
def module1 = mavenHttpRepo.module("org", "foo", "1.1").publish()
def module2 = mavenHttpRepo.module("org", "bar", "1.2").publish()
Expand Down Expand Up @@ -130,6 +134,7 @@ class JavaPlatformResolveIntegrationTest extends AbstractHttpDependencyResolutio
}
}

@ToBeFixedForIsolatedProjects(because = "ResolveTestFixture#prepare isn't IP compatible")
def "fails when using a regular project dependency instead of a platform dependency"() {
def module = mavenHttpRepo.module("org", "foo", "1.1").publish()

Expand Down Expand Up @@ -159,6 +164,7 @@ class JavaPlatformResolveIntegrationTest extends AbstractHttpDependencyResolutio
failure.assertThatCause(Matchers.startsWith("No matching variant of project :platform was found."))
}

@ToBeFixedForIsolatedProjects(because = "ResolveTestFixture#prepare isn't IP compatible")
def "can enforce a local platform dependency"() {
def module1 = mavenHttpRepo.module("org", "foo", "1.1").publish()
def module2 = mavenHttpRepo.module("org", "foo", "1.2").publish()
Expand Down Expand Up @@ -201,7 +207,7 @@ class JavaPlatformResolveIntegrationTest extends AbstractHttpDependencyResolutio
}
}

def "Can handle a published platform dependency that is resolved to a local platform project"() {
def "can handle a published platform dependency that is resolved to a local platform project"() {
given:
file("src/main/java/SomeClass.java") << "public class SomeClass {}"
platformModule('')
Expand Down Expand Up @@ -234,6 +240,7 @@ class JavaPlatformResolveIntegrationTest extends AbstractHttpDependencyResolutio
succeeds ":compileJava"
}

@ToBeFixedForIsolatedProjects(because = "ResolveTestFixture#prepare isn't IP compatible")
def 'constraint from platform does not erase excludes (platform: #platform)'() {
given:
platformModule("""
Expand Down
32 changes: 17 additions & 15 deletions ...integtests/resolve/platforms/NativeAlignmentWithJavaPlatformResolveIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ package org.gradle.integtests.resolve.platforms
import org.gradle.api.JavaVersion
import org.gradle.integtests.fixtures.GradleMetadataResolveRunner
import org.gradle.integtests.fixtures.RequiredFeature
import org.gradle.integtests.fixtures.ToBeFixedForIsolatedProjects
import org.gradle.integtests.fixtures.resolve.ResolveTestFixture
import org.gradle.integtests.resolve.AbstractModuleDependencyResolveTest

import static org.gradle.util.internal.TextUtil.escapeString

@RequiredFeature(feature = GradleMetadataResolveRunner.GRADLE_METADATA, value="true")
@RequiredFeature(feature = GradleMetadataResolveRunner.REPOSITORY_TYPE, value="maven")
@RequiredFeature(feature = GradleMetadataResolveRunner.GRADLE_METADATA, value = "true")
@RequiredFeature(feature = GradleMetadataResolveRunner.REPOSITORY_TYPE, value = "maven")
class NativeAlignmentWithJavaPlatformResolveIntegrationTest extends AbstractModuleDependencyResolveTest {
@ToBeFixedForIsolatedProjects(because = "subprojects, rootProject access")
def "publishes a platform with native alignment"() {
settingsFile << """
rootProject.name = 'root'
Expand Down Expand Up @@ -198,17 +200,17 @@ class NativeAlignmentWithJavaPlatformResolveIntegrationTest extends AbstractModu
byConstraint("platform alignment")
byConflictResolution("between versions 1.1 and 1.0")
variant "apiElements", [
'org.gradle.category':'library',
'org.gradle.dependency.bundling':'external',
'org.gradle.category': 'library',
'org.gradle.dependency.bundling': 'external',
'org.gradle.jvm.version': JavaVersion.current().majorVersion,
'org.gradle.status':'release',
'org.gradle.status': 'release',
'org.gradle.usage': 'java-api',
'org.gradle.libraryelements': 'jar',
]
module('com.acme.foo:platform:1.1') {
variant "apiElements", [
'org.gradle.category':'platform',
'org.gradle.status':'release',
'org.gradle.category': 'platform',
'org.gradle.status': 'release',
'org.gradle.usage': 'java-api']
constraint('com.acme.foo:core:1.1')
constraint('com.acme.foo:lib:1.1')
Expand All @@ -217,10 +219,10 @@ class NativeAlignmentWithJavaPlatformResolveIntegrationTest extends AbstractModu
}
module('com.acme.foo:lib:1.1') {
variant "apiElements", [
'org.gradle.category':'library',
'org.gradle.dependency.bundling':'external',
'org.gradle.category': 'library',
'org.gradle.dependency.bundling': 'external',
'org.gradle.jvm.version': JavaVersion.current().majorVersion,
'org.gradle.status':'release',
'org.gradle.status': 'release',
'org.gradle.usage': 'java-api',
'org.gradle.libraryelements': 'jar',
]
Expand All @@ -230,17 +232,17 @@ class NativeAlignmentWithJavaPlatformResolveIntegrationTest extends AbstractModu
}
module('com.acme.foo:lib:1.1') {
variant "apiElements", [
'org.gradle.category':'library',
'org.gradle.dependency.bundling':'external',
'org.gradle.category': 'library',
'org.gradle.dependency.bundling': 'external',
'org.gradle.jvm.version': JavaVersion.current().majorVersion,
'org.gradle.status':'release',
'org.gradle.status': 'release',
'org.gradle.usage': 'java-api',
'org.gradle.libraryelements': 'jar',
]
module('com.acme.foo:platform:1.1') {
variant "apiElements", [
'org.gradle.category':'platform',
'org.gradle.status':'release',
'org.gradle.category': 'platform',
'org.gradle.status': 'release',
'org.gradle.usage': 'java-api']
}
}
Expand Down
Loading