/hg/rhino-tests: Updated four tests in SimpleScriptContextClassT...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed May 22 01:25:42 PDT 2013
changeset dcd99aa87cdd in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=dcd99aa87cdd
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed May 22 10:29:08 2013 +0200
Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API:
getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
diffstat:
ChangeLog | 8 +-
src/org/RhinoTests/SimpleScriptContextClassTest.java | 139 ++++++++++++++++++-
2 files changed, 142 insertions(+), 5 deletions(-)
diffs (202 lines):
diff -r c4adcc4e0eb0 -r dcd99aa87cdd ChangeLog
--- a/ChangeLog Tue May 21 11:18:13 2013 +0200
+++ b/ChangeLog Wed May 22 10:29:08 2013 +0200
@@ -1,7 +1,13 @@
+2013-05-22 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/SimpleScriptContextClassTest.java:
+ Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API:
+ getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
+
2013-05-21 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/CompilableClassTest.java:
- Updated two tests in CompilableClassTest for (Open)JDK8 API:
+ Updated four tests in CompilableClassTest for (Open)JDK8 API:
getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
2013-05-20 Pavel Tisnovsky <ptisnovs at redhat.com>
diff -r c4adcc4e0eb0 -r dcd99aa87cdd src/org/RhinoTests/SimpleScriptContextClassTest.java
--- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Tue May 21 11:18:13 2013 +0200
+++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Wed May 22 10:29:08 2013 +0200
@@ -730,6 +730,32 @@
"public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)",
};
+ final String[] methodsThatShouldExist_jdk8 = {
+ "public boolean java.lang.Object.equals(java.lang.Object)",
+ "public final native java.lang.Class java.lang.Object.getClass()",
+ "public final native void java.lang.Object.notify()",
+ "public final native void java.lang.Object.notifyAll()",
+ "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException",
+ "public final void java.lang.Object.wait() throws java.lang.InterruptedException",
+ "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException",
+ "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)",
+ "public java.io.Reader javax.script.SimpleScriptContext.getReader()",
+ "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()",
+ "public java.io.Writer javax.script.SimpleScriptContext.getWriter()",
+ "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String)",
+ "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String,int)",
+ "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)",
+ "public java.lang.String java.lang.Object.toString()",
+ "public java.util.List javax.script.SimpleScriptContext.getScopes()",
+ "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)",
+ "public native int java.lang.Object.hashCode()",
+ "public void javax.script.SimpleScriptContext.setAttribute(java.lang.String,java.lang.Object,int)",
+ "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)",
+ "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)",
+ "public void javax.script.SimpleScriptContext.setReader(java.io.Reader)",
+ "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)",
+ };
+
// get all inherited methods
Method[] methods = this.simpleScriptContextClass.getMethods();
// and transform the array into a list of method names
@@ -737,7 +763,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),
@@ -784,6 +823,23 @@
"public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)",
};
+ final String[] declaredMethodsThatShouldExist_jdk8 = {
+ "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)",
+ "public java.io.Reader javax.script.SimpleScriptContext.getReader()",
+ "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()",
+ "public java.io.Writer javax.script.SimpleScriptContext.getWriter()",
+ "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String)",
+ "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String,int)",
+ "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)",
+ "public java.util.List javax.script.SimpleScriptContext.getScopes()",
+ "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)",
+ "public void javax.script.SimpleScriptContext.setAttribute(java.lang.String,java.lang.Object,int)",
+ "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)",
+ "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)",
+ "public void javax.script.SimpleScriptContext.setReader(java.io.Reader)",
+ "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)",
+ };
+
// get all declared methods
Method[] declaredMethods = this.simpleScriptContextClass.getDeclaredMethods();
// and transform the array into a list of method names
@@ -792,7 +848,19 @@
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),
@@ -855,7 +923,43 @@
methodsThatShouldExist_jdk7.put("notify", new Class[] {});
methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class});
+ methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class});
+ methodsThatShouldExist_jdk8.put("getWriter", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setWriter", new Class[] {java.io.Writer.class});
+ methodsThatShouldExist_jdk8.put("getReader", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setReader", new Class[] {java.io.Reader.class});
+ methodsThatShouldExist_jdk8.put("getErrorWriter", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setErrorWriter", new Class[] {java.io.Writer.class});
+ methodsThatShouldExist_jdk8.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class});
+ methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class, int.class});
+ methodsThatShouldExist_jdk8.put("removeAttribute", new Class[] {java.lang.String.class, int.class});
+ methodsThatShouldExist_jdk8.put("getAttributesScope", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getScopes", new Class[] {});
+ methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class});
+ methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class});
+ methodsThatShouldExist_jdk8.put("wait", new Class[] {});
+ methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("toString", new Class[] {});
+ methodsThatShouldExist_jdk8.put("hashCode", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getClass", new Class[] {});
+ methodsThatShouldExist_jdk8.put("notify", new Class[] {});
+ methodsThatShouldExist_jdk8.put("notifyAll", new 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()) {
@@ -913,7 +1017,34 @@
methodsThatShouldExist_jdk7.put("removeAttribute", new Class[] {java.lang.String.class, int.class});
methodsThatShouldExist_jdk7.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class});
+ methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class});
+ methodsThatShouldExist_jdk8.put("getWriter", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setWriter", new Class[] {java.io.Writer.class});
+ methodsThatShouldExist_jdk8.put("getReader", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setReader", new Class[] {java.io.Reader.class});
+ methodsThatShouldExist_jdk8.put("getErrorWriter", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setErrorWriter", new Class[] {java.io.Writer.class});
+ methodsThatShouldExist_jdk8.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class});
+ methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class, int.class});
+ methodsThatShouldExist_jdk8.put("removeAttribute", new Class[] {java.lang.String.class, int.class});
+ methodsThatShouldExist_jdk8.put("getAttributesScope", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getScopes", new 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