/hg/rhino-tests: Fixed two tests and added one new test into

[ptisnovs at icedtea.classpath.org]

changeset 969c6cb3cfb9 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=969c6cb3cfb9
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 07 11:17:33 2013 +0200

	Fixed two tests and added one new test into
	ScriptEngineManagerClassTest.


diffstat:

 ChangeLog                                            |   6 +++++
 src/org/RhinoTests/ScriptEngineManagerClassTest.java |  24 +++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r 63ab35ca019e -r 969c6cb3cfb9 ChangeLog
--- a/ChangeLog	Fri Oct 04 10:26:39 2013 +0200
+++ b/ChangeLog	Mon Oct 07 11:17:33 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+	Fixed two tests and added one new test into
+	ScriptEngineManagerClassTest.
+
 2013-10-04  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
diff -r 63ab35ca019e -r 969c6cb3cfb9 src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Fri Oct 04 10:26:39 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Mon Oct 07 11:17:33 2013 +0200
@@ -782,9 +782,6 @@
     protected void testGetDeclaredMethods() {
         // following methods should be declared
         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()",
             "private void javax.script.ScriptEngineManager.init(java.lang.ClassLoader)",
             "private void javax.script.ScriptEngineManager.initEngines(java.lang.ClassLoader)",
             "public java.lang.Object javax.script.ScriptEngineManager.get(java.lang.String)",
@@ -980,8 +977,6 @@
         Map<String, Class[]> methodsThatShouldExist_jdk6 = new TreeMap<String, Class[]>();
         methodsThatShouldExist_jdk6.put("get", new Class[] {java.lang.String.class});
         methodsThatShouldExist_jdk6.put("put", new Class[] {java.lang.String.class, java.lang.Object.class});
-        methodsThatShouldExist_jdk6.put("getCallerClassLoader", new Class[] {});
-        methodsThatShouldExist_jdk6.put("isAncestor", new Class[] {java.lang.ClassLoader.class, java.lang.ClassLoader.class});
         methodsThatShouldExist_jdk6.put("access$000", new Class[] {javax.script.ScriptEngineManager.class, java.lang.ClassLoader.class});
         methodsThatShouldExist_jdk6.put("init", new Class[] {java.lang.ClassLoader.class});
         methodsThatShouldExist_jdk6.put("setBindings", new Class[] {javax.script.Bindings.class});
@@ -994,7 +989,6 @@
         methodsThatShouldExist_jdk6.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
         methodsThatShouldExist_jdk6.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
         methodsThatShouldExist_jdk6.put("registerEngineExtension", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
-        methodsThatShouldExist_jdk6.put("canCallerAccessLoader", new Class[] {java.lang.ClassLoader.class});
 
         Map<String, Class[]> methodsThatShouldExist_jdk7 = new TreeMap<String, Class[]>();
         methodsThatShouldExist_jdk7.put("get", new Class[] {java.lang.String.class});
@@ -1322,6 +1316,24 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineManager.getClass().newInstance()
+     */
+    protected void testNewInstance() {
+        try {
+            Object o = this.scriptEngineManagerClass.newInstance();
+        }
+        catch (InstantiationException e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.ScriptEngineManager
      */
     @SuppressWarnings("cast")