OpenJDK / jdk / hs
changeset 29832:eed75e14d198
8076972: Several nashorn tests failing
Reviewed-by: lagergren, jlaskey
line wrap: on
line diff
--- a/nashorn/make/build.xml Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/make/build.xml Tue Apr 07 00:13:18 2015 +0530 @@ -402,14 +402,14 @@ <!-- only to be invoked as dependency of "test" target --> <target name="-test-classes-all" depends="jar" unless="test.class"> <fileset id="test.classes" dir="${build.test.classes.dir}"> - <include name="**/api/javaaccess/*Test.class"/> - <include name="**/api/scripting/*Test.class"/> - <include name="**/api/tree/*Test.class"/> - <include name="**/codegen/*Test.class"/> - <include name="**/parser/*Test.class"/> - <include name="**/runtime/*Test.class"/> - <include name="**/runtime/regexp/*Test.class"/> - <include name="**/runtime/regexp/joni/*Test.class"/> + <include name="**/api/javaaccess/test/*Test.class"/> + <include name="**/api/scripting/test/*Test.class"/> + <include name="**/api/tree/test/*Test.class"/> + <include name="**/codegen/test/*Test.class"/> + <include name="**/parser/test/*Test.class"/> + <include name="**/runtime/test/*Test.class"/> + <include name="**/runtime/regexp/test/*Test.class"/> + <include name="**/runtime/regexp/joni/test/*Test.class"/> <include name="**/framework/*Test.class"/> </fileset> </target>
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -38,8 +38,8 @@ /** * @test - * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.BooleanAccessTest - * @run testng/othervm jdk.nashorn.api.javaaccess.BooleanAccessTest + * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.BooleanAccessTest + * @run testng/othervm jdk.nashorn.api.javaaccess.test.BooleanAccessTest */ @SuppressWarnings("javadoc") public class BooleanAccessTest { @@ -57,7 +57,7 @@ e = m.getEngineByName("nashorn"); o = new SharedObject(); e.put("o", o); - e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;"); + e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;"); } @AfterClass
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -41,8 +41,8 @@ /** * @test - * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.MethodAccessTest - * @run testng/othervm jdk.nashorn.api.javaaccess.MethodAccessTest + * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.MethodAccessTest + * @run testng/othervm jdk.nashorn.api.javaaccess.test.MethodAccessTest */ @SuppressWarnings("javadoc") public class MethodAccessTest { @@ -61,8 +61,8 @@ o = new SharedObject(); o.setEngine(e); e.put("o", o); - e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;"); - e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.Person;"); + e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;"); + e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.test.Person;"); } @AfterClass @@ -338,13 +338,13 @@ @Test public void accessDefaultConstructor() throws ScriptException { - e.eval("var dc = new Packages.jdk.nashorn.api.javaaccess.Person()"); + e.eval("var dc = new Packages.jdk.nashorn.api.javaaccess.test.Person()"); assertEquals(new Person(), e.get("dc")); } @Test public void accessCustomConstructor() throws ScriptException { - e.eval("var cc = new Packages.jdk.nashorn.api.javaaccess.Person(17)"); + e.eval("var cc = new Packages.jdk.nashorn.api.javaaccess.test.Person(17)"); assertEquals(new Person(17), e.get("cc")); }
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -38,8 +38,8 @@ /** * @test - * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.NumberAccessTest - * @run testng/othervm jdk.nashorn.api.javaaccess.NumberAccessTest + * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.NumberAccessTest + * @run testng/othervm jdk.nashorn.api.javaaccess.test.NumberAccessTest */ @SuppressWarnings("javadoc") public class NumberAccessTest { @@ -57,7 +57,7 @@ e = m.getEngineByName("nashorn"); o = new SharedObject(); e.put("o", o); - e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;"); + e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;"); } @AfterClass
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -37,8 +37,8 @@ /** * @test - * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.NumberBoxingTest - * @run testng/othervm jdk.nashorn.api.javaaccess.NumberBoxingTest + * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.NumberBoxingTest + * @run testng/othervm jdk.nashorn.api.javaaccess.test.NumberBoxingTest */ @SuppressWarnings("javadoc") public class NumberBoxingTest { @@ -56,7 +56,7 @@ e = m.getEngineByName("nashorn"); o = new SharedObject(); e.put("o", o); - e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;"); + e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;"); } @AfterClass
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -37,8 +37,8 @@ /** * @test - * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.ObjectAccessTest - * @run testng/othervm jdk.nashorn.api.javaaccess.ObjectAccessTest + * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.ObjectAccessTest + * @run testng/othervm jdk.nashorn.api.javaaccess.test.ObjectAccessTest */ @SuppressWarnings("javadoc") public class ObjectAccessTest { @@ -56,8 +56,8 @@ e = m.getEngineByName("nashorn"); o = new SharedObject(); e.put("o", o); - e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;"); - e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.Person;"); + e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;"); + e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.test.Person;"); } @AfterClass @@ -80,7 +80,7 @@ e.eval("var p_object_array = o.publicObjectArray;"); assertEquals(o.publicObjectArray[0], e.eval("o.publicObjectArray[0]")); assertArrayEquals(o.publicObjectArray, (Object[])e.get("p_object_array")); - e.eval("var t_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + + e.eval("var t_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" + "t_object_arr[0] = new Person(100);" + "t_object_arr[1] = new Person(120);" + "t_object_arr[2] = new Person(140);" + @@ -104,7 +104,7 @@ e.eval("var ps_object_array = SharedObject.publicStaticObjectArray;"); assertEquals(SharedObject.publicStaticObjectArray[0], e.eval("SharedObject.publicStaticObjectArray[0]")); assertArrayEquals(SharedObject.publicStaticObjectArray, (Object[])e.get("ps_object_array")); - e.eval("var ts_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + + e.eval("var ts_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" + "ts_object_arr[0] = new Person(100);" + "ts_object_arr[1] = new Person(120);" + "ts_object_arr[2] = new Person(140);" + @@ -128,7 +128,7 @@ e.eval("var pf_object_array = o.publicFinalObjectArray;"); assertEquals(o.publicFinalObjectArray[0], e.eval("o.publicFinalObjectArray[0]")); assertArrayEquals(o.publicFinalObjectArray, (Object[])e.get("pf_object_array")); - e.eval("var tf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + + e.eval("var tf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" + "tf_object_arr[0] = new Person(100);" + "tf_object_arr[1] = new Person(120);" + "tf_object_arr[2] = new Person(140);" + @@ -152,7 +152,7 @@ e.eval("var psf_object_array = SharedObject.publicStaticFinalObjectArray;"); assertEquals(SharedObject.publicStaticFinalObjectArray[0], e.eval("SharedObject.publicStaticFinalObjectArray[0]")); assertArrayEquals(SharedObject.publicStaticFinalObjectArray, (Object[])e.get("psf_object_array")); - e.eval("var tsf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + + e.eval("var tsf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" + "tsf_object_arr[0] = new Person(100);" + "tsf_object_arr[1] = new Person(120);" + "tsf_object_arr[2] = new Person(140);" +
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -37,8 +37,8 @@ /** * @test - * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.StringAccessTest - * @run testng/othervm jdk.nashorn.api.javaaccess.StringAccessTest + * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.StringAccessTest + * @run testng/othervm jdk.nashorn.api.javaaccess.test.StringAccessTest */ @SuppressWarnings("javadoc") public class StringAccessTest { @@ -56,7 +56,7 @@ e = m.getEngineByName("nashorn"); o = new SharedObject(); e.put("o", o); - e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;"); + e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;"); } @AfterClass
--- a/nashorn/test/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -35,7 +35,7 @@ * independently. * * @test - * @run testng jdk.nashorn.api.scripting.MultipleEngineTest + * @run testng jdk.nashorn.api.scripting.test.MultipleEngineTest */ @SuppressWarnings("javadoc") public class MultipleEngineTest {
--- a/nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -58,8 +58,8 @@ * Tests for JSR-223 script engine for Nashorn. * * @test - * @build jdk.nashorn.api.scripting.Window jdk.nashorn.api.scripting.WindowEventHandler jdk.nashorn.api.scripting.VariableArityTestInterface jdk.nashorn.api.scripting.ScriptEngineTest - * @run testng/othervm jdk.nashorn.api.scripting.ScriptEngineTest + * @build jdk.nashorn.api.scripting.test.Window jdk.nashorn.api.scripting.test.WindowEventHandler jdk.nashorn.api.scripting.test.VariableArityTestInterface jdk.nashorn.api.scripting.test.ScriptEngineTest + * @run testng/othervm jdk.nashorn.api.scripting.test.ScriptEngineTest */ @SuppressWarnings("javadoc") public class ScriptEngineTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -32,7 +32,7 @@ * Joni coverage tests * * @test - * @run testng jdk.nashorn.internal.runtime.regexp.joni.JoniTest + * @run testng jdk.nashorn.internal.runtime.regexp.joni.test.JoniTest */ @SuppressWarnings("javadoc") public class JoniTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -38,7 +38,7 @@ * Basic tests for the JDK based RegExp implementation. * * @test - * @run testng jdk.nashorn.internal.runtime.regexp.JdkRegExpTest + * @run testng jdk.nashorn.internal.runtime.regexp.test.JdkRegExpTest */ public class JdkRegExpTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -38,10 +38,11 @@ import org.testng.annotations.Test; /** + * @ignore Fails with jtreg, but passes with ant test run. Ignore for now. * @test * @bug 8039185 8039403 * @summary Test for persistent code cache and path handling - * @run testng jdk.nashorn.internal.runtime.CodeStoreAndPathTest + * @run testng jdk.nashorn.internal.runtime.test.CodeStoreAndPathTest */ @SuppressWarnings("javadoc") public class CodeStoreAndPathTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -34,7 +34,7 @@ * Tests for JSType methods. * * @test - * @run testng jdk.nashorn.internal.runtime.ConsStringTest + * @run testng jdk.nashorn.internal.runtime.test.ConsStringTest */ public class ConsStringTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ContextTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/ContextTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -44,7 +44,7 @@ * Basic Context API tests. * * @test - * @run testng jdk.nashorn.internal.runtime.ContextTest + * @run testng jdk.nashorn.internal.runtime.test.ContextTest */ @SuppressWarnings("javadoc") public class ContextTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java Tue Apr 07 00:13:18 2015 +0530 @@ -42,7 +42,7 @@ * JDK-8044518: Ensure exceptions related to optimistic recompilation are not serializable * * @test - * @run testng jdk.nashorn.internal.runtime.ExceptionsNotSerializable + * @run testng jdk.nashorn.internal.runtime.test.ExceptionsNotSerializable */ @SuppressWarnings("javadoc") public class ExceptionsNotSerializable {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -37,7 +37,7 @@ * Tests for JSType methods. * * @test - * @run testng jdk.nashorn.internal.runtime.JSTypeTest + * @run testng jdk.nashorn.internal.runtime.test.JSTypeTest */ public class JSTypeTest { /**
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -40,7 +40,7 @@ * Top-level lexical binding tests. * * @test - * @run testng jdk.nashorn.internal.runtime.LexicalBindingTest + * @run testng jdk.nashorn.internal.runtime.test.LexicalBindingTest */ @SuppressWarnings("javadoc") public class LexicalBindingTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -43,7 +43,7 @@ * @test * @bug 8037378 * @summary Sanity tests for no persistence caching - * @run testng/othervm jdk.nashorn.internal.runtime.NoPersistenceCachingTest + * @run testng/othervm jdk.nashorn.internal.runtime.test.NoPersistenceCachingTest */ @SuppressWarnings("javadoc") public class NoPersistenceCachingTest {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/test/SourceTest.java Fri Apr 03 16:35:42 2015 -0700 +++ b/nashorn/test/src/jdk/nashorn/internal/runtime/test/SourceTest.java Tue Apr 07 00:13:18 2015 +0530 @@ -49,7 +49,7 @@ final private static String SOURCE_STRING = "var x = 1;"; final private static char[] SOURCE_CHARS = SOURCE_STRING.toCharArray(); final private static String RESOURCE_PATH = "resources/load_test.js"; - final private static File SOURCE_FILE = new File("build/test/classes/jdk/nashorn/internal/runtime/" + RESOURCE_PATH); + final private static File SOURCE_FILE = new File("build/test/classes/jdk/nashorn/internal/runtime/test/" + RESOURCE_PATH); final private static URL SOURCE_URL = SourceTest.class.getResource(RESOURCE_PATH);