Author: limpbizkit
Date: Wed Jun 24 09:11:56 2009
New Revision: 1037
Modified:
trunk/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
trunk/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
trunk/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
trunk/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
Log:
Fixing servlet tests. Guice servlet is tested with EasyMock, and so that
means when you change the implementation details you must also change the
tests!
Modified:
trunk/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
==============================================================================
--- trunk/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
(original)
+++ trunk/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
Wed Jun 24 09:11:56 2009
@@ -5,6 +5,7 @@
import com.google.inject.Key;
import com.google.inject.internal.Maps;
import com.google.inject.internal.Sets;
+import com.google.inject.spi.BindingScopingVisitor;
import java.io.IOException;
import java.util.Enumeration;
import java.util.HashMap;
@@ -18,6 +19,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import junit.framework.TestCase;
+import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
@@ -33,17 +35,20 @@
public final void testFilterInitAndConfig() throws ServletException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
final MockFilter mockFilter = new MockFilter();
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(Filter.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
expect(injector.getInstance(Key.get(Filter.class)))
.andReturn(mockFilter)
.anyTimes();
- replay(injector);
+ replay(binding, injector);
//some init params
//noinspection SSBasedInspection
@@ -85,12 +90,15 @@
public final void testFilterCreateDispatchDestroy() throws
ServletException, IOException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
final MockFilter mockFilter = new MockFilter();
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(Filter.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
expect(injector.getInstance(Key.get(Filter.class)))
.andReturn(mockFilter)
@@ -98,7 +106,7 @@
expect(request.getServletPath()).andReturn("/index.html");
- replay(injector, request);
+ replay(injector, binding, request);
String pattern = "/*";
final FilterDefinition filterDef = new FilterDefinition(pattern,
Key.get(Filter.class),
@@ -133,6 +141,7 @@
throws ServletException, IOException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
final MockFilter mockFilter = new MockFilter() {
@@ -144,8 +153,10 @@
}
};
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(Filter.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
expect(injector.getInstance(Key.get(Filter.class)))
.andReturn(mockFilter)
@@ -153,7 +164,7 @@
expect(request.getServletPath()).andReturn("/index.html");
- replay(injector, request);
+ replay(injector, binding, request);
String pattern = "/*";
final FilterDefinition filterDef = new FilterDefinition(pattern,
Key.get(Filter.class),
Modified:
trunk/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
==============================================================================
---
trunk/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
(original)
+++
trunk/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
Wed Jun 24 09:11:56 2009
@@ -19,6 +19,7 @@
import com.google.inject.Binding;
import com.google.inject.Injector;
import com.google.inject.Key;
+import com.google.inject.spi.BindingScopingVisitor;
import com.google.inject.internal.Maps;
import com.google.inject.internal.Sets;
import java.io.IOException;
@@ -31,6 +32,7 @@
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.anyObject;
/**
* Ensures servlet spec compliance for CGI-style variables and general
@@ -58,11 +60,14 @@
final String expectedServletPath) throws IOException,
ServletException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
final boolean[] run = new boolean[1];
//get an instance of this servlet
@@ -83,7 +88,7 @@
expect(request.getServletPath())
.andReturn(requestPath);
- replay(injector, request);
+ replay(injector, binding, request);
ServletDefinition servletDefinition = new ServletDefinition(mapping,
Key.get(HttpServlet.class),
UriPatternType.get(UriPatternType.SERVLET, mapping), new
HashMap<String, String>());
@@ -125,11 +130,14 @@
throws IOException, ServletException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
final boolean[] run = new boolean[1];
//get an instance of this servlet
@@ -169,7 +177,7 @@
expect(request.getContextPath())
.andReturn(contextPath);
- replay(injector, request);
+ replay(injector, binding, request);
ServletDefinition servletDefinition = new ServletDefinition(mapping,
Key.get(HttpServlet.class),
UriPatternType.get(UriPatternType.SERVLET, mapping), new
HashMap<String, String>());
@@ -215,11 +223,14 @@
throws IOException, ServletException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
final boolean[] run = new boolean[1];
//get an instance of this servlet
@@ -259,7 +270,7 @@
expect(request.getContextPath())
.andReturn(contextPath);
- replay(injector, request);
+ replay(injector, binding, request);
ServletDefinition servletDefinition = new ServletDefinition(mapping,
Key.get(HttpServlet.class),
UriPatternType.get(UriPatternType.REGEX, mapping), new
HashMap<String, String>());
Modified:
trunk/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
==============================================================================
--- trunk/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
(original)
+++ trunk/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
Wed Jun 24 09:11:56 2009
@@ -19,6 +19,7 @@
import com.google.inject.Binding;
import com.google.inject.Injector;
import com.google.inject.Key;
+import com.google.inject.spi.BindingScopingVisitor;
import com.google.inject.internal.Maps;
import com.google.inject.internal.Sets;
import java.util.Enumeration;
@@ -32,6 +33,7 @@
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.anyObject;
/**
* Basic unit test for lifecycle of a ServletDefinition (wrapper).
@@ -42,16 +44,19 @@
public final void testServletInitAndConfig() throws ServletException {
Injector injector = createMock(Injector.class);
+ Binding binding = createMock(Binding.class);
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
final HttpServlet mockServlet = new HttpServlet() {
};
expect(injector.getInstance(Key.get(HttpServlet.class)))
.andReturn(mockServlet)
.anyTimes();
- replay(injector);
+ replay(injector, binding);
//some init params
//noinspection SSBasedInspection
Modified:
trunk/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
==============================================================================
---
trunk/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
(original)
+++
trunk/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
Wed Jun 24 09:11:56 2009
@@ -20,6 +20,7 @@
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
+import com.google.inject.spi.BindingScopingVisitor;
import com.google.inject.internal.ImmutableList;
import com.google.inject.internal.Maps;
import com.google.inject.internal.Sets;
@@ -41,6 +42,7 @@
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import static org.easymock.EasyMock.anyObject;
/**
* Tests forwarding and inclusion (RequestDispatcher actions from the
@@ -61,6 +63,7 @@
new HashMap<String, String>());
final Injector injector = createMock(Injector.class);
+ final Binding binding = createMock(Binding.class);
final HttpServletRequest mockRequest =
createMock(HttpServletRequest.class);
expect(mockRequest.getAttribute(A_KEY))
@@ -77,8 +80,10 @@
}
};
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
expect(injector.getInstance(HTTP_SERLVET_KEY))
.andReturn(mockServlet);
@@ -94,7 +99,7 @@
expect(injector.getInstance(servetDefsKey))
.andReturn(ImmutableList.of(servletDefinition));
- replay(injector, mockRequest, mockBinding);
+ replay(injector, binding, mockRequest, mockBinding);
// Have to init the Servlet before we can dispatch to it.
servletDefinition.init(null, injector,
@@ -119,6 +124,7 @@
new HashMap<String, String>());
final Injector injector = createMock(Injector.class);
+ final Binding binding = createMock(Binding.class);
final HttpServletRequest mockRequest =
createMock(HttpServletRequest.class);
final HttpServletResponse mockResponse =
createMock(HttpServletResponse.class);
@@ -142,8 +148,10 @@
}
};
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
expect(injector.getInstance(HTTP_SERLVET_KEY))
.andReturn(mockServlet);
@@ -159,7 +167,7 @@
expect(injector.getInstance(servetDefsKey))
.andReturn(ImmutableList.of(servletDefinition));
- replay(injector, mockRequest, mockResponse, mockBinding);
+ replay(injector, binding, mockRequest, mockResponse, mockBinding);
// Have to init the Servlet before we can dispatch to it.
servletDefinition.init(null, injector,
@@ -197,6 +205,7 @@
new HashMap<String, String>());
final Injector injector = createMock(Injector.class);
+ final Binding binding = createMock(Binding.class);
final HttpServletRequest mockRequest =
createMock(HttpServletRequest.class);
final HttpServletResponse mockResponse =
createMock(HttpServletResponse.class);
@@ -212,8 +221,10 @@
}
};
+ expect(binding.acceptScopingVisitor((BindingScopingVisitor)
anyObject()))
+ .andReturn(true);
expect(injector.getBinding(Key.get(HttpServlet.class)))
- .andReturn(createMock(Binding.class));
+ .andReturn(binding);
expect(injector.getInstance(Key.get(HttpServlet.class)))
.andReturn(mockServlet);
@@ -230,7 +241,7 @@
expect(injector.getInstance(servetDefsKey))
.andReturn(ImmutableList.of(servletDefinition));
- replay(injector, mockRequest, mockResponse, mockBinding);
+ replay(injector, binding, mockRequest, mockResponse, mockBinding);
// Have to init the Servlet before we can dispatch to it.
servletDefinition.init(null, injector,
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
