/hg/rhino-tests: Fixed typos, minor refactoring: CompilableClass...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue Feb 19 00:29:28 PST 2013
changeset c93404c83a48 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c93404c83a48
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Feb 19 09:32:33 2013 +0100
Fixed typos, minor refactoring: CompilableClassTest.java,
InvocableClassTest.java and ScriptContextClassTest.java.
diffstat:
ChangeLog | 7 +++
src/org/RhinoTests/CompilableClassTest.java | 52 +++++++++++++++++--------
src/org/RhinoTests/InvocableClassTest.java | 52 +++++++++++++++++--------
src/org/RhinoTests/ScriptContextClassTest.java | 20 +++++++---
4 files changed, 91 insertions(+), 40 deletions(-)
diffs (344 lines):
diff -r 2c2c41e80104 -r c93404c83a48 ChangeLog
--- a/ChangeLog Mon Feb 18 09:28:18 2013 +0100
+++ b/ChangeLog Tue Feb 19 09:32:33 2013 +0100
@@ -1,3 +1,10 @@
+2013-02-19 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/CompilableClassTest.java:
+ * src/org/RhinoTests/InvocableClassTest.java:
+ * src/org/RhinoTests/ScriptContextClassTest.java:
+ Fixed typos, minor refactoring.
+
2013-02-18 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/CompilableClassTest.java:
diff -r 2c2c41e80104 -r c93404c83a48 src/org/RhinoTests/CompilableClassTest.java
--- a/src/org/RhinoTests/CompilableClassTest.java Mon Feb 18 09:28:18 2013 +0100
+++ b/src/org/RhinoTests/CompilableClassTest.java Tue Feb 19 09:32:33 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.compilableClass.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.Compilable.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.compilableClass.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.compilableClass.getField(fieldThatShouldExists);
String fieldName = field.getName();
@@ -479,12 +497,12 @@
*/
protected void testGetMethods() {
// following methods should be inherited
- final String[] methodsThatShouldExists_jdk6 = {
+ final String[] methodsThatShouldExist_jdk6 = {
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException",
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
};
- final String[] methodsThatShouldExists_jdk7 = {
+ final String[] methodsThatShouldExist_jdk7 = {
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException",
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
};
@@ -496,9 +514,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");
}
@@ -509,12 +527,12 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException",
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException",
"public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
};
@@ -526,9 +544,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");
}
diff -r 2c2c41e80104 -r c93404c83a48 src/org/RhinoTests/InvocableClassTest.java
--- a/src/org/RhinoTests/InvocableClassTest.java Mon Feb 18 09:28:18 2013 +0100
+++ b/src/org/RhinoTests/InvocableClassTest.java Tue Feb 19 09:32:33 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.invocableClass.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.Invocable.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.invocableClass.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.invocableClass.getField(fieldThatShouldExists);
String fieldName = field.getName();
@@ -452,14 +470,14 @@
*/
protected void testGetMethods() {
// following methods should be inherited
- final String[] methodsThatShouldExists_jdk6 = {
+ final String[] methodsThatShouldExist_jdk6 = {
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
"public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
};
- final String[] methodsThatShouldExists_jdk7 = {
+ final String[] methodsThatShouldExist_jdk7 = {
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
@@ -473,9 +491,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");
}
@@ -486,14 +504,14 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
"public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)",
"public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
@@ -507,9 +525,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");
}
diff -r 2c2c41e80104 -r c93404c83a48 src/org/RhinoTests/ScriptContextClassTest.java
--- a/src/org/RhinoTests/ScriptContextClassTest.java Mon Feb 18 09:28:18 2013 +0100
+++ b/src/org/RhinoTests/ScriptContextClassTest.java Tue Feb 19 09:32:33 2013 +0100
@@ -328,10 +328,18 @@
*/
protected void testGetFields() {
// following fields should exists
- final String[] fieldsThatShouldExists = {
+ final String[] fieldsThatShouldExist_jdk6 = {
"public static final int javax.script.ScriptContext.ENGINE_SCOPE",
"public static final int javax.script.ScriptContext.GLOBAL_SCOPE",
};
+ final String[] fieldsThatShouldExist_jdk7 = {
+ "public static final int javax.script.ScriptContext.ENGINE_SCOPE",
+ "public static final int javax.script.ScriptContext.GLOBAL_SCOPE",
+ };
+
+ // get the right array of field signatures
+ final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7;
+
// get all fields
Field[] fields = this.scriptContextClass.getFields();
// and transform the array into a list of field names
@@ -340,7 +348,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");
}
@@ -452,7 +460,7 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"public abstract int javax.script.ScriptContext.getAttributesScope(java.lang.String)",
"public abstract java.io.Reader javax.script.ScriptContext.getReader()",
"public abstract java.io.Writer javax.script.ScriptContext.getErrorWriter()",
@@ -469,7 +477,7 @@
"public abstract void javax.script.ScriptContext.setWriter(java.io.Writer)",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"public abstract int javax.script.ScriptContext.getAttributesScope(java.lang.String)",
"public abstract java.io.Reader javax.script.ScriptContext.getReader()",
"public abstract java.io.Writer javax.script.ScriptContext.getErrorWriter()",
@@ -493,9 +501,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