/hg/rhino-tests: Corrected various typos in two test suites:
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Mar 29 02:46:14 PDT 2013
changeset 2e897a757331 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=2e897a757331
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Mar 29 10:49:24 2013 +0100
Corrected various typos in two test suites:
ScriptEngineManagerClassTest and SimpleBindingsClassTest.
diffstat:
ChangeLog | 7 ++++
src/org/RhinoTests/ScriptEngineManagerClassTest.java | 35 +++++++++++++------
src/org/RhinoTests/SimpleBindingsClassTest.java | 16 ++++----
3 files changed, 38 insertions(+), 20 deletions(-)
diffs (183 lines):
diff -r d5fa3238778f -r 2e897a757331 ChangeLog
--- a/ChangeLog Thu Mar 28 11:16:35 2013 +0100
+++ b/ChangeLog Fri Mar 29 10:49:24 2013 +0100
@@ -1,3 +1,10 @@
+2013-03-29 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+ * src/org/RhinoTests/SimpleBindingsClassTest.java:
+ Corrected various typos in two test suites:
+ ScriptEngineManagerClassTest and SimpleBindingsClassTest.
+
2013-03-28 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
diff -r d5fa3238778f -r 2e897a757331 src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Thu Mar 28 11:16:35 2013 +0100
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Fri Mar 29 10:49:24 2013 +0100
@@ -419,8 +419,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.scriptEngineManagerClass.getFields();
// and transform the array into a list of field names
@@ -429,7 +435,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");
}
@@ -467,10 +473,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.scriptEngineManagerClass.getField(fieldThatShouldExists);
String fieldName = field.getName();
@@ -489,7 +500,7 @@
*/
protected void testGetMethods() {
// following methods should be inherited
- final String[] methodsThatShouldExists_jdk6 = {
+ final String[] methodsThatShouldExist_jdk6 = {
"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()",
@@ -512,7 +523,7 @@
"public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)",
};
- final String[] methodsThatShouldExists_jdk7 = {
+ final String[] methodsThatShouldExist_jdk7 = {
"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()",
@@ -542,9 +553,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");
}
@@ -555,7 +566,7 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"private boolean javax.script.ScriptEngineManager.canCallerAccessLoader(java.lang.ClassLoader)",
"private boolean javax.script.ScriptEngineManager.isAncestor(java.lang.ClassLoader,java.lang.ClassLoader)",
"private java.lang.ClassLoader javax.script.ScriptEngineManager.getCallerClassLoader()",
@@ -575,7 +586,7 @@
"static void javax.script.ScriptEngineManager.access$000(javax.script.ScriptEngineManager,java.lang.ClassLoader)",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"private boolean javax.script.ScriptEngineManager.canCallerAccessLoader(java.lang.ClassLoader)",
"private boolean javax.script.ScriptEngineManager.isAncestor(java.lang.ClassLoader,java.lang.ClassLoader)",
"private java.lang.ClassLoader javax.script.ScriptEngineManager.getCallerClassLoader()",
@@ -602,9 +613,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 d5fa3238778f -r 2e897a757331 src/org/RhinoTests/SimpleBindingsClassTest.java
--- a/src/org/RhinoTests/SimpleBindingsClassTest.java Thu Mar 28 11:16:35 2013 +0100
+++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Fri Mar 29 10:49:24 2013 +0100
@@ -532,7 +532,7 @@
*/
protected void testGetMethods() {
// following methods should be inherited
- final String[] methodsThatShouldExists_jdk6 = {
+ final String[] methodsThatShouldExist_jdk6 = {
"public boolean java.lang.Object.equals(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsKey(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsValue(java.lang.Object)",
@@ -557,7 +557,7 @@
"public void javax.script.SimpleBindings.putAll(java.util.Map)",
};
- final String[] methodsThatShouldExists_jdk7 = {
+ final String[] methodsThatShouldExist_jdk7 = {
"public boolean java.lang.Object.equals(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsKey(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsValue(java.lang.Object)",
@@ -589,9 +589,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");
}
@@ -602,7 +602,7 @@
*/
protected void testGetDeclaredMethods() {
// following methods should be declared
- final String[] declaredMethodsThatShouldExists_jdk6 = {
+ final String[] declaredMethodsThatShouldExist_jdk6 = {
"private void javax.script.SimpleBindings.checkKey(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsKey(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsValue(java.lang.Object)",
@@ -619,7 +619,7 @@
"public void javax.script.SimpleBindings.putAll(java.util.Map)",
};
- final String[] declaredMethodsThatShouldExists_jdk7 = {
+ final String[] declaredMethodsThatShouldExist_jdk7 = {
"private void javax.script.SimpleBindings.checkKey(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsKey(java.lang.Object)",
"public boolean javax.script.SimpleBindings.containsValue(java.lang.Object)",
@@ -643,9 +643,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