# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1358878598 -3600
# Node ID a0d8b5ab79a24b195ef73c1836887d389ab325e9
# Parent  ec343ebe862e842477af229cb12f0b7c21add34d
@BrwsrTest can reference @HtmlFragment and manipulate it

diff -r ec343ebe862e -r a0d8b5ab79a2 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Tue Jan 22 19:16:38 2013 +0100
@@ -55,7 +55,7 @@
  */
 final class Bck2BrwsrLauncher extends Launcher implements Closeable {
     private static final Logger LOG = Logger.getLogger(Bck2BrwsrLauncher.class.getName());
-    private static final MethodInvocation END = new MethodInvocation(null, null);
+    private static final MethodInvocation END = new MethodInvocation(null, null, null);
     private Set<ClassLoader> loaders = new LinkedHashSet<>();
     private BlockingQueue<MethodInvocation> methods = new LinkedBlockingQueue<>();
     private long timeOut;
@@ -70,9 +70,9 @@
     }
     
     @Override
-    public MethodInvocation addMethod(Class<?> clazz, String method) throws IOException {
+     MethodInvocation addMethod(Class<?> clazz, String method, String html) throws IOException {
         loaders.add(clazz.getClassLoader());
-        MethodInvocation c = new MethodInvocation(clazz.getName(), method);
+        MethodInvocation c = new MethodInvocation(clazz.getName(), method, html);
         methods.add(c);
         try {
             c.await(timeOut);
@@ -174,7 +174,13 @@
                     + "className: '" + cn + "', "
                     + "methodName: '" + mn + "', "
                     + "request: " + cnt
-                    + "}");
+                );
+                if (mi.html != null) {
+                    response.getWriter().write(", html: '");
+                    response.getWriter().write(encodeJSON(mi.html));
+                    response.getWriter().write("'");
+                }
+                response.getWriter().write("}");
                 cnt++;
             }
         }, "/data");
@@ -182,6 +188,22 @@
         this.brwsr = launchServerAndBrwsr(server, "/execute");
     }
     
+    private static String encodeJSON(String in) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < in.length(); i++) {
+            char ch = in.charAt(i);
+            if (ch < 32 || ch == '\'' || ch == '"') {
+                sb.append("\\u");
+                String hs = "0000" + Integer.toHexString(ch);
+                hs = hs.substring(hs.length() - 4);
+                sb.append(hs);
+            } else {
+                sb.append(ch);
+            }
+        }
+        return sb.toString();
+    }
+    
     @Override
     public void shutdown() throws IOException {
         methods.offer(END);
@@ -348,7 +370,7 @@
         public Page(Res res, String resource, String... args) {
             this.res = res;
             this.resource = resource;
-            this.args = args;
+            this.args = args.length == 0 ? new String[] { "$0" } : args;
         }
 
         @Override
diff -r ec343ebe862e -r a0d8b5ab79a2 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Console.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Console.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Console.java	Tue Jan 22 19:16:38 2013 +0100
@@ -53,7 +53,7 @@
     private static native void closeWindow();
 
     private static void log(String newText) {
-        String id = "result";
+        String id = "bck2brwsr.result";
         String attr = "value";
         setAttr(id, attr, getAttr(id, attr) + "\n" + newText);
         setAttr(id, "scrollTop", getAttr(id, "scrollHeight"));
@@ -63,7 +63,7 @@
         String clazz = (String) getAttr("clazz", "value");
         String method = (String) getAttr("method", "value");
         Object res = invokeMethod(clazz, method);
-        setAttr("result", "value", res);
+        setAttr("bck2brwsr.result", "value", res);
     }
 
     @JavaScriptBody(args = { "url", "callback", "arr" }, body = ""
@@ -111,10 +111,14 @@
                 }
                 
                 Case c = Case.parseData(data);
+                if (c.getHtmlFragment() != null) {
+                    setAttr("bck2brwsr.fragment", "innerHTML", c.getHtmlFragment());
+                }
                 log("Invoking " + c.getClassName() + '.' + c.getMethodName() + " as request: " + c.getRequestId());
 
                 Object result = invokeMethod(c.getClassName(), c.getMethodName());
                 
+                setAttr("bck2brwsr.fragment", "innerHTML", "");
                 log("Result: " + result);
                 
                 result = encodeURL("" + result);
@@ -237,11 +241,19 @@
         public String getRequestId() {
             return value("request", data);
         }
+
+        public String getHtmlFragment() {
+            return value("html", data);
+        }
         
         @JavaScriptBody(args = "s", body = "return eval('(' + s + ')');")
         private static native Object toJSON(String s);
         
-        @JavaScriptBody(args = {"p", "d"}, body = "return d[p].toString();")
+        @JavaScriptBody(args = {"p", "d"}, body = 
+              "var v = d[p];\n"
+            + "if (typeof v === 'undefined') return null;\n"
+            + "return v.toString();"
+        )
         private static native String value(String p, Object d);
     }
 }
