/hg/rhino-tests: Updated four tests in BindingsClassTest for (Op...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon May 13 00:35:32 PDT 2013
changeset a572cad21e85 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a572cad21e85
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon May 13 09:38:58 2013 +0200
Updated four tests in BindingsClassTest for (Open)JDK8 API:
getMethod, getDeclaredMethod, getMethods and getDeclaredMethods.
diffstat:
ChangeLog | 6 +
src/org/RhinoTests/BindingsClassTest.java | 106 ++++++++++++++++++++++++++++-
2 files changed, 108 insertions(+), 4 deletions(-)
diffs (164 lines):
diff -r c34799b2f593 -r a572cad21e85 ChangeLog
--- a/ChangeLog Fri May 10 11:12:17 2013 +0200
+++ b/ChangeLog Mon May 13 09:38:58 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-13 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/BindingsClassTest.java:
+ Updated four tests in BindingsClassTest for (Open)JDK8 API:
+ getMethod, getDeclaredMethod, getMethods and getDeclaredMethods.
+
2013-05-10 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
diff -r c34799b2f593 -r a572cad21e85 src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java Fri May 10 11:12:17 2013 +0200
+++ b/src/org/RhinoTests/BindingsClassTest.java Mon May 13 09:38:58 2013 +0200
@@ -635,6 +635,24 @@
"public abstract void javax.script.Bindings.putAll(java.util.Map)",
};
+ final String[] methodsThatShouldExist_jdk8 = {
+ "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)",
+ };
+
// get all inherited methods
Method[] methods = this.bindingsClass.getMethods();
// and transform the array into a list of method names
@@ -642,7 +660,20 @@
for (Method method : methods) {
methodsAsString.add(method.toString());
}
- String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+
+ String[] methodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ methodsThatShouldExist = methodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ methodsThatShouldExist = methodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ methodsThatShouldExist = methodsThatShouldExist_jdk8;
+ break;
+ }
+
// check if all required methods really exists
for (String methodThatShouldExists : methodsThatShouldExist) {
assertTrue(methodsAsString.contains(methodThatShouldExists),
@@ -671,6 +702,14 @@
"public abstract void javax.script.Bindings.putAll(java.util.Map)",
};
+ final String[] declaredMethodsThatShouldExist_jdk8 = {
+ "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)",
+ };
+
// get all declared methods
Method[] declaredMethods = this.bindingsClass.getDeclaredMethods();
// and transform the array into a list of method names
@@ -678,7 +717,20 @@
for (Method method : declaredMethods) {
methodsAsString.add(method.toString());
}
- String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7;
+
+ String[] declaredMethodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8;
+ break;
+ }
+
// check if all required methods really exists
for (String methodThatShouldExists : declaredMethodsThatShouldExist) {
assertTrue(methodsAsString.contains(methodThatShouldExists),
@@ -725,7 +777,35 @@
methodsThatShouldExist_jdk7.put("keySet", new Class[] {});
methodsThatShouldExist_jdk7.put("containsValue", new Class[] {java.lang.Object.class});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("remove", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("putAll", new Class[] {java.util.Map.class});
+ methodsThatShouldExist_jdk8.put("containsKey", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.Object.class, java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("values", new Class[] {});
+ methodsThatShouldExist_jdk8.put("hashCode", new Class[] {});
+ methodsThatShouldExist_jdk8.put("clear", new Class[] {});
+ methodsThatShouldExist_jdk8.put("isEmpty", new Class[] {});
+ methodsThatShouldExist_jdk8.put("size", new Class[] {});
+ methodsThatShouldExist_jdk8.put("entrySet", new Class[] {});
+ methodsThatShouldExist_jdk8.put("keySet", new Class[] {});
+ methodsThatShouldExist_jdk8.put("containsValue", new Class[] {java.lang.Object.class});
+
+ Map<String, Class[]> methodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ methodsThatShouldExist = methodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ methodsThatShouldExist = methodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ methodsThatShouldExist = methodsThatShouldExist_jdk8;
+ break;
+ }
// check if all required methods really exist
for (Map.Entry<String, Class[]> methodThatShouldExists : methodsThatShouldExist.entrySet()) {
@@ -765,7 +845,25 @@
methodsThatShouldExist_jdk7.put("putAll", new Class[] {java.util.Map.class});
methodsThatShouldExist_jdk7.put("containsKey", new Class[] {java.lang.Object.class});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("remove", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("putAll", new Class[] {java.util.Map.class});
+ methodsThatShouldExist_jdk8.put("containsKey", new Class[] {java.lang.Object.class});
+
+ Map<String, Class[]> methodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ methodsThatShouldExist = methodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ methodsThatShouldExist = methodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ methodsThatShouldExist = methodsThatShouldExist_jdk8;
+ break;
+ }
// check if all required methods really exist
for (Map.Entry<String, Class[]> methodThatShouldExists : methodsThatShouldExist.entrySet()) {
More information about the distro-pkg-dev
mailing list