# HG changeset patch # User mnunez # Date 1392116722 -3600 # Node ID a392513941025e2750acdcc45f9df2ec9080bde9 # Parent 74a3ead86f5e29752ce8d0fb17400aad681040cb 8033231: test fails with java.lang.UnsatisfiedLinkError Reviewed-by: attila, sundar diff -r 74a3ead86f5e -r a39251394102 test/script/basic/JDK-8026161.js --- a/test/script/basic/JDK-8026161.js Tue May 06 10:04:22 2014 -0700 +++ b/test/script/basic/JDK-8026161.js Tue Feb 11 12:05:22 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,5 +28,5 @@ * @run */ -print(new java.awt.Color(1, 1, 1)) // creates Color[r=1,g=1,b=1] -print(new java.awt.Color(1.0, 1.0, 1.0)) // Color[r=255,g=255,b=255] +print(Java.type("jdk.nashorn.test.models.IntFloatOverloadSelection").overloadedMethod(1)) +print(Java.type("jdk.nashorn.test.models.IntFloatOverloadSelection").overloadedMethod(1.0)) diff -r 74a3ead86f5e -r a39251394102 test/script/basic/JDK-8026161.js.EXPECTED --- a/test/script/basic/JDK-8026161.js.EXPECTED Tue May 06 10:04:22 2014 -0700 +++ b/test/script/basic/JDK-8026161.js.EXPECTED Tue Feb 11 12:05:22 2014 +0100 @@ -1,2 +1,2 @@ -java.awt.Color[r=1,g=1,b=1] -java.awt.Color[r=255,g=255,b=255] +int +float diff -r 74a3ead86f5e -r a39251394102 test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java Tue Feb 11 12:05:22 2014 +0100 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package jdk.nashorn.test.models; + +public class IntFloatOverloadSelection { + + public static String overloadedMethod(int i) { + return "int"; + } + + public static String overloadedMethod(float f) { + return "float"; + } +}