svn commit: r1496184 - in /tomcat/trunk/test/org/apache: catalina/filters/TesterServletContext.java tomcat/websocket/server/TestWsServerContainer.java

[ma...@apache.org]

Author: markt
Date: Mon Jun 24 19:58:05 2013
New Revision: 1496184

URL: http://svn.apache.org/r1496184
Log:
More matching tests based on spec examples.

Modified:
    tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java
    tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java

Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java?rev=1496184&r1=1496183&r2=1496184&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java Mon Jun 24 19:58:05 2013
@@ -36,6 +36,10 @@ import javax.servlet.SessionCookieConfig
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
+import org.apache.catalina.core.ApplicationFilterRegistration;
+import org.apache.catalina.core.TesterContext;
+import org.apache.catalina.deploy.FilterDef;
+
 public class TesterServletContext implements ServletContext {
 
     @Override
@@ -137,8 +141,7 @@ public class TesterServletContext implem
 
     @Override
     public String getInitParameter(String name) {
-
-        throw new RuntimeException("Not implemented");
+        return null;
     }
 
     @Override
@@ -236,7 +239,8 @@ public class TesterServletContext implem
     @Override
     public javax.servlet.FilterRegistration.Dynamic addFilter(
             String filterName, Class<? extends Filter> filterClass) {
-        throw new RuntimeException("Not implemented");
+        return new ApplicationFilterRegistration(
+                new FilterDef(), new TesterContext());
     }
 
     @Override

Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1496184&r1=1496183&r2=1496184&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Mon Jun 24 19:58:05 2013
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.deploy.ApplicationListener;
+import org.apache.catalina.filters.TesterServletContext;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -72,4 +73,43 @@ public class TestWsServerContainer exten
             }
         }
     }
+
+
+    @Test
+    public void testSpecExample3() throws Exception {
+        WsServerContainer sc = WsServerContainer.getServerContainer();
+        sc.setServletContext(new TesterServletContext());
+
+        ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
+                Object.class, "/a/{var}/c").build();
+        ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
+                Object.class, "/a/b/c").build();
+        ServerEndpointConfig configC = ServerEndpointConfig.Builder.create(
+                Object.class, "/a/{var1}/{var2}").build();
+
+        sc.addEndpoint(configA);
+        sc.addEndpoint(configB);
+        sc.addEndpoint(configC);
+
+        Assert.assertEquals(configB, sc.findMapping("/a/b/c").getConfig());
+        Assert.assertEquals(configA, sc.findMapping("/a/d/c").getConfig());
+        Assert.assertEquals(configC, sc.findMapping("/a/x/y").getConfig());
+    }
+
+
+    @Test
+    public void testSpecExample4() throws Exception {
+        WsServerContainer sc = WsServerContainer.getServerContainer();
+        sc.setServletContext(new TesterServletContext());
+
+        ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
+                Object.class, "/{var1}/d").build();
+        ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
+                Object.class, "/b/{var2}").build();
+
+        sc.addEndpoint(configA);
+        sc.addEndpoint(configB);
+
+        Assert.assertEquals(configB, sc.findMapping("/b/d").getConfig());
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org