Update atmosphere-runtime to 2.1.2.vaadin6. (#14674, #14861)

Change-Id: Ie239bf110909f8acb47f2141431965061f9ac407

1 files changed, 2 insertions, 22 deletions

diff --git a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java b/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
index 778c8b9113..ddcc6d5d76 100644
--- a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
@@ -35,30 +35,10 @@ import com.vaadin.tests.tb3.MultiBrowserTest.Browser;
  * @author Vaadin Ltd
  */
 @TestCategory("push")
-public abstract class WebsocketTest extends PrivateTB3Configuration {
-    private static List<DesiredCapabilities> websocketBrowsers = new ArrayList<DesiredCapabilities>();
-    static {
-        websocketBrowsers.addAll(MultiBrowserTest.getAllBrowsers());
-        websocketBrowsers.remove(Browser.IE8.getDesiredCapabilities());
-        websocketBrowsers.remove(Browser.IE9.getDesiredCapabilities());
-        websocketBrowsers.remove(Browser.PHANTOMJS.getDesiredCapabilities());
-    }
-
-    /**
-     * @return All supported browsers which are actively tested and support
-     *         websockets
-     */
-    public static List<DesiredCapabilities> getWebsocketBrowsers() {
-        return Collections.unmodifiableList(websocketBrowsers);
-    }
+public abstract class WebsocketTest extends MultiBrowserTest {
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.tests.tb3.AbstractTB3Test#getBrowserToRunOn()
-     */
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        return new ArrayList<DesiredCapabilities>(getWebsocketBrowsers());
+        return new ArrayList<DesiredCapabilities>(getBrowsersSupportingWebSocket());
     }
 }