minor cleanups to servlet extension tests. change asserts that were using the JDK "assert" keyword to assertTrue, add missing EasyMock.verify calls, and fix things that were failing as a result of changing those.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1190 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java b/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
index 4729972..10e507a 100644
--- a/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
+++ b/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
@@ -60,10 +60,6 @@
put("ahsd124124", "as124124124dasdok");
}};
- String pattern = "/*";
- final FilterDefinition filterDef = new FilterDefinition(pattern, Key.get(Filter.class),
- UriPatternType.get(UriPatternType.SERVLET, pattern), initParams);
- assert filterDef.getFilter() instanceof MockFilter;
ServletContext servletContext = createMock(ServletContext.class);
final String contextName = "thing__!@@44";
@@ -71,21 +67,27 @@
replay(servletContext);
+ String pattern = "/*";
+ final FilterDefinition filterDef = new FilterDefinition(pattern, Key.get(Filter.class),
+ UriPatternType.get(UriPatternType.SERVLET, pattern), initParams);
filterDef.init(servletContext, injector,
Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ assertTrue(filterDef.getFilter() instanceof MockFilter);
final FilterConfig filterConfig = mockFilter.getConfig();
- assert null != filterConfig;
- assert contextName.equals(filterConfig.getServletContext().getServletContextName());
- assert Key.get(Filter.class).toString().equals(filterConfig.getFilterName());
+ assertTrue(null != filterConfig);
+ assertTrue(contextName.equals(filterConfig.getServletContext().getServletContextName()));
+ assertTrue(Key.get(Filter.class).toString().equals(filterConfig.getFilterName()));
final Enumeration names = filterConfig.getInitParameterNames();
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
- assert initParams.containsKey(name);
- assert initParams.get(name).equals(filterConfig.getInitParameter(name));
+ assertTrue(initParams.containsKey(name));
+ assertTrue(initParams.get(name).equals(filterConfig.getInitParameter(name)));
}
+
+ verify(binding, injector, servletContext);
}
public final void testFilterCreateDispatchDestroy() throws ServletException, IOException {
@@ -110,14 +112,13 @@
String pattern = "/*";
final FilterDefinition filterDef = new FilterDefinition(pattern, Key.get(Filter.class),
- UriPatternType.get(UriPatternType.SERVLET, pattern), new HashMap<String, String>());
- assert filterDef.getFilter() instanceof MockFilter;
-
+ UriPatternType.get(UriPatternType.SERVLET, pattern), new HashMap<String, String>());
//should fire on mockfilter now
filterDef.init(createMock(ServletContext.class), injector,
Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ assertTrue(filterDef.getFilter() instanceof MockFilter);
- assert mockFilter.isInit() : "Init did not fire";
+ assertTrue("Init did not fire", mockFilter.isInit());
final boolean proceed[] = new boolean[1];
filterDef.doFilter(request, null, new FilterChainInvocation(null, null, null) {
@@ -169,13 +170,13 @@
String pattern = "/*";
final FilterDefinition filterDef = new FilterDefinition(pattern, Key.get(Filter.class),
UriPatternType.get(UriPatternType.SERVLET, pattern), new HashMap<String, String>());
- assert filterDef.getFilter() instanceof MockFilter;
-
//should fire on mockfilter now
filterDef.init(createMock(ServletContext.class), injector,
- Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ assertTrue(filterDef.getFilter() instanceof MockFilter);
- assert mockFilter.isInit() : "Init did not fire";
+
+ assertTrue("init did not fire", mockFilter.isInit());
final boolean proceed[] = new boolean[1];
filterDef.doFilter(request, null, new FilterChainInvocation(null, null, null) {
@@ -185,10 +186,10 @@
}
});
- assert !proceed[0] : "Filter did not suppress chain";
+ assertTrue("filter did not suppress chain", !proceed[0]);
filterDef.destroy(Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
- assert mockFilter.isDestroy() : "Destroy did not fire";
+ assertTrue("destroy did not fire", mockFilter.isDestroy());
verify(injector, request);
diff --git a/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java b/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java
index 4573c35..ebd6b08 100644
--- a/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java
+++ b/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java
@@ -102,9 +102,9 @@
assertTrue(servlet.processedUris.contains("/index.html"));
assertTrue(servlet.processedUris.contains(TestServlet.FORWARD_TO));
- assert inits == 5 && doFilters == 3 && destroys == 5 : "lifecycle states did not"
- + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ assertTrue("lifecycle states did not"
+ + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters
+ + "; destroys: " + destroys, inits == 1 && doFilters == 3 && destroys == 1);
}
public final void testDispatchThatNoFiltersFire() throws ServletException, IOException {
@@ -140,9 +140,10 @@
pipeline.destroyPipeline();
control.verify();
- assert inits == 5 && doFilters == 0 && destroys == 5 : "lifecycle states did not "
- + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ assertTrue("lifecycle states did not "
+ + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters
+ + "; destroys: " + destroys,
+ inits == 1 && doFilters == 0 && destroys == 1);
}
public final void testDispatchFilterPipelineWithRegexMatching() throws ServletException,
@@ -177,9 +178,10 @@
pipeline.destroyPipeline();
control.verify();
- assert inits == 3 && doFilters == 2 && destroys == 3 : "lifecycle states did not fire "
- + "correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ assertTrue("lifecycle states did not fire "
+ + "correct number of times-- inits: " + inits + "; dos: " + doFilters
+ + "; destroys: " + destroys,
+ inits == 1 && doFilters == 2 && destroys == 1);
}
@Singleton
diff --git a/servlet/test/com/google/inject/servlet/FilterPipelineTest.java b/servlet/test/com/google/inject/servlet/FilterPipelineTest.java
index e9e6e97..a9701b3 100644
--- a/servlet/test/com/google/inject/servlet/FilterPipelineTest.java
+++ b/servlet/test/com/google/inject/servlet/FilterPipelineTest.java
@@ -112,7 +112,7 @@
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
FilterChain filterChain) throws IOException, ServletException {
- assert false : "This filter should never have fired";
+ fail("This filter should never have fired");
}
public void destroy() {
diff --git a/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java b/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java
index 47fe893..32b6bd5 100644
--- a/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java
+++ b/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java
@@ -159,7 +159,7 @@
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
FilterChain filterChain) throws IOException, ServletException {
- assert false : "This filter should never have fired";
+ fail("This filter should never have fired");
}
public void destroy() {
diff --git a/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java b/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java
index 62550e3..02ddbd5 100644
--- a/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java
+++ b/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java
@@ -83,9 +83,10 @@
verify(requestMock);
- assert inits == 5 && doFilters == 3 && destroys == 5 : "lifecycle states did not"
+ assertTrue("lifecycle states did not"
+ " fire correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ + "; destroys: " + destroys,
+ inits == 1 && doFilters == 3 && destroys == 1);
}
@Singleton
diff --git a/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java b/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
index bdc69c4..724935a 100644
--- a/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
+++ b/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
@@ -35,6 +35,7 @@
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
/**
* Ensures servlet spec compliance for CGI-style variables and general
@@ -100,6 +101,8 @@
servletDefinition.doService(request, response);
assertTrue("Servlet did not run!", run[0]);
+
+ verify(injector, binding, request);
}
@@ -192,6 +195,7 @@
assertTrue("Servlet did not run!", run[0]);
+ verify(injector, binding, request);
}
// Data-driven test.
@@ -286,5 +290,7 @@
servletDefinition.doService(request, response);
assertTrue("Servlet did not run!", run[0]);
+
+ verify(injector, binding, request);
}
}
diff --git a/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java b/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
index 0c6af1c..d848aaa 100644
--- a/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
+++ b/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
@@ -34,6 +34,7 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.verify;
/**
* Basic unit test for lifecycle of a ServletDefinition (wrapper).
@@ -96,5 +97,7 @@
assertTrue(initParams.containsKey(name));
assertEquals(initParams.get(name), servletConfig.getInitParameter(name));
}
+
+ verify(injector, binding, servletContext);
}
}
diff --git a/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java b/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java
index 168f7d5..66e56f1 100644
--- a/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java
+++ b/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java
@@ -73,9 +73,10 @@
verify(requestMock);
- assert inits == 5 && doFilters == 3 && destroys == 5 : "lifecycle states did not"
- + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ assertTrue("lifecycle states did not"
+ + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters
+ + "; destroys: " + destroys,
+ inits == 1 && doFilters == 3 && destroys == 1);
}
public final void testDispatchThatNoFiltersFire() throws ServletException, IOException {
@@ -108,9 +109,10 @@
verify(requestMock);
- assert inits == 5 && doFilters == 0 && destroys == 5 : "lifecycle states did not "
- + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ assertTrue("lifecycle states did not "
+ + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters
+ + "; destroys: " + destroys,
+ inits == 1 && doFilters == 0 && destroys == 1);
}
public final void testDispatchFilterPipelineWithRegexMatching() throws ServletException,
@@ -144,9 +146,10 @@
verify(requestMock);
- assert inits == 3 && doFilters == 2 && destroys == 3 : "lifecycle states did not fire "
- + "correct number of times-- inits: " + inits + "; dos: " + doFilters
- + "; destroys: " + destroys;
+ assertTrue("lifecycle states did not fire "
+ + "correct number of times-- inits: " + inits + "; dos: " + doFilters
+ + "; destroys: " + destroys,
+ inits == 1 && doFilters == 2 && destroys == 1);
}
@Singleton
