1.1 --- a/ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusKnockoutTest.java Sun Aug 25 14:40:16 2013 +0200
1.2 +++ b/ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusKnockoutTest.java Thu Sep 12 09:33:50 2013 +0200
1.3 @@ -36,6 +36,8 @@
1.4 import net.java.html.BrwsrCtx;
1.5 import net.java.html.boot.BrowserBuilder;
1.6 import net.java.html.js.JavaScriptBody;
1.7 +import org.apidesign.html.boot.impl.FnUtils;
1.8 +import org.apidesign.html.boot.spi.Fn;
1.9 import org.apidesign.html.context.spi.Contexts;
1.10 import org.apidesign.html.json.spi.Technology;
1.11 import org.apidesign.html.json.spi.Transfer;
1.12 @@ -56,6 +58,7 @@
1.13 @ServiceProvider(service = KnockoutTCK.class)
1.14 public final class TyrusKnockoutTest extends KnockoutTCK {
1.15 private static Class<?> browserClass;
1.16 + private static Fn.Presenter browserContext;
1.17
1.18 public TyrusKnockoutTest() {
1.19 }
1.20 @@ -92,7 +95,7 @@
1.21 asSubclass(Annotation.class);
1.22 for (Method m : c.getMethods()) {
1.23 if (m.getAnnotation(koTest) != null) {
1.24 - res.add(new TyrusFX(m));
1.25 + res.add(new TyrusFX(browserContext, m));
1.26 }
1.27 }
1.28 }
1.29 @@ -108,6 +111,7 @@
1.30
1.31 public static synchronized void initialized(Class<?> browserCls) throws Exception {
1.32 browserClass = browserCls;
1.33 + browserContext = FnUtils.currentPresenter();
1.34 TyrusKnockoutTest.class.notifyAll();
1.35 }
1.36
1.37 @@ -115,11 +119,12 @@
1.38 Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(TyrusKnockoutTest.class.getName());
1.39 Method m = classpathClass.getMethod("initialized", Class.class);
1.40 m.invoke(null, TyrusKnockoutTest.class);
1.41 + browserContext = FnUtils.currentPresenter();
1.42 }
1.43
1.44 @Override
1.45 public BrwsrCtx createContext() {
1.46 - FXContext fx = new FXContext();
1.47 + FXContext fx = new FXContext(browserContext);
1.48 TyrusContext tc = new TyrusContext();
1.49 Contexts.Builder cb = Contexts.newBuilder().
1.50 register(Technology.class, fx, 10).