/hg/rhino-tests: Make the test src/org/RhinoTests/BindingsClassT...

[ptisnovs at icedtea.classpath.org]

changeset 6d02300b36fa in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=6d02300b36fa
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 10 12:45:08 2012 +0200

	Make the test src/org/RhinoTests/BindingsClassTest.java compatible with JDK 7.


diffstat:

 ChangeLog                                 |   5 +++++
 src/org/RhinoTests/BindingsClassTest.java |  20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diffs (49 lines):

diff -r 077761971a05 -r 6d02300b36fa ChangeLog
--- a/ChangeLog	Tue Oct 09 09:18:20 2012 +0200
+++ b/ChangeLog	Wed Oct 10 12:45:08 2012 +0200
@@ -1,3 +1,8 @@
+2012-10-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/BindingsClassTest.java:
+	Make this test compatible with JDK 7.
+
 2012-10-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/SimpleBindingsClassTest.java:
diff -r 077761971a05 -r 6d02300b36fa src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java	Tue Oct 09 09:18:20 2012 +0200
+++ b/src/org/RhinoTests/BindingsClassTest.java	Wed Oct 10 12:45:08 2012 +0200
@@ -358,6 +358,21 @@
     protected void testGetMethods() {
         // following methods should be inherited
         final String[] methodsThatShouldExists_jdk6 = {
+            "public abstract boolean java.util.Map.containsValue(java.lang.Object)",
+            "public abstract boolean java.util.Map.equals(java.lang.Object)",
+            "public abstract boolean java.util.Map.isEmpty()",
+            "public abstract boolean javax.script.Bindings.containsKey(java.lang.Object)",
+            "public abstract int java.util.Map.hashCode()",
+            "public abstract int java.util.Map.size()",
+            "public abstract java.lang.Object java.util.Map.put(java.lang.Object,java.lang.Object)",
+            "public abstract java.lang.Object javax.script.Bindings.get(java.lang.Object)",
+            "public abstract java.lang.Object javax.script.Bindings.put(java.lang.String,java.lang.Object)",
+            "public abstract java.lang.Object javax.script.Bindings.remove(java.lang.Object)",
+            "public abstract java.util.Collection java.util.Map.values()",
+            "public abstract java.util.Set java.util.Map.entrySet()",
+            "public abstract java.util.Set java.util.Map.keySet()",
+            "public abstract void java.util.Map.clear()",
+            "public abstract void javax.script.Bindings.putAll(java.util.Map)",
         };
 
         final String[] methodsThatShouldExists_jdk7 = {
@@ -399,6 +414,11 @@
     protected void testGetDeclaredMethods() {
         // following methods should be declared
         final String[] declaredMethodsThatShouldExists_jdk6 = {
+            "public abstract boolean javax.script.Bindings.containsKey(java.lang.Object)",
+            "public abstract java.lang.Object javax.script.Bindings.get(java.lang.Object)",
+            "public abstract java.lang.Object javax.script.Bindings.put(java.lang.String,java.lang.Object)",
+            "public abstract java.lang.Object javax.script.Bindings.remove(java.lang.Object)",
+            "public abstract void javax.script.Bindings.putAll(java.util.Map)",
         };
 
         final String[] declaredMethodsThatShouldExists_jdk7 = {