diff options
| author | Artur Signell <artur@vaadin.com> | 2015-04-23 12:54:59 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-23 16:57:32 +0000 |
| commit | efc3617cf50d4e190db3c3891aed01b30b322120 (patch) | |
| tree | f4d8ff05e5337d48286cd1f38a20bba410d26b05 | |
| parent | 9513ddc4251dd9783b13a038aa9060121e9325f9 (diff) | |
| download | vaadin-framework-efc3617cf50d4e190db3c3891aed01b30b322120.tar.gz vaadin-framework-efc3617cf50d4e190db3c3891aed01b30b322120.zip | |
Simplified tracking of servers which support websockets
Change-Id: Ibc1d82a9751c93506bb69970d55adfa810ad0b50
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java index 1883e5f601..885d3521b7 100644 --- a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java +++ b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java @@ -35,32 +35,19 @@ public class ServletIntegrationTests { public static Set<String> notJSR356Compatible = new HashSet<String>(); public static Set<String> notWebsocketCompatible = new HashSet<String>(); static { - notJSR356Compatible.add("jboss4"); - notJSR356Compatible.add("jboss5"); - notJSR356Compatible.add("jboss6"); - notJSR356Compatible.add("jboss7"); notJSR356Compatible.add("jetty7"); notJSR356Compatible.add("jetty8"); - - notJSR356Compatible.add("glassfish3"); - - notJSR356Compatible.add("tomcat6"); notJSR356Compatible.add("tomcat7"); notJSR356Compatible.add("tomcat7apacheproxy"); - notJSR356Compatible.add("weblogic10"); notJSR356Compatible.add("osgi"); // Karaf 3, Jetty 8 - notWebsocketCompatible.add("glassfish2"); // In theory GF3 could work but in reality broken notWebsocketCompatible.add("glassfish3"); notWebsocketCompatible.add("jboss4"); notWebsocketCompatible.add("jboss5"); notWebsocketCompatible.add("jboss6"); notWebsocketCompatible.add("jboss7"); - notWebsocketCompatible.add("jetty5"); - notWebsocketCompatible.add("jetty6"); - notWebsocketCompatible.add("tomcat5"); notWebsocketCompatible.add("tomcat6"); notWebsocketCompatible.add("tomcat7apacheproxy"); notWebsocketCompatible.add("weblogic10"); @@ -69,6 +56,10 @@ public class ServletIntegrationTests { // https://dev.vaadin.com/ticket/16354 // https://developer.ibm.com/answers/questions/186066/websocket-paths-using-uri-templates-do-not-work-pr/ notWebsocketCompatible.add("websphere8"); + + // If a server does not support any kind of websockets it does not + // support JSR-356 either.. + notJSR356Compatible.addAll(notWebsocketCompatible); } public static class ServletIntegrationTestSuite extends TB3TestSuite { |