svn commit: r404801 - /incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java

[jb...@apache.org]

Author: jboynes
Date: Sun May  7 10:08:38 2006
New Revision: 404801

URL: http://svn.apache.org/viewcvs?rev=404801&view=rev
Log:
work around odd equals behaviour of MessageBytes

Modified:
    incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java

Modified: incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java?rev=404801&r1=404800&r2=404801&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java Sun May  7 10:08:38 2006
@@ -128,9 +128,27 @@
         uri.setString("/testContext/magicServlet");
         MappingData mappingData = new MappingData();
         ctx.getMapper().map(uri, mappingData);
-        assertEquals("/magicServlet", mappingData.requestPath.getString());
+        assertTrue(mappingData.requestPath.equals("/magicServlet"));
 
         assertSame(servlet, tuscanyHost.getMapping("/testContext/magicServlet"));
+        host.removeChild(ctx);
+    }
+
+    public void testServletMappingWithWildard() throws Exception {
+        TuscanyHost tuscanyHost = (TuscanyHost) host;
+        host.addChild(ctx);
+
+        MockServlet servlet = new MockServlet();
+        tuscanyHost.registerMapping("/testContext/magicServlet/*", servlet);
+        assertSame(ctx, host.map("/testContext/magicServlet/foo"));
+        MessageBytes uri = MessageBytes.newInstance();
+        uri.setString("/testContext/magicServlet/foo");
+        MappingData mappingData = new MappingData();
+        mappingData.recycle();
+        ctx.getMapper().map(uri, mappingData);
+        assertTrue(mappingData.requestPath.equals("/magicServlet/foo"));
+
+        assertSame(servlet, tuscanyHost.getMapping("/testContext/magicServlet/bar"));
         host.removeChild(ctx);
     }