1.1 --- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java Wed Jun 26 20:27:06 2013 +0200
1.2 +++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java Mon Aug 26 08:56:37 2013 +0200
1.3 @@ -31,9 +31,11 @@
1.4 import org.apidesign.html.context.spi.Contexts;
1.5 import org.apidesign.html.json.spi.Technology;
1.6 import org.apidesign.html.json.spi.Transfer;
1.7 +import org.apidesign.html.json.spi.WSTransfer;
1.8 import org.apidesign.html.json.tck.KOTest;
1.9 import org.apidesign.html.json.tck.KnockoutTCK;
1.10 import org.apidesign.html.kofx.FXContext;
1.11 +import org.apidesign.html.wstyrus.TyrusContext;
1.12 import org.json.JSONException;
1.13 import org.json.JSONObject;
1.14 import org.openide.util.lookup.ServiceProvider;
1.15 @@ -58,10 +60,19 @@
1.16 @Override
1.17 public BrwsrCtx createContext() {
1.18 FXContext fx = new FXContext();
1.19 - return Contexts.newBuilder().
1.20 + TyrusContext tc = new TyrusContext();
1.21 + Contexts.Builder b = Contexts.newBuilder().
1.22 register(Technology.class, fx, 10).
1.23 - register(Transfer.class, fx, 10).
1.24 - build();
1.25 + register(Transfer.class, fx, 10);
1.26 + try {
1.27 + Class.forName("java.util.function.Function");
1.28 + // prefer WebView's WebSockets on JDK8
1.29 + b.register(WSTransfer.class, fx, 10);
1.30 + } catch (ClassNotFoundException ex) {
1.31 + // ok, JDK7 needs tyrus
1.32 + b.register(WSTransfer.class, tc, 20);
1.33 + }
1.34 + return b.build();
1.35 }
1.36
1.37 @Override