You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/04/21 10:48:00 UTC
groovy git commit: GROOVY-7879: Groovy calls wrong method if there is
a static method on an interface (tests only for JDK8+)
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 5805cdb5b -> e802f6f26
GROOVY-7879: Groovy calls wrong method if there is a static method on an interface (tests only for JDK8+)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e802f6f2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e802f6f2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e802f6f2
Branch: refs/heads/GROOVY_2_5_X
Commit: e802f6f26d456b609b04d6275a6ca7acf585f6d2
Parents: 5805cdb
Author: paulk <pa...@asert.com.au>
Authored: Fri Apr 21 20:11:21 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Apr 21 20:11:21 2017 +1000
----------------------------------------------------------------------
...StaticMethodOverloadCompileStaticTest.groovy | 45 +++++++++++++++++
.../vm8/StaticMethodOverloadTest.groovy | 42 ++++++++++++++++
.../runtime/methoddispatching/vm8/FooOne.java | 31 ++++++++++++
.../runtime/methoddispatching/vm8/FooThree.java | 53 ++++++++++++++++++++
.../runtime/methoddispatching/vm8/FooTwo.java | 45 +++++++++++++++++
5 files changed, 216 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e802f6f2/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadCompileStaticTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadCompileStaticTest.groovy b/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadCompileStaticTest.groovy
new file mode 100644
index 0000000..b43de1e
--- /dev/null
+++ b/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadCompileStaticTest.groovy
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.groovy.runtime.methoddispatching.vm8
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+class StaticMethodOverloadCompileStaticTest extends GroovyTestCase {
+ void testOneStaticMethod() {
+ assert FooOne.foo() == "FooOne.foo()"
+ assert BarOne.foo() == "BarOne.foo()"
+ }
+
+ void testTwoStaticMethods() {
+ assert FooTwo.foo() == "FooTwo.foo()"
+ assert FooTwo.foo(0) == "FooTwo.foo(0)"
+ assert BarTwo.foo() == "BarTwo.foo()"
+ assert BarTwo.foo(0) == "BarTwo.foo(0)"
+ }
+
+ void testMoreThanTwoStaticMethods() {
+ assert FooThree.foo() == "FooThree.foo()"
+ assert FooThree.foo(0) == "FooThree.foo(0)"
+ assert FooThree.foo(0, 1) == "FooThree.foo(0, 1)"
+ assert BarThree.foo() == "BarThree.foo()"
+ assert BarThree.foo(0) == "BarThree.foo(0)"
+ assert BarThree.foo(0, 1) == "BarThree.foo(0, 1)"
+ }
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e802f6f2/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadTest.groovy b/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadTest.groovy
new file mode 100644
index 0000000..df9c87a
--- /dev/null
+++ b/subprojects/groovy-tests-vm8/src/test/groovy/org/apache/groovy/runtime/methoddispatching/vm8/StaticMethodOverloadTest.groovy
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.groovy.runtime.methoddispatching.vm8
+
+class StaticMethodOverloadTest extends GroovyTestCase {
+ void testOneStaticMethod() {
+ assert FooOne.foo() == "FooOne.foo()"
+ assert BarOne.foo() == "BarOne.foo()"
+ }
+
+ void testTwoStaticMethods() {
+ assert FooTwo.foo() == "FooTwo.foo()"
+ assert FooTwo.foo(0) == "FooTwo.foo(0)"
+ assert BarTwo.foo() == "BarTwo.foo()"
+ assert BarTwo.foo(0) == "BarTwo.foo(0)"
+ }
+
+ void testMoreThanTwoStaticMethods() {
+ assert FooThree.foo() == "FooThree.foo()"
+ assert FooThree.foo(0) == "FooThree.foo(0)"
+ assert FooThree.foo(0, 1) == "FooThree.foo(0, 1)"
+ assert BarThree.foo() == "BarThree.foo()"
+ assert BarThree.foo(0) == "BarThree.foo(0)"
+ assert BarThree.foo(0, 1) == "BarThree.foo(0, 1)"
+ }
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e802f6f2/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooOne.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooOne.java b/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooOne.java
new file mode 100644
index 0000000..300a385
--- /dev/null
+++ b/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooOne.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.groovy.runtime.methoddispatching.vm8;
+
+interface FooOne {
+ static String foo() {
+ return "FooOne.foo()";
+ }
+}
+
+class BarOne implements FooOne {
+ static String foo() {
+ return "BarOne.foo()";
+ }
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e802f6f2/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooThree.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooThree.java b/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooThree.java
new file mode 100644
index 0000000..55dbc09
--- /dev/null
+++ b/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooThree.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.groovy.runtime.methoddispatching.vm8;
+
+import org.codehaus.groovy.runtime.metaclass.MetaMethodIndex;
+
+/**
+ * To test the case when we call a static method on a class and while we load all the methods from its interface,
+ * {@link MetaMethodIndex.Entry} contains more than one method from interface already
+ */
+interface FooThree {
+ static String foo() {
+ return "FooThree.foo()";
+ }
+
+ static String foo(int a) {
+ return String.format("FooThree.foo(%1$d)", a);
+ }
+
+ static String foo(int a, int b) {
+ return String.format("FooThree.foo(%1$d, %2$d)", a, b);
+ }
+}
+
+class BarThree implements FooThree {
+ static String foo() {
+ return "BarThree.foo()";
+ }
+
+ static String foo(int a) {
+ return String.format("BarThree.foo(%1$d)", a);
+ }
+
+ static String foo(int a, int b) {
+ return String.format("BarThree.foo(%1$d, %2$d)", a, b);
+ }
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e802f6f2/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooTwo.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooTwo.java b/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooTwo.java
new file mode 100644
index 0000000..11d230f
--- /dev/null
+++ b/subprojects/groovy-tests-vm8/src/test/java/org/apache/groovy/runtime/methoddispatching/vm8/FooTwo.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.groovy.runtime.methoddispatching.vm8;
+
+import org.codehaus.groovy.runtime.metaclass.MetaMethodIndex;
+
+/**
+ * To test the case when we call a static method on a class and {@link MetaMethodIndex.Entry}
+ * contains more than one method from interface already
+ */
+interface FooTwo {
+ static String foo() {
+ return "FooTwo.foo()";
+ }
+
+ static String foo(int a) {
+ return String.format("FooTwo.foo(%1$d)", a);
+ }
+}
+
+class BarTwo implements FooTwo {
+ static String foo() {
+ return "BarTwo.foo()";
+ }
+
+ static String foo(int a) {
+ return String.format("BarTwo.foo(%1$d)", a);
+ }
+}