diff -r ec343ebe862e -r a0d8b5ab79a2 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Tue Jan 22 19:16:38 2013 +0100
@@ -42,10 +42,9 @@
     private Object console;
     
     
-    @Override
-    public MethodInvocation addMethod(Class<?> clazz, String method) {
+    @Override MethodInvocation addMethod(Class<?> clazz, String method, String html) {
         loaders.add(clazz.getClassLoader());
-        MethodInvocation mi = new MethodInvocation(clazz.getName(), method);
+        MethodInvocation mi = new MethodInvocation(clazz.getName(), method, html);
         try {
             mi.result(code.invokeMethod(
                 console,
diff -r ec343ebe862e -r a0d8b5ab79a2 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java	Tue Jan 22 19:16:38 2013 +0100
@@ -32,12 +32,12 @@
     Launcher() {
     }
     
-    abstract MethodInvocation addMethod(Class<?> clazz, String method) throws IOException; 
+    abstract MethodInvocation addMethod(Class<?> clazz, String method, String html) throws IOException; 
 
     public abstract void initialize() throws IOException;
     public abstract void shutdown() throws IOException;
-    public MethodInvocation invokeMethod(Class<?> clazz, String method) throws IOException {
-        return addMethod(clazz, method);
+    public MethodInvocation invokeMethod(Class<?> clazz, String method, String html) throws IOException {
+        return addMethod(clazz, method, html);
     }
     
     
diff -r ec343ebe862e -r a0d8b5ab79a2 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/MethodInvocation.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/MethodInvocation.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/MethodInvocation.java	Tue Jan 22 19:16:38 2013 +0100
@@ -28,12 +28,14 @@
     final CountDownLatch wait = new CountDownLatch(1);
     final String className;
     final String methodName;
+    final String html;
     private String result;
     private Throwable exception;
 
-    MethodInvocation(String className, String methodName) {
+    MethodInvocation(String className, String methodName, String html) {
         this.className = className;
         this.methodName = methodName;
+        this.html = html;
     }
     
     void await(long timeOut) throws InterruptedException {
diff -r ec343ebe862e -r a0d8b5ab79a2 launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml
--- a/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml	Tue Jan 22 18:07:23 2013 +0100
+++ b/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml	Tue Jan 22 19:16:38 2013 +0100
@@ -27,10 +27,12 @@
         <script src="/bck2brwsr.js"></script>
         <script src="/vm.js"></script>
         
-        <h1>Bck2Browser Execution Harness</h1>
+        <h1>Bck2Brwsr Execution Harness</h1>
         
-        <textarea id="result" rows="25" style="width: 100%;" disabled="">
+        <textarea id="bck2brwsr.result" rows="25" style="width: 100%;" disabled="">
         </textarea>
+
+        <div id="bck2brwsr.fragment"/>
         
         <script type="text/javascript">
             vm.loadClass('org.apidesign.bck2brwsr.launcher.Console').harness__VLjava_lang_String_2('$U/../data');
diff -r ec343ebe862e -r a0d8b5ab79a2 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/HtmlFragment.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/HtmlFragment.java	Tue Jan 22 19:16:38 2013 +0100
@@ -0,0 +1,38 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program 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 of the License.
+ *
+ * This program 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 this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Allows to specify an HTML fragment for a given {@link BrwsrTest}. 
+ * Apply either to the method or to enclosing class. The fragment will be
+ * made available in the page that executes given test. Its elements shall
+ * be regularly accessible from the test.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE})
+public @interface HtmlFragment {
+    /** HTML code fragment to be exposed on the testing page.
+     */
+    String value();
+}
diff -r ec343ebe862e -r a0d8b5ab79a2 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java	Tue Jan 22 19:16:38 2013 +0100
@@ -40,20 +40,20 @@
     private final String type;
     private final boolean fail;
     Object value;
-    private static final Map<Class, Object[]> compiled = new WeakHashMap<>();
-    private Object inst;
+    private final String html;
 
-    Bck2BrwsrCase(Method m, String type, Launcher l, boolean fail) {
+    Bck2BrwsrCase(Method m, String type, Launcher l, boolean fail, String html) {
         this.l = l;
         this.m = m;
         this.type = type;
         this.fail = fail;
+        this.html = html;
     }
 
     @Test(groups = "run")
     public void executeCode() throws Throwable {
         if (l != null) {
-            MethodInvocation c = l.invokeMethod(m.getDeclaringClass(), m.getName());
+            MethodInvocation c = l.invokeMethod(m.getDeclaringClass(), m.getName(), html);
             String res = c.toString();
             value = res;
             if (fail) {
diff -r ec343ebe862e -r a0d8b5ab79a2 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Tue Jan 22 19:16:38 2013 +0100
@@ -111,15 +111,15 @@
         if (c == null) {
             return;
         }
-        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false);
-        final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false);
+        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false, null);
+        final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false, null);
         ret.add(real);
         ret.add(js);
         ret.add(new CompareCase(m, real, js));
         for (String b : brwsr) {
             final Launcher s = l.brwsr(b);
             ret.add(s);
-            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false);
+            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false, null);
             ret.add(cse);
             ret.add(new CompareCase(m, real, cse));
         }
@@ -129,15 +129,20 @@
         if (c == null) {
             return;
         }
+        HtmlFragment f = m.getAnnotation(HtmlFragment.class);
+        if (f == null) {
+            f = m.getDeclaringClass().getAnnotation(HtmlFragment.class);
+        }
+        String html = f == null ? null : f.value();
         if (brwsr.length == 0) {
             final Launcher s = l.brwsr(null);
             ret.add(s);
-            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true));
+            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true, html));
         } else {
             for (String b : brwsr) {
                 final Launcher s = l.brwsr(b);
                 ret.add(s);
-                ret.add(new Bck2BrwsrCase(m, b, s, true));
+                ret.add(new Bck2BrwsrCase(m, b, s, true, html));
             }
         }
     }
