/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Jan 4 12:09:29 UTC 2017
changeset 128ddf575fdc in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=128ddf575fdc
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jan 04 12:32:05 2017 +0100
Added test for javaws-applet and nashorn
* tests/reproducers/simple/jsengine/resources/jsengineApplet.jnlp: new file, aplet definition
* tests/reproducers/simple/jsengine/srcs/jsengineApplet.java: new file, applet impelmentation
* tests/reproducers/simple/jsengine/testcases/jsengineTest.java: added test calling jsengineApplet.jnlp
changeset 56b18e91dc40 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=56b18e91dc40
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jan 04 13:16:12 2017 +0100
applets got javafx and nashorn support too
* plugin/icedteanp/IcedTeaNPPlugin.cc: added default locations of appletviewer_default_jfxrtjar and appletviewer_default_nashonrjar. Added methods get_plugin_jfx_jar and get_plugin_nashorn_jar to get dynamically resolved nashorn/javafx (command_line.push_back) for jdk8, on classapth added javafx, for jdk9 added classpath attribute with javafx (unknown behavior), for both jdks appended nashorn.jar to bootclassapth
* tests/reproducers/simple/jsengine/resources/jsengineApplet.html: testcase html
* tests/reproducers/simple/jsengine/testcases/jsengineTest.java: added test for apelt in html
diffstat:
ChangeLog | 20 +++
plugin/icedteanp/IcedTeaNPPlugin.cc | 36 +++++-
tests/reproducers/simple/jsengine/resources/jsengineApplet.html | 42 +++++++
tests/reproducers/simple/jsengine/resources/jsengineApplet.jnlp | 58 ++++++++++
tests/reproducers/simple/jsengine/srcs/jsengineApplet.java | 58 ++++++++++
tests/reproducers/simple/jsengine/testcases/jsengineTest.java | 39 +++++-
6 files changed, 244 insertions(+), 9 deletions(-)
diffs (322 lines):
diff -r 984601cc0ef7 -r 56b18e91dc40 ChangeLog
--- a/ChangeLog Wed Jan 04 11:55:47 2017 +0100
+++ b/ChangeLog Wed Jan 04 13:16:12 2017 +0100
@@ -1,3 +1,23 @@
+2017-01-04 Jiri Vanek <jvanek at redhat.com>
+
+ applets got javafx and nashorn support too
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: added default locations of
+ appletviewer_default_jfxrtjar and appletviewer_default_nashonrjar. Added methods
+ get_plugin_jfx_jar and get_plugin_nashorn_jar to get dynamically resolved nashorn/javafx
+ (command_line.push_back) for jdk8, on classapth added javafx,
+ for jdk9 added classpath attribute with javafx (unknown behavior), for both jdks appended
+ nashorn.jar to bootclassapth
+ * tests/reproducers/simple/jsengine/resources/jsengineApplet.html: testcase html
+ * tests/reproducers/simple/jsengine/testcases/jsengineTest.java: added test for apelt in html
+
+
+2017-01-04 Jiri Vanek <jvanek at redhat.com>
+
+ Added test for javaws-applet and nashorn
+ * tests/reproducers/simple/jsengine/resources/jsengineApplet.jnlp: new file, aplet definition
+ * tests/reproducers/simple/jsengine/srcs/jsengineApplet.java: new file, applet impelmentation
+ * tests/reproducers/simple/jsengine/testcases/jsengineTest.java: added test calling jsengineApplet.jnlp
+
2017-01-04 Jiri Vanek <jvanek at redhat.com>
Fixed reproducers code coverage after plugin+jdk9 changeset
diff -r 984601cc0ef7 -r 56b18e91dc40 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jan 04 11:55:47 2017 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jan 04 13:16:12 2017 +0100
@@ -141,6 +141,8 @@
// Fully-qualified appletviewer default executable and rt.jar
static const char* appletviewer_default_executable = ICEDTEA_WEB_JRE "/bin/java";
static const char* appletviewer_default_rtjar = ICEDTEA_WEB_JRE "/lib/rt.jar";
+static const char* appletviewer_default_jfxrtjar = ICEDTEA_WEB_JRE "/lib/jfxrt.jar";
+static const char* appletviewer_default_nashonrjar = ICEDTEA_WEB_JRE "/lib/ext/nashorn.jar";
//javaws name and binary
static const char* javaws_bin_property = "-Dicedtea-web.bin.location=" JAVAWS_BIN;
static const char* javaws_name_property = "-Dicedtea-web.bin.name=" JAVAWS_NAME;
@@ -305,6 +307,32 @@
return appletviewer_default_rtjar;
}
+static std::string get_plugin_jfx_jar(){
+ std::string custom_jre;
+ bool custom_jre_defined = find_custom_jre(custom_jre);
+ if (custom_jre_defined) {
+ if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/jfxrt.jar")){
+ return custom_jre+"/lib/jfxrt.jar";
+ } else {
+ PLUGIN_ERROR("Your custom jre (/lib/jfxrt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+ }
+ }
+ return appletviewer_default_jfxrtjar;
+}
+
+static std::string get_plugin_nashorn_jar(){
+ std::string custom_jre;
+ bool custom_jre_defined = find_custom_jre(custom_jre);
+ if (custom_jre_defined) {
+ if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/ext/nashorn.jar")){
+ return custom_jre+"/lib/ext/nashorn.jar";
+ } else {
+ PLUGIN_ERROR("Your custom jre (/lib/ext/nashorn.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+ }
+ }
+ return appletviewer_default_nashonrjar;
+}
+
static void cleanUpDir(){
//free data_directory descriptor
if (data_directory_descriptor != NULL) {
@@ -1584,13 +1612,15 @@
{
command_line.push_back(*jvm_args->at(i));
}
-
- command_line.push_back(PLUGIN_BOOTCLASSPATH);
+
+ command_line.push_back(PLUGIN_BOOTCLASSPATH":"+get_plugin_nashorn_jar());
if (javaVersion < 9 ) {
// for jdk8 set the classpath to avoid using the default (cwd).
command_line.push_back("-classpath");
- command_line.push_back(get_plugin_rt_jar());
+ command_line.push_back(get_plugin_rt_jar()+":"+get_plugin_jfx_jar());
} else {
+ command_line.push_back("-classpath");
+ command_line.push_back(get_plugin_jfx_jar());
command_line.push_back("--patch-module");
command_line.push_back("java.desktop="PLUGIN_JAR":"NETX_JAR);
command_line.push_back("--patch-module");
diff -r 984601cc0ef7 -r 56b18e91dc40 tests/reproducers/simple/jsengine/resources/jsengineApplet.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/jsengine/resources/jsengineApplet.html Wed Jan 04 13:16:12 2017 +0100
@@ -0,0 +1,42 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<html><head></head><body bgcolor="blue">
+<p><applet code="jsengineApplet.class" archive="jsengine.jar" codebase="." width=800 height=600>
+</applet></p>
+</body>
+</html>
diff -r 984601cc0ef7 -r 56b18e91dc40 tests/reproducers/simple/jsengine/resources/jsengineApplet.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/jsengine/resources/jsengineApplet.jnlp Wed Jan 04 13:16:12 2017 +0100
@@ -0,0 +1,58 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+-->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="jsengineApplet.jnlp" codebase=".">
+ <information>
+ <title>jsengine</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>jsengine</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="jsengine.jar"/>
+ </resources>
+ <applet-desc
+ documentBase="."
+ name="jsengineApplet"
+ main-class="jsengineApplet"
+ width="250"
+ height="200">
+ </applet-desc>
+</jnlp>
diff -r 984601cc0ef7 -r 56b18e91dc40 tests/reproducers/simple/jsengine/srcs/jsengineApplet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/jsengine/srcs/jsengineApplet.java Wed Jan 04 13:16:12 2017 +0100
@@ -0,0 +1,58 @@
+/* jsengineApplet.java
+Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+
+import java.applet.Applet;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+public class jsengineApplet extends Applet{
+
+ private static final ScriptEngine engine1 = new ScriptEngineManager().getEngineByName("JavaScript");
+ private static final ScriptEngine engine2 = new ScriptEngineManager(jsengine.class.getClassLoader()).getEngineByName("JavaScript");
+ private static final ScriptEngine engine3 = new ScriptEngineManager(null).getEngineByName("JavaScript");
+
+ @Override
+ public void start(){
+ System.out.println("starting");
+ System.out.println("A-"+engine1+"-Z");
+ System.out.println("B-"+engine2+"-Y");
+ System.out.println("C-"+engine3+"-X");
+ System.out.println("finished");
+
+ }
+}
diff -r 984601cc0ef7 -r 56b18e91dc40 tests/reproducers/simple/jsengine/testcases/jsengineTest.java
--- a/tests/reproducers/simple/jsengine/testcases/jsengineTest.java Wed Jan 04 11:55:47 2017 +0100
+++ b/tests/reproducers/simple/jsengine/testcases/jsengineTest.java Wed Jan 04 13:16:12 2017 +0100
@@ -36,18 +36,19 @@
*/
import net.sourceforge.jnlp.ProcessResult;
-import net.sourceforge.jnlp.ServerAccess;
import net.sourceforge.jnlp.annotations.Bug;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.StringBasedClosingListener;
import org.junit.Assert;
import org.junit.Test;
-public class jsengineTest {
+public class jsengineTest extends BrowserTest {
- private static final ServerAccess server = new ServerAccess();
-
@Test
- @Bug(id="PR3263")
+ @Bug(id = "PR3263")
public void jsengineTestcase1() throws Exception {
String originalResourceName = "jsengine.jnlp";
ProcessResult pr = server.executeJavawsHeadless(null, "/" + originalResourceName);
@@ -59,5 +60,31 @@
Assert.assertTrue(pr.stdout.matches("(?s)(?i).*C-.*nashorn.*-X.*") || pr.stdout.matches("(?s)(?i).*C-.*rhino.*-X.*"));
Assert.assertTrue(pr.stdout.matches("(?s).*finished.*"));
}
+
+ @Test
+ public void jsengineAppletTestcase1() throws Exception {
+ String originalResourceName = "jsengineApplet.jnlp";
+ ProcessResult pr = server.executeJavawsHeadless(null, "/" + originalResourceName, new StringBasedClosingListener("finished"), null, null);
+ //ServerAccess.logOutputReprint(pr.stderr);
+ //ServerAccess.logOutputReprint(pr.stdout);
+ Assert.assertTrue(pr.stdout.matches("(?s).*starting.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s)(?i).*A-.*nashorn.*-Z.*") || pr.stdout.matches("(?s)(?i).*A-.*rhino.*-Z.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s)(?i).*B-.*nashorn.*-Y.*") || pr.stdout.matches("(?s)(?i).*B-.*rhino.*-Y.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s)(?i).*C-.*nashorn.*-X.*") || pr.stdout.matches("(?s)(?i).*C-.*rhino.*-X.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s).*finished.*"));
+ }
+
+ @Test
+ @TestInBrowsers(testIn = {Browsers.all})
+ public void jsengineAppletTestcase2() throws Exception {
+ String originalResourceName = "jsengineApplet.html";
+ ProcessResult pr = server.executeBrowser("/" + originalResourceName, new StringBasedClosingListener("finished"), null);
+ //ServerAccess.logOutputReprint(pr.stderr);
+ //ServerAccess.logOutputReprint(pr.stdout);
+ Assert.assertTrue(pr.stdout.matches("(?s).*starting.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s)(?i).*A-.*nashorn.*-Z.*") || pr.stdout.matches("(?s)(?i).*A-.*rhino.*-Z.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s)(?i).*B-.*nashorn.*-Y.*") || pr.stdout.matches("(?s)(?i).*B-.*rhino.*-Y.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s)(?i).*C-.*nashorn.*-X.*") || pr.stdout.matches("(?s)(?i).*C-.*rhino.*-X.*"));
+ Assert.assertTrue(pr.stdout.matches("(?s).*finished.*"));
+ }
}
-
More information about the distro-pkg-dev
mailing list