Author: apetrelli
Date: Wed Jan 12 11:57:29 2011
New Revision: 1058097
URL: http://svn.apache.org/viewvc?rev=1058097&view=rev
Log:
TILESSB-38
Fixed tiles-servlet Checkstyle (take 2).
Fixed some checkstyle rules.
Modified:
tiles/maven/trunk/build/tiles_checks_v5.xml
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
Modified: tiles/maven/trunk/build/tiles_checks_v5.xml
URL:
http://svn.apache.org/viewvc/tiles/maven/trunk/build/tiles_checks_v5.xml?rev=1058097&r1=1058096&r2=1058097&view=diff
==============================================================================
--- tiles/maven/trunk/build/tiles_checks_v5.xml (original)
+++ tiles/maven/trunk/build/tiles_checks_v5.xml Wed Jan 12 11:57:29 2011
@@ -35,7 +35,9 @@
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
- <module name="AvoidStarImport"/>
+ <module name="AvoidStarImport">
+ <property name="allowStaticMemberImports" value="true"/>
+ </module>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
@@ -69,7 +71,6 @@
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
<module name="InnerAssignment"/>
- <module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
Modified:
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java?rev=1058097&r1=1058096&r2=1058097&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
Wed Jan 12 11:57:29 2011
@@ -38,7 +38,7 @@ import org.junit.Test;
public class AbstractTilesListenerTest {
/**
- * Test method for {...@link
org.apache.tiles.web.startup.AbstractTilesListener#contextInitialized(javax.servlet.ServletContextEvent)}.
+ * Test method for {...@link
AbstractTilesListener#contextInitialized(ServletContextEvent)}.
*/
@Test
public void testContextInitialized() {
Modified:
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java?rev=1058097&r1=1058096&r2=1058097&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
Wed Jan 12 11:57:29 2011
@@ -48,12 +48,24 @@ import org.junit.Test;
*/
public class ServletContextAdapterTest {
+ /**
+ * The servlet configuration.
+ */
private ServletConfig config;
+ /**
+ * The servlet context.
+ */
private ServletContext servletContext;
+ /**
+ * First set of param names.
+ */
private Enumeration<String> names1;
+ /**
+ * Second set of param names.
+ */
private Enumeration<String> names2;
/**
@@ -88,6 +100,9 @@ public class ServletContextAdapterTest {
replay(names1, names2);
}
+ /**
+ * Tears down the test.
+ */
@After
public void tearDown() {
verify(config, servletContext, names1, names2);
@@ -281,7 +296,7 @@ public class ServletContextAdapterTest {
}
/**
- * Test method for {...@link
org.apache.tiles.web.util.ServletContextAdapter#log(java.lang.Exception,
java.lang.String)}.
+ * Test method for {...@link
ServletContextAdapter#log(java.lang.Exception, java.lang.String)}.
*/
@SuppressWarnings("deprecation")
@Test
@@ -295,7 +310,7 @@ public class ServletContextAdapterTest {
}
/**
- * Test method for {...@link
org.apache.tiles.web.util.ServletContextAdapter#log(java.lang.String,
java.lang.Throwable)}.
+ * Test method for {...@link ServletContextAdapter#log(java.lang.String,
java.lang.Throwable)}.
*/
@Test
public void testLogStringThrowable() {
@@ -355,7 +370,7 @@ public class ServletContextAdapterTest {
names.add("one");
names.add("two");
names.add("three");
- for (Enumeration<String> enumeration =
adapter.getInitParameterNames(); enumeration.hasMoreElements(); ) {
+ for (Enumeration<String> enumeration =
adapter.getInitParameterNames(); enumeration.hasMoreElements();) {
String name = enumeration.nextElement();
assertTrue(names.remove(name));
}
@@ -391,7 +406,7 @@ public class ServletContextAdapterTest {
}
/**
- * Test method for {...@link
org.apache.tiles.web.util.ServletContextAdapter#setAttribute(java.lang.String,
java.lang.Object)}.
+ * Test method for {...@link
ServletContextAdapter#setAttribute(java.lang.String, java.lang.Object)}.
*/
@Test
public void testSetAttribute() {
Modified:
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java?rev=1058097&r1=1058096&r2=1058097&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
Wed Jan 12 11:57:29 2011
@@ -50,10 +50,19 @@ import org.junit.Test;
*/
public class TilesDecorationFilterTest {
+ /**
+ * The filter configuration.
+ */
private FilterConfig config;
+ /**
+ * The servlet context.
+ */
private ServletContext servletContext;
+ /**
+ * The filter to test.
+ */
private TilesDecorationFilter filter;
/**
@@ -94,7 +103,7 @@ public class TilesDecorationFilterTest {
}
/**
- * Test method for {...@link
org.apache.tiles.web.util.TilesDecorationFilter#doFilter(javax.servlet.ServletRequest,
javax.servlet.ServletResponse, javax.servlet.FilterChain)}.
+ * Test method for {...@link
TilesDecorationFilter#doFilter(ServletRequest, ServletResponse, FilterChain)}.
* @throws ServletException If something goes wrong
* @throws IOException If something goes wrong.
*/
@@ -110,7 +119,8 @@ public class TilesDecorationFilterTest {
AttributeContext attributeContext = createMock(AttributeContext.class);
expect(request.getAttribute("org.apache.tiles.decoration.PREVENT:tokenKey")).andReturn(null);
-
expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext);
+
expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE))
+ .andReturn(applicationContext);
expect(applicationContext.getApplicationScope()).andReturn(applicationScope);
expect(applicationScope.get("key")).andReturn(container);
expect(container.getAttributeContext(isA(ServletRequest.class))).andReturn(attributeContext);
@@ -120,11 +130,16 @@ public class TilesDecorationFilterTest {
container.render(eq("definitionKey"), isA(ServletRequest.class));
chain.doFilter(request, response);
- replay(servletContext, request, response, chain, applicationContext,
applicationScope, container, attributeContext);
+ replay(servletContext, request, response, chain, applicationContext,
+ applicationScope, container, attributeContext);
filter.doFilter(request, response, chain);
verify(request, response, chain, applicationContext, applicationScope,
container, attributeContext);
}
+ /**
+ * Internal mutator for testing.
+ *
+ */
public static class CustomAttributeMutator implements
AttributeContextMutator {
@Override
