Test and fixes for invoke-interface on java.lang.Object methods.
Bug: 7614818
Change-Id: I704596cf3d36887e6d6d589cb3ec89e31d5b8901
diff --git a/test/022-interface/classes/Iface1.class b/test/022-interface/classes/Iface1.class
index d11704c..c9e64ad 100644
--- a/test/022-interface/classes/Iface1.class
+++ b/test/022-interface/classes/Iface1.class
Binary files differ
diff --git a/test/022-interface/classes/ImplA.class b/test/022-interface/classes/ImplA.class
index de175bf..88af792 100644
--- a/test/022-interface/classes/ImplA.class
+++ b/test/022-interface/classes/ImplA.class
Binary files differ
diff --git a/test/022-interface/classes/ImplB.class b/test/022-interface/classes/ImplB.class
index 951bebd..f0de5e2 100644
--- a/test/022-interface/classes/ImplB.class
+++ b/test/022-interface/classes/ImplB.class
Binary files differ
diff --git a/test/022-interface/classes/ImplBSub.class b/test/022-interface/classes/ImplBSub.class
index 1c1dcfd..193e42b 100644
--- a/test/022-interface/classes/ImplBSub.class
+++ b/test/022-interface/classes/ImplBSub.class
Binary files differ
diff --git a/test/022-interface/classes/Main$SubInterface.class b/test/022-interface/classes/Main$SubInterface.class
new file mode 100644
index 0000000..97e9ffd
--- /dev/null
+++ b/test/022-interface/classes/Main$SubInterface.class
Binary files differ
diff --git a/test/022-interface/classes/Main$SubInterfaceImpl.class b/test/022-interface/classes/Main$SubInterfaceImpl.class
new file mode 100644
index 0000000..2fd44e3
--- /dev/null
+++ b/test/022-interface/classes/Main$SubInterfaceImpl.class
Binary files differ
diff --git a/test/022-interface/classes/Main.class b/test/022-interface/classes/Main.class
index d9f22f7..e12b3c9 100644
--- a/test/022-interface/classes/Main.class
+++ b/test/022-interface/classes/Main.class
Binary files differ
diff --git a/test/022-interface/classes/ObjectOverridingInterface.class b/test/022-interface/classes/ObjectOverridingInterface.class
index e9e8db5..2bf784b 100644
--- a/test/022-interface/classes/ObjectOverridingInterface.class
+++ b/test/022-interface/classes/ObjectOverridingInterface.class
Binary files differ
diff --git a/test/022-interface/classes/SubObjectOverridingInterface.class b/test/022-interface/classes/SubObjectOverridingInterface.class
new file mode 100644
index 0000000..d5f38aa
--- /dev/null
+++ b/test/022-interface/classes/SubObjectOverridingInterface.class
Binary files differ
diff --git a/test/022-interface/src/Main.java b/test/022-interface/src/Main.java
index 3c3c21a..9010c98 100644
--- a/test/022-interface/src/Main.java
+++ b/test/022-interface/src/Main.java
@@ -67,10 +67,31 @@
};
doObjectOverrideTests(o);
}
+
+ private static interface SubInterface extends Cloneable, SubObjectOverridingInterface {
+ }
+
+ private static class SubInterfaceImpl implements SubInterface {
+ public int length() {
+ return 0;
+ }
+ public char charAt(int i) {
+ return '!';
+ }
+ public CharSequence subSequence(int s, int e) {
+ return "";
+ }
+ }
+
+ static String subObjectOverrideTests(SubInterface i) {
+ return i.toString();
+ }
+
static void doObjectOverrideTests(ObjectOverridingInterface o) {
check(o.equals(null));
check(o.hashCode() == 0xC001D00D);
check(o.toString().equals("Mallet's Mallet"));
+ check(subObjectOverrideTests(new SubInterfaceImpl()) != null);
System.out.println("objectOverrideTests: SUCCESS");
}
}
diff --git a/test/022-interface/src/ObjectOverridingInterface.java b/test/022-interface/src/ObjectOverridingInterface.java
index a44cdf5..a9e0abd 100644
--- a/test/022-interface/src/ObjectOverridingInterface.java
+++ b/test/022-interface/src/ObjectOverridingInterface.java
@@ -20,4 +20,5 @@
public interface ObjectOverridingInterface extends CharSequence {
public boolean equals(Object o);
public int hashCode();
+ public String toString();
}
diff --git a/test/022-interface/src/SubObjectOverridingInterface.java b/test/022-interface/src/SubObjectOverridingInterface.java
new file mode 100644
index 0000000..7babdcd
--- /dev/null
+++ b/test/022-interface/src/SubObjectOverridingInterface.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+public interface SubObjectOverridingInterface extends ObjectOverridingInterface {
+}