Skip to content

Commit

Permalink
Add integration test for the fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jbartok committed Mar 11, 2024
1 parent 10e777b commit c1f4f06
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .teamcity/subprojects.json
Expand Up @@ -199,7 +199,7 @@
"name": "declarative-dsl-core",
"path": "platforms/core-configuration/declarative-dsl-core",
"unitTests": true,
"functionalTests": false,
"functionalTests": true,
"crossVersionTests": false
},
{
Expand Down
Expand Up @@ -28,4 +28,6 @@ dependencies {

testImplementation(libs.futureKotlin("test-junit5"))
testImplementation("org.jetbrains:annotations:24.0.1")

integTestDistributionRuntimeOnly(project(":distributions-full"))
}
@@ -0,0 +1,111 @@
/*
* Copyright 2024 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.internal.declarativedsl

import org.gradle.integtests.fixtures.AbstractIntegrationSpec

class ErrorHandlingOnReflectiveCallsSpec extends AbstractIntegrationSpec {

def 'when reflective invocation fails the cause is identified correctly'() {
given:
file("buildSrc/build.gradle") << """
plugins {
id('java-gradle-plugin')
}
gradlePlugin {
plugins {
create("restrictedPlugin") {
id = "com.example.restricted"
implementationClass = "com.example.restricted.RestrictedPlugin"
}
}
}
"""

file("buildSrc/src/main/java/com/example/restricted/Extension.java") << """
package com.example.restricted;
import org.gradle.declarative.dsl.model.annotations.Configuring;
import org.gradle.declarative.dsl.model.annotations.Restricted;
import org.gradle.api.Action;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.provider.Property;
import javax.inject.Inject;
@Restricted
public abstract class Extension {
private final Access access;
private final ObjectFactory objects;
public Access getAccess() {
return access;
}
@Inject
public Extension(ObjectFactory objects) {
this.objects = objects;
this.access = objects.newInstance(Access.class);
}
@Configuring
public void access(Action<? super Access> configure) {
throw new RuntimeException("Boom");
}
public abstract static class Access {
@Restricted
public abstract Property<String> getName();
}
}
"""

file("buildSrc/src/main/java/com/example/restricted/RestrictedPlugin.java") << """
package com.example.restricted;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
public class RestrictedPlugin implements Plugin<Project> {
@Override
public void apply(Project target) {
target.getExtensions().create("restricted", Extension.class);
}
}
"""

file("build.gradle.something") << """
plugins {
id("com.example.restricted")
}
restricted {
access {
name = "something"
}
}
"""

when:
fails(":help")

then:
failureCauseContains("Boom")
}

}

0 comments on commit c1f4f06

Please sign in to comment.