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 2019/08/11 05:00:18 UTC
[netbeans-html4j] branch master updated: Usage of
@JavaScriptResource requires resources on compileJava.classpath
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 90517fc Usage of @JavaScriptResource requires resources on compileJava.classpath
90517fc is described below
commit 90517fc1ce2d6e2af4d76f2d5fbe042185a6522f
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Sun Aug 11 07:00:04 2019 +0200
Usage of @JavaScriptResource requires resources on compileJava.classpath
---
.../test/java/org/netbeans/html/mojo/Gradle1Test.java | 8 ++++++--
.../org/netbeans/html/mojo/gradle1/build.gradle | 4 ++++
.../html/mojo/gradle1/src/main/java/Gradle1Check.java | 2 ++
.../main/{java/Gradle1Check.java => resources/empty.js} | 16 ----------------
4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/html4j-maven-plugin/src/test/java/org/netbeans/html/mojo/Gradle1Test.java b/html4j-maven-plugin/src/test/java/org/netbeans/html/mojo/Gradle1Test.java
index ba94eb8..0a3335e 100644
--- a/html4j-maven-plugin/src/test/java/org/netbeans/html/mojo/Gradle1Test.java
+++ b/html4j-maven-plugin/src/test/java/org/netbeans/html/mojo/Gradle1Test.java
@@ -47,15 +47,19 @@ public class Gradle1Test {
Class<?> clazz = l.loadClass("Gradle1Check");
Callable<?> r = (Callable<?>) clazz.newInstance();
- try (Closeable c = Fn.activate(new NumberPresenter())) {
+ final NumberPresenter mockPresenter = new NumberPresenter();
+ try (Closeable c = Fn.activate(mockPresenter)) {
Object value = r.call();
assertTrue(value instanceof Number, "It is a number");
assertEquals(((Number)value).intValue(), 42, "The meaning is returned");
}
+ assertEquals(mockPresenter.loadScriptCount, 1, "One script loaded");
}
private static final class NumberPresenter implements Fn.Presenter {
+ private int loadScriptCount;
+
@Override
public Fn defineFn(String code, String... ignore) {
if (code.startsWith("return")) {
@@ -72,7 +76,7 @@ public class Gradle1Test {
@Override
public void loadScript(Reader reader) throws Exception {
- throw new UnsupportedOperationException();
+ loadScriptCount++;
}
}
diff --git a/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/build.gradle b/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/build.gradle
index f162133..060f4bc 100644
--- a/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/build.gradle
+++ b/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/build.gradle
@@ -36,6 +36,10 @@ version '1.0-SNAPSHOT'
apply plugin: 'java'
apply plugin: 'html4j'
+compileJava {
+ classpath += files("src/main/resources")
+}
+
dependencies {
compile fileTree(dir: '../../../../../../../../../boot/target/', include: ['*.jar'])
}
diff --git a/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java b/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java
index 88b97fc..6fb3e61 100644
--- a/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java
+++ b/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java
@@ -19,7 +19,9 @@
import net.java.html.js.JavaScriptBody;
import java.util.concurrent.Callable;
+import net.java.html.js.JavaScriptResource;
+@JavaScriptResource("/empty.js")
public class Gradle1Check implements Callable<Integer> {
@Override
diff --git a/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java b/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/resources/empty.js
similarity index 70%
copy from html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java
copy to html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/resources/empty.js
index 88b97fc..51da6c0 100644
--- a/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/java/Gradle1Check.java
+++ b/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle1/src/main/resources/empty.js
@@ -16,19 +16,3 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-import net.java.html.js.JavaScriptBody;
-import java.util.concurrent.Callable;
-
-public class Gradle1Check implements Callable<Integer> {
-
- @Override
- public Integer call() throws Exception {
- return compute();
- }
-
- @JavaScriptBody(args = {}, body = "return 42;")
- private static int compute() {
- return -1;
- }
-}
---------------------------------------------------------------------
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