Mercurial > hg > rhino-tests
changeset 55:a9ef7cd38b16 draft
Make the test src/org/RhinoTests/SimpleBindingsClassTest.java compatible with JDK 7.
author | Pavel Tisnovsky <ptisnovs@redhat.com> |
---|---|
date | Wed, 17 Oct 2012 15:03:26 +0200 |
parents | 0a793f171324 |
children | bff3d4a426f4 |
files | ChangeLog src/org/RhinoTests/SimpleBindingsClassTest.java |
diffstat | 2 files changed, 47 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 16 13:13:13 2012 +0200 +++ b/ChangeLog Wed Oct 17 15:03:26 2012 +0200 @@ -1,3 +1,8 @@ +2012-10-17 Pavel Tisnovsky <ptisnovs@redhat.com> + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Make this test compatible with JDK 7. + 2012-10-16 Pavel Tisnovsky <ptisnovs@redhat.com> * src/org/RhinoTests/ScriptContextClassTest.java:
--- a/src/org/RhinoTests/SimpleBindingsClassTest.java Tue Oct 16 13:13:13 2012 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Wed Oct 17 15:03:26 2012 +0200 @@ -278,6 +278,9 @@ Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>(); Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>(); + testedConstructors_jdk6.put("public javax.script.SimpleBindings(java.util.Map)", "javax.script.SimpleBindings"); + testedConstructors_jdk6.put("public javax.script.SimpleBindings()", "javax.script.SimpleBindings"); + testedConstructors_jdk7.put("public javax.script.SimpleBindings(java.util.Map)", "javax.script.SimpleBindings"); testedConstructors_jdk7.put("public javax.script.SimpleBindings()", "javax.script.SimpleBindings"); @@ -308,6 +311,9 @@ Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>(); Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>(); + testedConstructors_jdk6.put("public javax.script.SimpleBindings(java.util.Map)", "javax.script.SimpleBindings"); + testedConstructors_jdk6.put("public javax.script.SimpleBindings()", "javax.script.SimpleBindings"); + testedConstructors_jdk7.put("public javax.script.SimpleBindings(java.util.Map)", "javax.script.SimpleBindings"); testedConstructors_jdk7.put("public javax.script.SimpleBindings()", "javax.script.SimpleBindings"); @@ -378,6 +384,28 @@ protected void testGetMethods() { // following methods should be inherited final String[] methodsThatShouldExists_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)", + "public boolean javax.script.SimpleBindings.isEmpty()", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public int javax.script.SimpleBindings.size()", + "public java.lang.Object javax.script.SimpleBindings.get(java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.Object,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.String,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.remove(java.lang.Object)", + "public java.lang.String java.lang.Object.toString()", + "public java.util.Collection javax.script.SimpleBindings.values()", + "public java.util.Set javax.script.SimpleBindings.entrySet()", + "public java.util.Set javax.script.SimpleBindings.keySet()", + "public native int java.lang.Object.hashCode()", + "public void javax.script.SimpleBindings.clear()", + "public void javax.script.SimpleBindings.putAll(java.util.Map)", }; final String[] methodsThatShouldExists_jdk7 = { @@ -414,22 +442,6 @@ } String[] methodsThatShouldExists = getJavaVersion() < 7 ? methodsThatShouldExists_jdk6 : methodsThatShouldExists_jdk7; // check if all required methods really exists - Constructor<?>[] constructors = this.simpleBindingsClass.getDeclaredConstructors(); - assertEquals(constructors.length, 2, "only 2 constructors should be set"); - String constructorName; - String constructorString; - constructorName = constructors[0].getName(); - constructorString = constructors[0].toString(); - assertEquals(constructorName, "javax.script.SimpleBindings", - "wrong constructor name " + constructorName); - assertEquals(constructorString, "public javax.script.SimpleBindings(java.util.Map)", - "wrong constructor.toString() " + constructorName); - constructorName = constructors[1].getName(); - constructorString = constructors[1].toString(); - assertEquals(constructorName, "javax.script.SimpleBindings", - "wrong constructor name " + constructorName); - assertEquals(constructorString, "public javax.script.SimpleBindings()", - "wrong constructor.toString() " + constructorName); for (String methodThatShouldExists : methodsThatShouldExists) { assertTrue(methodsAsString.contains(methodThatShouldExists), "method " + methodThatShouldExists + " not found"); @@ -442,6 +454,20 @@ protected void testGetDeclaredMethods() { // following methods should be declared final String[] declaredMethodsThatShouldExists_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)", + "public boolean javax.script.SimpleBindings.isEmpty()", + "public int javax.script.SimpleBindings.size()", + "public java.lang.Object javax.script.SimpleBindings.get(java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.Object,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.String,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.remove(java.lang.Object)", + "public java.util.Collection javax.script.SimpleBindings.values()", + "public java.util.Set javax.script.SimpleBindings.entrySet()", + "public java.util.Set javax.script.SimpleBindings.keySet()", + "public void javax.script.SimpleBindings.clear()", + "public void javax.script.SimpleBindings.putAll(java.util.Map)", }; final String[] declaredMethodsThatShouldExists_jdk7 = {