This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit c1f307648e32608f75a904ba40de50519bd1b6bb
Author: Ben Weidig <b...@netzgut.net>
AuthorDate: Sun Jun 15 16:05:24 2025 +0200
TAP5-2809: removed singluar test that relied on a Groovy bug
---
.../apache/tapestry5/plastic/MethodProxying.groovy | 55 ++++++++++------------
1 file changed, 25 insertions(+), 30 deletions(-)
diff --git
a/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodProxying.groovy
b/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodProxying.groovy
index 18856c63e..fc6e01534 100644
--- a/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodProxying.groovy
+++ b/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodProxying.groovy
@@ -33,38 +33,34 @@ class MethodProxying extends AbstractPlasticSpecification {
1 * mockRunnable.run()
}
- def "Proxying with static methods"() {
- setup:
-
- def mockRunnable = Mock(Runnable.class)
-
- def o = mgr.createClass(Object, { PlasticClass pc ->
-
- def field = pc.introduceField(Runnable,
"delegate").inject(mockRunnable)
-
- pc.proxyInterface(WithStatic, field)
- } as PlasticClassTransformer).newInstance()
-
- expect:
-
- WithStatic.isInstance o
- o.version() == 1
-
- when:
-
- o.run()
-
- then:
-
- 1 * mockRunnable.run()
- }
+ /*
+ * The call o.version() was wroking due to a bug in Groovy and
+ * calliong static methods on instances no longer works since 3.0.18
+ * https://issues.apache.org/jira/browse/GROOVY-8164
+ * https://issues.apache.org/jira/browse/GROOVY-10764
+ def "Proxying with static methods"() {
+ setup:
+ def mockRunnable = Mock(Runnable.class)
+ def o = mgr.createClass(Object, { PlasticClass pc ->
+ def field = pc.introduceField(Runnable, "delegate").inject(mockRunnable)
+ pc.proxyInterface(WithStatic, field)
+ } as PlasticClassTransformer).newInstance()
+ expect:
+ WithStatic.isInstance o
+ o.version() == 1
+ when:
+ o.run()
+ then:
+ 1 * mockRunnable.run()
+ }
+ */
@Issue("TAP5-2582")
def "Proxying with multiple methods of the same signature"() {
setup:
def mockRunner = Mock(SameMethodsInterface.class) {
- run() >> new testinterfaces.samemethodinterface.pkg2.Result();
+ run() >> new testinterfaces.samemethodinterface.pkg2.Result()
}
def o = mgr.createClass(Object, { PlasticClass pc ->
@@ -76,13 +72,13 @@ class MethodProxying extends AbstractPlasticSpecification {
when:
- def result = o.run();
+ def result = o.run()
then:
- result instanceof testinterfaces.samemethodinterface.pkg1.Result;
+ result instanceof testinterfaces.samemethodinterface.pkg1.Result
- result instanceof testinterfaces.samemethodinterface.pkg2.Result;
+ result instanceof testinterfaces.samemethodinterface.pkg2.Result
}
def "proxy method with arguments and return value"() {
@@ -130,7 +126,6 @@ class MethodProxying extends AbstractPlasticSpecification {
mi.returnValue = memory
// And don't proceed()
-
} as MethodAdvice)
def m = Memory.getMethod("returnLast", long)
