/hg/rhino-tests: Updated ScriptContextClassTest to works correct...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu Mar 28 03:13:30 PDT 2013
changeset d5fa3238778f in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d5fa3238778f
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Mar 28 11:16:35 2013 +0100
Updated ScriptContextClassTest to works correctly with JDK6 and JDK7 too.
diffstat:
ChangeLog | 5 +
src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 52 +++++++++++++------
2 files changed, 40 insertions(+), 17 deletions(-)
diffs (150 lines):
diff -r 17efcaa18b1d -r d5fa3238778f ChangeLog
--- a/ChangeLog Wed Mar 27 09:43:44 2013 +0100
+++ b/ChangeLog Thu Mar 28 11:16:35 2013 +0100
@@ -1,3 +1,8 @@
+2013-03-28 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
+ Updated ScriptContextClassTest to works correctly with JDK6 and JDK7 too.
+
2013-03-27 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/CompiledScriptClassTest.java:
diff -r 17efcaa18b1d -r d5fa3238778f src/org/RhinoTests/ScriptEngineFactoryClassTest.java
--- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Wed Mar 27 09:43:44 2013 +0100
+++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Thu Mar 28 11:16:35 2013 +0100
@@ -388,8 +388,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.scriptEngineFactoryClass.getFields();
// and transform the array into a list of field names
@@ -398,7 +404,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");
}
@@ -408,9 +414,16 @@
* Test for method javax.script.ScriptEngineFactory.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.scriptEngineFactoryClass.getDeclaredFields();
// and transform the array into a list of field names
@@ -419,9 +432,9 @@
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");
}
}
@@ -430,10 +443,15 @@
*/
protected void testGetField() {
// following fields should exists
- final String[] fieldsThatShouldExists = {
+ final String[] fieldsThatShouldExist_jdk6 = {
};
+ final String[] fieldsThatShouldExist_jdk7 = {
+ };
+
+ final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7;
+
// check if all required fields really exists
- for (String fieldThatShouldExists : fieldsThatShouldExists) {
+ for (String fieldThatShouldExists : fieldsThatShouldExist) {
try {
Field field = this.scriptEngineFactoryClass.getField(fieldThatShouldExists);
String fieldName = field.getName();
@@ -452,7 +470,7 @@
*/
protected void testGetMethods() {
// following methods should be inherited
- final String[] methodsThatShouldExists_jdk6 = {
+ final String[] methodsThatShouldExist_jdk6 = {
"public abstract java.lang.Object javax.script.ScriptEngineFactory.getParameter(java.lang.String)",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineName()",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineVersion()",
@@ -467,7 +485,7 @@
"public abstract javax.script.ScriptEngine javax.script.ScriptEngineFactory.getScriptEngine()",
};
- final String[] methodsThatShouldExists_jdk7 = {
+ final String[] methodsThatShouldExist_jdk7 = {
"public abstract java.lang.Object javax.script.ScriptEngineFactory.getParameter(java.lang.String)",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineName()",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineVersion()",
@@ -489,9 +507,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");
}
@@ -502,7 +520,7 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"public abstract java.lang.Object javax.script.ScriptEngineFactory.getParameter(java.lang.String)",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineName()",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineVersion()",
@@ -517,7 +535,7 @@
"public abstract javax.script.ScriptEngine javax.script.ScriptEngineFactory.getScriptEngine()",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"public abstract java.lang.Object javax.script.ScriptEngineFactory.getParameter(java.lang.String)",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineName()",
"public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineVersion()",
@@ -539,9 +557,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