From a2daf65958c602dd02099bf4415e7e432b706dc7 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 16 Sep 2013 14:44:43 +0300 Subject: Converted TB2 push tests to TB3 (#12580) Change-Id: Ifd6286aee75946eb47c39886c08473a5a0c10545 --- .../com/vaadin/tests/push/BasicPushWebsocket.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java') diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java index 6fc27e8974..4765183fca 100644 --- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java +++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java @@ -1,8 +1,44 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ package com.vaadin.tests.push; +import java.util.Collection; + +import org.openqa.selenium.remote.DesiredCapabilities; + import com.vaadin.annotations.Push; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ui.Transport; +import com.vaadin.tests.tb3.WebsocketTest; @Push(transport = Transport.WEBSOCKET) public class BasicPushWebsocket extends BasicPush { + + @Override + public void init(VaadinRequest request) { + super.init(request); + // Don't use fallback so we can easier detect if websocket fails + getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET); + } + + public static class BasicPushWebsocketTest extends BasicPushTest { + @Override + public Collection getBrowsersToTest() { + return WebsocketTest.getWebsocketBrowsers(); + } + } + } -- cgit v1.2.3