Tests can start inside FX Web View fx
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Thu, 18 Apr 2013 05:47:45 +0200
branchfx
changeset 1006691c5cd3fb93
parent 1005 512984207634
child 1007 66ccab5a3530
Tests can start inside FX Web View
rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java
rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java
rt/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml
     1.1 --- a/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java	Wed Apr 17 17:14:30 2013 +0200
     1.2 +++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java	Thu Apr 18 05:47:45 2013 +0200
     1.3 @@ -80,7 +80,7 @@
     1.4       */
     1.5      public static Launcher createBrowser(String cmd) {
     1.6          final Bck2BrwsrLauncher l;
     1.7 -        if ("fx".equals(cmd)) {
     1.8 +        if ("fx".equals(cmd) || cmd == null) {
     1.9              l = new WebViewLauncher();
    1.10          } else {
    1.11              l = new Bck2BrwsrLauncher(cmd);
     2.1 --- a/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java	Wed Apr 17 17:14:30 2013 +0200
     2.2 +++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java	Thu Apr 18 05:47:45 2013 +0200
     2.3 @@ -31,8 +31,8 @@
     2.4   *
     2.5   * @author Jaroslav Tulach <jtulach@netbeans.org>
     2.6   */
     2.7 -public class Console {
     2.8 -    private Console() {
     2.9 +public final class Console {
    2.10 +    public Console() {
    2.11      }
    2.12      static {
    2.13          turnAssetionStatusOn();
    2.14 @@ -126,7 +126,7 @@
    2.15      )
    2.16      private static native void loadText(String url, Runnable callback, String[] arr) throws IOException;
    2.17      
    2.18 -    public static void harness(String url) throws IOException {
    2.19 +    public void harness(String url) throws IOException {
    2.20          log("Connecting to " + url);
    2.21          Request r = new Request(url);
    2.22      }
     3.1 --- a/rt/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml	Wed Apr 17 17:14:30 2013 +0200
     3.2 +++ b/rt/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml	Thu Apr 18 05:47:45 2013 +0200
     3.3 @@ -37,7 +37,12 @@
     3.4          <div id="bck2brwsr.fragment"/>
     3.5          
     3.6          <script type="text/javascript">
     3.7 -            vm.loadClass('org.apidesign.bck2brwsr.launcher.impl.Console').harness__VLjava_lang_String_2('$U/../data');
     3.8 +            try {
     3.9 +                var inst = vm.loadClass('org.apidesign.bck2brwsr.launcher.impl.Console').newInstance();
    3.10 +                inst.harness('$U/../data');
    3.11 +            } catch (err) { 
    3.12 +                alert('Error executing harness: ' + err); 
    3.13 +            }
    3.14          </script>
    3.15      </body>
    3.16  </html>