Wed, 17 Sep 2014 16:44:23 +0400
8057035: Some tests failed using java.awt.Color on Solaris without X11 libraries
Reviewed-by: lagergren
Contributed-by: Sergey Lugovoy <sergey.lugovoy@oracle.com>
1.1 --- a/test/script/basic/JDK-8043232.js Wed Sep 02 12:26:57 2015 +0200 1.2 +++ b/test/script/basic/JDK-8043232.js Wed Sep 17 16:44:23 2014 +0400 1.3 @@ -29,14 +29,14 @@ 1.4 */ 1.5 1.6 // call explicit constructor 1.7 -print(new (java.awt["Color(int,int,int)"])(255,0,255)); 1.8 +print(new (java.lang["String(char[],int,int)"])(['a','b', 'c', 'd'], 1, 3)); 1.9 // print the constructor itself 1.10 -print(java.awt["Color(int,int,int)"]); 1.11 +print(java.lang["String(char[],int,int)"]); 1.12 1.13 // store constructor to call later 1.14 -var Color = java.awt["Color(int,int,int)"]; 1.15 +var Color = java.lang["String(char[],int,int)"]; 1.16 // call stored constructor 1.17 -print(new Color(33, 233, 2)) 1.18 +print(new Color(['r','r', 'e', 'd'], 1, 3)) 1.19 1.20 // check if default constructor works 1.21 var obj = new (java.lang["Object()"])();
2.1 --- a/test/script/basic/JDK-8043232.js.EXPECTED Wed Sep 02 12:26:57 2015 +0200 2.2 +++ b/test/script/basic/JDK-8043232.js.EXPECTED Wed Sep 17 16:44:23 2014 +0400 2.3 @@ -1,6 +1,6 @@ 2.4 -java.awt.Color[r=255,g=0,b=255] 2.5 -[jdk.internal.dynalink.beans.SimpleDynamicMethod Color java.awt.Color.java.awt.Color(int,int,int)] 2.6 -java.awt.Color[r=33,g=233,b=2] 2.7 +bcd 2.8 +[jdk.internal.dynalink.beans.SimpleDynamicMethod String java.lang.String.java.lang.String(char[],int,int)] 2.9 +red 2.10 TypeError: No such Java class: java.lang.NonExistent 2.11 TypeError: No such Java constructor: Object(String) 2.12 TypeError: Java constructor signature invalid: Object()xxxxx 2.13 @@ -8,7 +8,7 @@ 2.14 TypeError: Java constructor signature invalid: Object) 2.15 TypeError: Java method [jdk.internal.dynalink.beans.OverloadedDynamicMethod java.lang.System.getProperty] cannot be used as a constructor. 2.16 TypeError: Java method [jdk.internal.dynalink.beans.OverloadedDynamicMethod java.io.PrintStream.println] cannot be used as a constructor. 2.17 -TypeError: Constructor [jdk.internal.dynalink.beans.SimpleDynamicMethod Color java.awt.Color.java.awt.Color(int,int,int)] requires "new". 2.18 +TypeError: Constructor [jdk.internal.dynalink.beans.SimpleDynamicMethod String java.lang.String.java.lang.String(char[],int,int)] requires "new". 2.19 TypeError: No such Java constructor: Runnable() 2.20 TypeError: No such Java constructor: Runnable(int) 2.21 java.lang.InstantiationException: java.io.InputStream
3.1 --- a/test/script/basic/JDK-8049086.js Wed Sep 02 12:26:57 2015 +0200 3.2 +++ b/test/script/basic/JDK-8049086.js Wed Sep 17 16:44:23 2014 +0400 3.3 @@ -58,7 +58,7 @@ 3.4 // (a) Java methods (b) Java classes (as these respond to new) 3.5 // (c) FunctionalInterface objects (d) JSObjects that are 'functions' 3.6 3.7 -print("java.awt.Color is java function? " + Java.isJavaFunction(java.awt.Color)); 3.8 +print("java.lang.String is java function? " + Java.isJavaFunction(java.lang.String)); 3.9 print("java.lang.Runnable instance is java function? " 3.10 + Java.isJavaFunction(new java.lang.Runnable(function() {}))); 3.11 print("eval is java function? " + Java.isJavaFunction(eval));
4.1 --- a/test/script/basic/JDK-8049086.js.EXPECTED Wed Sep 02 12:26:57 2015 +0200 4.2 +++ b/test/script/basic/JDK-8049086.js.EXPECTED Wed Sep 17 16:44:23 2014 +0400 4.3 @@ -13,7 +13,7 @@ 4.4 Object is script object? true 4.5 {} is script object? true 4.6 /foo/ is script object? true 4.7 -java.awt.Color is java function? true 4.8 +java.lang.String is java function? true 4.9 java.lang.Runnable instance is java function? true 4.10 eval is java function? false 4.11 println is java function? true
5.1 --- a/test/script/basic/JDK-8049242.js Wed Sep 02 12:26:57 2015 +0200 5.2 +++ b/test/script/basic/JDK-8049242.js Wed Sep 17 16:44:23 2014 +0400 5.3 @@ -29,14 +29,14 @@ 5.4 */ 5.5 5.6 // call explicit constructor 5.7 -print(new (Java.type("java.awt.Color")["(int,int,int)"])(255,0,255)); 5.8 +print(new (Java.type("java.lang.String")["(char[],int,int)"])(['a', 'b', 'c'],0, 3)); 5.9 // print the constructor itself 5.10 -print(Java.type("java.awt.Color")["(int,int,int)"]); 5.11 +print(Java.type("java.lang.String")["(char[],int,int)"]); 5.12 5.13 // store constructor to call later 5.14 -var Color = Java.type("java.awt.Color")["(int,int,int)"]; 5.15 +var Color = Java.type("java.lang.String")["(char[],int,int)"]; 5.16 // call stored constructor 5.17 -print(new Color(33, 233, 2)) 5.18 +print(new Color(['j', 'a', 'v', 'a'], 1, 3)) 5.19 5.20 // check if default constructor works 5.21 var obj = new (Java.type("java.lang.Object")["()"])();
6.1 --- a/test/script/basic/JDK-8049242.js.EXPECTED Wed Sep 02 12:26:57 2015 +0200 6.2 +++ b/test/script/basic/JDK-8049242.js.EXPECTED Wed Sep 17 16:44:23 2014 +0400 6.3 @@ -1,10 +1,10 @@ 6.4 -java.awt.Color[r=255,g=0,b=255] 6.5 -[jdk.internal.dynalink.beans.SimpleDynamicMethod Color java.awt.Color.java.awt.Color(int,int,int)] 6.6 -java.awt.Color[r=33,g=233,b=2] 6.7 +abc 6.8 +[jdk.internal.dynalink.beans.SimpleDynamicMethod String java.lang.String.java.lang.String(char[],int,int)] 6.9 +ava 6.10 TypeError: null is not a function 6.11 TypeError: null is not a function 6.12 TypeError: null is not a function 6.13 -TypeError: Constructor [jdk.internal.dynalink.beans.SimpleDynamicMethod Color java.awt.Color.java.awt.Color(int,int,int)] requires "new". 6.14 +TypeError: Constructor [jdk.internal.dynalink.beans.SimpleDynamicMethod String java.lang.String.java.lang.String(char[],int,int)] requires "new". 6.15 TypeError: null is not a function 6.16 TypeError: null is not a function 6.17 java.lang.InstantiationException: java.io.InputStream