/hg/rhino-tests: Updated CompiledScriptClassTest to works correc...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon Mar 11 01:57:18 PDT 2013
changeset 9282fedae49b in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=9282fedae49b
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Mar 11 10:00:23 2013 +0100
Updated CompiledScriptClassTest to works correctly with JDK6 and JDK7 too.
diffstat:
ChangeLog | 9 +++-
src/org/RhinoTests/CompiledScriptClassTest.java | 44 ++++++++++++++++--------
2 files changed, 36 insertions(+), 17 deletions(-)
diffs (142 lines):
diff -r f037ba60f477 -r 9282fedae49b ChangeLog
--- a/ChangeLog Fri Mar 08 09:52:25 2013 +0100
+++ b/ChangeLog Mon Mar 11 10:00:23 2013 +0100
@@ -1,10 +1,15 @@
-2013-03-09 Pavel Tisnovsky <ptisnovs at redhat.com>
+2013-03-11 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/CompiledScriptClassTest.java:
+ Updated CompiledScriptClassTest to works correctly with JDK6 and JDK7 too.
+
+2013-03-08 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/SimpleScriptContextClassTest.java:
Added new test into the SimpleScriptContextClassTest.
Updated other two tests to work correctly in JDK6 and JDK7.
-2013-03-08 Pavel Tisnovsky <ptisnovs at redhat.com>
+2013-03-07 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/BindingsTest.java:
Added test class deleted by a mistake.
diff -r f037ba60f477 -r 9282fedae49b src/org/RhinoTests/CompiledScriptClassTest.java
--- a/src/org/RhinoTests/CompiledScriptClassTest.java Fri Mar 08 09:52:25 2013 +0100
+++ b/src/org/RhinoTests/CompiledScriptClassTest.java Mon Mar 11 10:00:23 2013 +0100
@@ -465,8 +465,14 @@
*/
protected void testGetFields() {
// following fields should exists
- final String[] fieldsThatShouldExists = {
+ final String[] fieldsThatShouldExist_jdk6 = {
};
+ final String[] fieldsThatShouldExist_jdk7 = {
+ };
+
+ // get the right array of field signatures
+ final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7;
+
// get all fields
Field[] fields = this.compiledScriptClass.getFields();
// and transform the array into a list of field names
@@ -475,7 +481,7 @@
fieldsAsString.add(field.toString());
}
// check if all required fields really exists
- for (String fieldThatShouldExists : fieldsThatShouldExists) {
+ for (String fieldThatShouldExists : fieldsThatShouldExist) {
assertTrue(fieldsAsString.contains(fieldThatShouldExists),
"field " + fieldThatShouldExists + " not found");
}
@@ -485,9 +491,16 @@
* Test for method javax.script.CompiledScript.getClass().getDeclaredFields()
*/
protected void testGetDeclaredFields() {
+ // following declared fields should exists
+ final String[] declaredFieldsThatShouldExist_jdk6 = {
+ };
+ final String[] declaredFieldsThatShouldExist_jdk7 = {
+ };
+
+ // get the right array of field signatures
// following fields should be declared
- final String[] fieldsThatShouldExists = {
- };
+ final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7;
+
// get all declared fields
Field[] declaredFields = this.compiledScriptClass.getDeclaredFields();
// and transform the array into a list of field names
@@ -496,18 +509,19 @@
declaredFieldsAsString.add(field.toString());
}
// check if all required fields really exists
- for (String fieldThatShouldExists : fieldsThatShouldExists) {
- assertTrue(declaredFieldsAsString.contains(fieldThatShouldExists),
- "field " + fieldThatShouldExists + " not found");
+ for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) {
+ assertTrue(declaredFieldsAsString.contains(declaredFieldThatShouldExists),
+ "field " + declaredFieldThatShouldExists + " not found");
}
}
+
/**
* Test for method javax.script.CompiledScript.getClass().getMethods()
*/
protected void testGetMethods() {
// following methods should be inherited
- final String[] methodsThatShouldExists_jdk6 = {
+ final String[] methodsThatShouldExist_jdk6 = {
"public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException",
"public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()",
"public boolean java.lang.Object.equals(java.lang.Object)",
@@ -523,7 +537,7 @@
"public native int java.lang.Object.hashCode()",
};
- final String[] methodsThatShouldExists_jdk7 = {
+ final String[] methodsThatShouldExist_jdk7 = {
"public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException",
"public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()",
"public boolean java.lang.Object.equals(java.lang.Object)",
@@ -546,9 +560,9 @@
for (Method method : methods) {
methodsAsString.add(method.toString());
}
- String[] methodsThatShouldExists = getJavaVersion() < 7 ? methodsThatShouldExists_jdk6 : methodsThatShouldExists_jdk7;
+ String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
// check if all required methods really exists
- for (String methodThatShouldExists : methodsThatShouldExists) {
+ for (String methodThatShouldExists : methodsThatShouldExist) {
assertTrue(methodsAsString.contains(methodThatShouldExists),
"method " + methodThatShouldExists + " not found");
}
@@ -559,14 +573,14 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException",
"public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()",
"public java.lang.Object javax.script.CompiledScript.eval() throws javax.script.ScriptException",
"public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException",
"public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()",
"public java.lang.Object javax.script.CompiledScript.eval() throws javax.script.ScriptException",
@@ -580,9 +594,9 @@
for (Method method : declaredMethods) {
methodsAsString.add(method.toString());
}
- String[] declaredMethodsThatShouldExists = getJavaVersion() < 7 ? declaredMethodsThatShouldExists_jdk6 : declaredMethodsThatShouldExists_jdk7;
+ String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7;
// check if all required methods really exists
- for (String methodThatShouldExists : declaredMethodsThatShouldExists) {
+ for (String methodThatShouldExists : declaredMethodsThatShouldExist) {
assertTrue(methodsAsString.contains(methodThatShouldExists),
"declared method " + methodThatShouldExists + " not found");
}
More information about the distro-pkg-dev
mailing list