You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2020/01/27 14:15:02 UTC
[netbeans-html4j] branch master updated: Make the test pass on
GraalVM 19.3.0
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new e70b3ce Make the test pass on GraalVM 19.3.0
e70b3ce is described below
commit e70b3cee720514cf15cd0da8dbf01bdead1d0a3a
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Mon Jan 27 15:14:39 2020 +0100
Make the test pass on GraalVM 19.3.0
---
.../main/java/org/netbeans/html/presenters/spi/Generic.java | 2 +-
.../java/org/netbeans/html/presenters/spi/test/Testing.java | 13 +++++++++----
.../test/java/org/netbeans/html/ko4j/KnockoutFXTest.java | 1 +
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
index d96dafe..df12a8b 100644
--- a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
+++ b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
@@ -326,7 +326,7 @@ abstract class Generic implements Fn.Presenter, Fn.KeepAlive, Flushable {
"fnBegin= var encParams = ds(@1).toJava(null, [",
"fnPPar=@2 p@1",
"fnBody=]);\n" +
- " var v = ds(@3).toVM('c', @1, '@2', thiz ? thiz.id : null, encParams);\n" +
+ " var v = ds(@3).toVM('c', '@1', '@2', thiz ? thiz.id : null, encParams);\n" +
" while (v !== null && v.indexOf && v.indexOf('javascript:') === 0) {\n" +
" var script = v.substring(11);\n" +
" try {\n" +
diff --git a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
index 887b435..4adc485 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
@@ -59,6 +59,7 @@ class Testing {
ScriptEngineManager sem = new ScriptEngineManager();
eng = sem.getEngineByMimeType("text/javascript");
+ eng.getBindings(ScriptContext.ENGINE_SCOPE).put("polyglot.js.allowAllAccess", true);
try {
eng.eval("function alert(m) { Packages.java.lang.System.out.println(m); };");
} catch (ScriptException ex) {
@@ -91,13 +92,17 @@ class Testing {
public final class Clbk {
private Clbk() {
}
-
- public String pass(String method, String a1, String a2, String a3, String a4) throws Exception {
- return presenter.js2java(method, a1, a2, a3, a4);
+
+ private String ts(Object o) {
+ return o == null ? null : o.toString();
+ }
+
+ public String pass(String method, Object a1, Object a2, Object a3, Object a4) throws Exception {
+ return presenter.js2java(method, ts(a1), ts(a2), ts(a3), ts(a4));
}
}
private final Clbk clbk = new Clbk();
-
+
protected void callbackFn(ProtoPresenterBuilder.OnPrepared ready) {
eng.getBindings(ScriptContext.ENGINE_SCOPE).put("jvm", clbk);
try {
diff --git a/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java b/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
index 8e4fb1a..f6152d6 100644
--- a/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
+++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
@@ -122,6 +122,7 @@ public final class KnockoutFXTest extends KnockoutTCK {
"1.8.0_212".equals(version) ||
"1.8.0_221".equals(version) ||
"1.8.0_222".equals(version) ||
+ "1.8.0_231".equals(version) ||
"1.8.0_241".equals(version);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists