From 081663e522cd5d62922c264c8f6e44d413c8c326 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 28 Apr 2017 09:41:58 -0700
Subject: [PATCH] Issue #207 - more test fixes

---
 .../server/DeploymentExceptionTest.java       | 33 ++++++++++++++++---
 .../wsuf-alt-config-via-listener.xml          | 26 +++++++++++++++
 .../resources/wsuf-config-via-listener.xml    | 26 +++++++++++++++
 .../wsuf-config-via-servlet-init.xml          | 28 ++++++++++++++++
 4 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 jetty-websocket/websocket-tests/src/test/resources/wsuf-alt-config-via-listener.xml
 create mode 100644 jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-listener.xml
 create mode 100644 jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-servlet-init.xml

diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DeploymentExceptionTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DeploymentExceptionTest.java
index 26cd043dfc5..ea1be34c6e5 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DeploymentExceptionTest.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DeploymentExceptionTest.java
@@ -21,13 +21,14 @@ package org.eclipse.jetty.websocket.jsr356.server;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Executor;
 
 import javax.websocket.DeploymentException;
 import javax.websocket.server.ServerEndpoint;
 
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.websocket.jsr356.server.samples.InvalidCloseIntSocket;
 import org.eclipse.jetty.websocket.jsr356.server.samples.InvalidErrorErrorSocket;
 import org.eclipse.jetty.websocket.jsr356.server.samples.InvalidErrorExceptionSocket;
@@ -37,6 +38,8 @@ import org.eclipse.jetty.websocket.jsr356.server.samples.InvalidOpenIntSocket;
 import org.eclipse.jetty.websocket.jsr356.server.samples.InvalidOpenSessionIntSocket;
 import org.eclipse.jetty.websocket.server.NativeWebSocketConfiguration;
 import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -79,16 +82,36 @@ public class DeploymentExceptionTest
     @Parameterized.Parameter(0)
     public Class<?> pojo;
     
+    private Server server;
+    private HandlerCollection contexts;
+    
+    @Before
+    public void startServer() throws Exception
+    {
+        server = new Server(0);
+        contexts = new HandlerCollection(true, new Handler[0]);
+        server.setHandler(contexts);
+        server.start();
+    }
+    
+    @After
+    public void stopServer() throws Exception
+    {
+        server.stop();
+    }
+    
     @Test
     public void testDeploy_InvalidSignature() throws Exception
     {
         ServletContextHandler context = new ServletContextHandler();
+        
         WebSocketServerFactory serverFactory = new WebSocketServerFactory(context.getServletContext());
         NativeWebSocketConfiguration configuration = new NativeWebSocketConfiguration(serverFactory);
-        Executor executor = new QueuedThreadPool();
-        ServerContainer container = new ServerContainer(configuration, executor);
-        context.addBean(container);
         
+        ServerContainer container = new ServerContainer(configuration, server.getThreadPool());
+        context.addBean(container);
+    
+        contexts.addHandler(context);
         try
         {
             context.start();
diff --git a/jetty-websocket/websocket-tests/src/test/resources/wsuf-alt-config-via-listener.xml b/jetty-websocket/websocket-tests/src/test/resources/wsuf-alt-config-via-listener.xml
new file mode 100644
index 00000000000..993eb4b619b
--- /dev/null
+++ b/jetty-websocket/websocket-tests/src/test/resources/wsuf-alt-config-via-listener.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+		 http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+  version="3.1">
+
+  <listener>
+    <listener-class>org.eclipse.jetty.websocket.tests.server.InfoContextAltAttributeListener</listener-class>
+  </listener>
+
+  <filter>
+    <filter-name>wsuf-alt</filter-name>
+    <filter-class>org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter</filter-class>
+    <init-param>
+      <param-name>configAttributeKey</param-name>
+      <param-value>alt.config</param-value>
+    </init-param>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>wsuf-alt</filter-name>
+    <url-pattern>/info/*</url-pattern>
+  </filter-mapping>
+</web-app>
diff --git a/jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-listener.xml b/jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-listener.xml
new file mode 100644
index 00000000000..67479ff43be
--- /dev/null
+++ b/jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-listener.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
+    <!-- disable JSR-356 -->
+    <context-param>
+        <param-name>org.eclipse.jetty.websocket.jsr356</param-name>
+        <param-value>false</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.eclipse.jetty.websocket.tests.server.InfoContextAttributeListener</listener-class>
+    </listener>
+
+    <filter>
+        <filter-name>wsuf</filter-name>
+        <filter-class>org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>wsuf</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
diff --git a/jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-servlet-init.xml b/jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-servlet-init.xml
new file mode 100644
index 00000000000..7ba466ed6eb
--- /dev/null
+++ b/jetty-websocket/websocket-tests/src/test/resources/wsuf-config-via-servlet-init.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
+    <!-- disable JSR-356 -->
+    <context-param>
+        <param-name>org.eclipse.jetty.websocket.jsr356</param-name>
+        <param-value>false</param-value>
+    </context-param>
+
+    <servlet>
+        <servlet-name>info-servlet</servlet-name>
+        <servlet-class>org.eclipse.jetty.websocket.tests.server.InfoServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <filter>
+        <filter-name>wsuf</filter-name>
+        <filter-class>org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>wsuf</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>