From 977affb7b8633a7bee43d2fd40a86de21c62492e Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Wed, 9 May 2018 11:32:47 +0300 Subject: Fix broken integration tests (#10900) --- .../websocket/ServletIntegrationWebsocketIT.java | 18 ++++++++++++++++++ .../jsr356/ServletIntegrationJSR356WebsocketIT.java | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'test/servlet-containers') diff --git a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java index 668f8611a4..817d964da2 100644 --- a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java +++ b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java @@ -17,8 +17,11 @@ package com.vaadin.tests.integration.websocket; import static org.junit.Assert.assertEquals; +import java.util.HashSet; +import java.util.Set; import java.util.stream.Stream; +import org.junit.Assume; import org.junit.Test; import org.openqa.selenium.WebElement; @@ -29,6 +32,21 @@ public class ServletIntegrationWebsocketIT extends AbstractServletIntegrationTest { // Uses the test method declared in the super class + private static final Set nonWebsocketServers = new HashSet<>(); + + static { + nonWebsocketServers.add("liberty-microprofile"); + } + + @Override + public void setup() throws Exception { + Assume.assumeFalse("This server does not support Websockets", + nonWebsocketServers + .contains(System.getProperty("server-name"))); + + super.setup(); + } + @Override protected String getTestPath() { return "/run/ServletIntegrationWebsocketUI"; diff --git a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java index 1e703bc4ad..4bb0c2343d 100644 --- a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java +++ b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java @@ -30,12 +30,11 @@ public class ServletIntegrationJSR356WebsocketIT static { nonJSR356Servers.add("jetty8"); - nonJSR356Servers.add("liberty-microprofile"); } @Override public void setup() throws Exception { - Assume.assumeFalse("Jetty 8 does not support JSR356", + Assume.assumeFalse("This server does not support JSR356", nonJSR356Servers.contains(System.getProperty("server-name"))); super.setup(); -- cgit v1.2.3