/hg/rhino-tests: Added new tests: getField() and getDeclaredFiel...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Mar 15 01:55:10 PDT 2013
changeset 7ea64ea424ed in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7ea64ea424ed
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Mar 15 09:58:16 2013 +0100
Added new tests: getField() and getDeclaredField() into
CompiledScriptClassTest. Added new tests: getCanonicalName(), getConstructor() and
getDeclaredConstructor() into ScriptEngineFactoryClassTest.
diffstat:
ChangeLog | 9 ++
src/org/RhinoTests/CompiledScriptClassTest.java | 53 ++++++++++++++
src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 72 +++++++++++++++++++-
3 files changed, 133 insertions(+), 1 deletions(-)
diffs (182 lines):
diff -r b6f84ad71660 -r 7ea64ea424ed ChangeLog
--- a/ChangeLog Thu Mar 14 11:12:10 2013 +0100
+++ b/ChangeLog Fri Mar 15 09:58:16 2013 +0100
@@ -1,3 +1,12 @@
+2013-03-15 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/CompiledScriptClassTest.java:
+ Added new tests: getField() and getDeclaredField() into
+ CompiledScriptClassTest.
+ * src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
+ Added new tests: getCanonicalName(), getConstructor() and
+ getDeclaredConstructor() into ScriptEngineFactoryClassTest.
+
2013-03-14 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/SimpleBindingsClassTest.java:
diff -r b6f84ad71660 -r 7ea64ea424ed src/org/RhinoTests/CompiledScriptClassTest.java
--- a/src/org/RhinoTests/CompiledScriptClassTest.java Thu Mar 14 11:12:10 2013 +0100
+++ b/src/org/RhinoTests/CompiledScriptClassTest.java Fri Mar 15 09:58:16 2013 +0100
@@ -515,6 +515,59 @@
}
}
+ /**
+ * Test for method javax.script.CompiledScript.getClass().getField()
+ */
+ protected void testGetField() {
+ // following fields should exists
+ 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 : fieldsThatShouldExist) {
+ try {
+ Field field = this.compiledScriptClass.getField(fieldThatShouldExists);
+ String fieldName = field.getName();
+ assertTrue(fieldName.equals(fieldThatShouldExists),
+ "field " + fieldThatShouldExists + " not found");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ throw new AssertionError(e.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Test for method javax.script.CompiledScript.getClass().getDeclaredField()
+ */
+ protected void testGetDeclaredField() {
+ // following declared fields should exists
+ final String[] declaredFieldsThatShouldExist_jdk6 = {
+ };
+ final String[] declaredFieldsThatShouldExist_jdk7 = {
+ };
+
+ final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7;
+
+ // check if all required declared fields really exists
+ for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) {
+ try {
+ Field field = this.compiledScriptClass.getDeclaredField(declaredFieldThatShouldExists);
+ String fieldName = field.getName();
+ assertTrue(fieldName.equals(declaredFieldThatShouldExists),
+ "field " + declaredFieldThatShouldExists + " not found");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ throw new AssertionError(e.getMessage());
+ }
+ }
+ }
/**
* Test for method javax.script.CompiledScript.getClass().getMethods()
diff -r b6f84ad71660 -r 7ea64ea424ed src/org/RhinoTests/ScriptEngineFactoryClassTest.java
--- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Thu Mar 14 11:12:10 2013 +0100
+++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Fri Mar 15 09:58:16 2013 +0100
@@ -1,7 +1,7 @@
/*
Rhino test framework
- Copyright (C) 2011, 2012 Red Hat
+ Copyright (C) 2011, 2012, 2013 Red Hat
This file is part of IcedTea.
@@ -45,6 +45,7 @@
import java.util.List;
import java.util.Map;
import java.util.HashMap;
+import java.util.TreeMap;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
@@ -261,6 +262,15 @@
}
/**
+ * Test for method javax.script.ScriptEngineFactory.getClass().getCanonicalName()
+ */
+ protected void testGetCanonicalName() {
+ String canonicalName = this.scriptEngineFactoryClass.getCanonicalName();
+ assertEquals(canonicalName, "javax.script.ScriptEngineFactory",
+ "Method javax.script.ScriptEngineFactory.getClass().getCanonicalName() returns wrong value " + canonicalName);
+ }
+
+ /**
* Test for method javax.script.ScriptEngineFactory.getClass().getSuperclass()
*/
protected void testGetSuperclass() {
@@ -314,6 +324,66 @@
}
/**
+ * Test for method javax.script.ScriptEngineFactory.getClass().getConstructor()
+ */
+ protected void testGetConstructor() {
+ // following constructors should exist
+ Map<String, Class[]> constructorsThatShouldExist_jdk6 = new TreeMap<String, Class[]>();
+
+ Map<String, Class[]> constructorsThatShouldExist_jdk7 = new TreeMap<String, Class[]>();
+
+ Map<String, Class[]> constructorsThatShouldExist = getJavaVersion() < 7 ? constructorsThatShouldExist_jdk6 : constructorsThatShouldExist_jdk7;
+
+ // check if all required constructors really exist
+ for (Map.Entry<String, Class[]> constructorThatShouldExists : constructorsThatShouldExist.entrySet()) {
+ try {
+ Constructor constructor = this.scriptEngineFactoryClass.getConstructor(constructorThatShouldExists.getValue());
+ assertNotNull(constructor,
+ "constructor " + constructorThatShouldExists.getKey() + " not found");
+ String constructorName = constructor.getName();
+ assertNotNull(constructorName,
+ "constructor " + constructorThatShouldExists.getKey() + " does not have name assigned");
+ assertTrue(constructorName.equals(constructorThatShouldExists.getKey()),
+ "constructor " + constructorThatShouldExists.getKey() + " not found");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ throw new AssertionError(e.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Test for method javax.script.ScriptEngineFactory.getClass().getDeclaredConstructor()
+ */
+ protected void testGetDeclaredConstructor() {
+ // following constructors should exist
+ Map<String, Class[]> constructorsThatShouldExist_jdk6 = new TreeMap<String, Class[]>();
+
+ Map<String, Class[]> constructorsThatShouldExist_jdk7 = new TreeMap<String, Class[]>();
+
+ Map<String, Class[]> constructorsThatShouldExist = getJavaVersion() < 7 ? constructorsThatShouldExist_jdk6 : constructorsThatShouldExist_jdk7;
+
+ // check if all required constructors really exist
+ for (Map.Entry<String, Class[]> constructorThatShouldExists : constructorsThatShouldExist.entrySet()) {
+ try {
+ Constructor constructor = this.scriptEngineFactoryClass.getDeclaredConstructor(constructorThatShouldExists.getValue());
+ assertNotNull(constructor,
+ "constructor " + constructorThatShouldExists.getKey() + " not found");
+ String constructorName = constructor.getName();
+ assertNotNull(constructorName,
+ "constructor " + constructorThatShouldExists.getKey() + " does not have name assigned");
+ assertTrue(constructorName.equals(constructorThatShouldExists.getKey()),
+ "constructor " + constructorThatShouldExists.getKey() + " not found");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ throw new AssertionError(e.getMessage());
+ }
+ }
+ }
+
+ /**
* Test for method javax.script.ScriptEngineFactory.getClass().getFields()
*/
protected void testGetFields() {
More information about the distro-pkg-dev
mailing list