diff -r ec343ebe862e -r a0d8b5ab79a2 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java	Tue Jan 22 18:07:23 2013 +0100
+++ b/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java	Tue Jan 22 19:16:38 2013 +0100
@@ -19,6 +19,7 @@
 
 import org.apidesign.bck2brwsr.core.JavaScriptBody;
 import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
+import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
 import org.apidesign.bck2brwsr.vmtest.VMTest;
 import org.testng.annotations.Factory;
 
@@ -27,17 +28,30 @@
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  */
 public class BrwsrCheckTest {
-    
+
     @BrwsrTest public void assertWindowObjectIsDefined() {
         assert window() != null : "No window object found!";
     }
+
+    
+    
+    
+    @HtmlFragment("<h1 id='hello'>\n"
+        + "Hello!\n"
+        + "</h1>\n")
+    @BrwsrTest public void accessProvidedFragment() {
+        assert getElementById("hello") != null : "Element with 'hello' ID found";
+    }
     
     @Factory
     public static Object[] create() {
         return VMTest.create(BrwsrCheckTest.class);
     }
+    
 
     @JavaScriptBody(args = {}, body = "return window;")
     private static native Object window();
-    
+
+    @JavaScriptBody(args = { "id" }, body = "return window.document.getElementById(id);")
+    private static native Object getElementById(String id);
 }