[google-guice] r1529 committed - issue 418 - make sure servlet extension works with context paths. tha...

google-guice Thu, 24 Mar 2011 06:44:25 -0700

Revision: 1529
Author:   sberlin
Date:     Thu Mar 24 06:43:25 2011

Log: issue 418 - make sure servlet extension works with contextpaths. thanks to Henning for provided the patches.

http://code.google.com/p/google-guice/source/detail?r=1529


Added:

/trunk/extensions/servlet/test/com/google/inject/servlet/ContextPathTest.java

Modified:

/trunk/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java/trunk/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java/trunk/extensions/servlet/test/com/google/inject/servlet/ContinuingRequestIntegrationTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/FilterPipelineTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java/trunk/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java


=======================================
--- /dev/null

+++/trunk/extensions/servlet/test/com/google/inject/servlet/ContextPathTest.javaThu Mar 24 06:43:25 2011

@@ -0,0 +1,293 @@
+/**
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.inject.servlet;
+
+import static org.easymock.EasyMock.createControl;
+import static org.easymock.EasyMock.expect;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import junit.framework.TestCase;
+
+import org.easymock.IMocksControl;
+
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Scopes;
+import com.google.inject.name.Named;
+import com.google.inject.name.Names;
+

+/** Tests to make sure that servlets with a context path are handledright. */

+public class ContextPathTest extends TestCase {
+
+  @Inject @Named("foo")
+  private TestServlet fooServlet;
+
+  @Inject @Named("bar")
+  private TestServlet barServlet;
+
+  private IMocksControl globalControl;
+  private Injector injector;
+  private ServletContext servletContext;
+  private FilterConfig filterConfig;
+  private GuiceFilter guiceFilter;
+
+  @Override
+  public final void setUp() throws Exception {
+    injector = Guice.createInjector(new ServletModule() {
+      @Override
+      protected void configureServlets() {
+        bind(TestServlet.class).annotatedWith(Names.named("foo"))
+            .to(TestServlet.class).in(Scopes.SINGLETON);
+        bind(TestServlet.class).annotatedWith(Names.named("bar"))
+            .to(TestServlet.class).in(Scopes.SINGLETON);

+ serve("/foo/*").with(Key.get(TestServlet.class,Names.named("foo")));+ serve("/bar/*").with(Key.get(TestServlet.class,Names.named("bar")));

+        // TODO: add a filter(..) call and validate it is correct
+      }
+    });
+    injector.injectMembers(this);
+
+    assertNotNull(fooServlet);
+    assertNotNull(barServlet);
+    assertNotSame(fooServlet, barServlet);
+
+    globalControl = createControl();
+    servletContext = globalControl.createMock(ServletContext.class);
+    filterConfig = globalControl.createMock(FilterConfig.class);
+

+expect(servletContext.getAttribute(GuiceServletContextListener.INJECTOR_NAME))

+        .andReturn(injector).anyTimes();

+expect(filterConfig.getServletContext()).andReturn(servletContext).anyTimes();

+
+    globalControl.replay();
+
+    guiceFilter = new GuiceFilter();
+    guiceFilter.init(filterConfig);
+  }
+
+  @Override
+  public final void tearDown() {
+    assertNotNull(fooServlet);
+    assertNotNull(barServlet);
+
+    fooServlet = null;
+    barServlet = null;
+
+    guiceFilter.destroy();
+    guiceFilter = null;
+
+    injector = null;
+
+    filterConfig = null;
+    servletContext = null;
+
+    globalControl.verify();
+  }
+
+  public void testSimple() throws Exception {
+    IMocksControl testControl = createControl();
+    TestFilterChain testFilterChain = new TestFilterChain();

+ HttpServletRequest req =testControl.createMock(HttpServletRequest.class);+ HttpServletResponse res =testControl.createMock(HttpServletResponse.class);

+
+    expect(req.getMethod()).andReturn("GET").anyTimes();
+    expect(req.getRequestURI()).andReturn("/bar/foo").anyTimes();
+    expect(req.getServletPath()).andReturn("/bar/foo").anyTimes();
+    expect(req.getContextPath()).andReturn("").anyTimes();
+
+    testControl.replay();
+
+    guiceFilter.doFilter(req, res, testFilterChain);
+
+    assertFalse(testFilterChain.isTriggered());
+    assertFalse(fooServlet.isTriggered());
+    assertTrue(barServlet.isTriggered());
+
+    testControl.verify();
+  }
+
+  //
+  // each of the following "runTest" calls takes three path parameters:
+  //
+  // The value of "getRequestURI()"
+  // The value of "getServletPath()"
+  // The value of "getContextPath()"
+  //
+  // these values have been captured using a filter in Apache Tomcat 6.0.32

+ // and are used for real-world values that a servlet container wouldsend into

+  // the GuiceFilter.
+  //
+  // the remaining three booleans are:
+  //
+  // True if the request gets passed down the filter chain
+  // True if the request hits the "foo" servlet
+  // True if the request hits the "bar" sevlet
+  //

+ // After adjusting the request URI for the web app deployment location,all

+  // calls
+  // should always produce the same result.
+  //
+
+  // ROOT Web app, using Tomcat default servlet
+  public void testRootDefault() throws Exception {