Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-04-05 00:00:01 -04:00
Code Issues Projects Releases Wiki Activity

New code style. No functional changes.

Browse Source
This commit is contained in:
Harald Kuhr
2011-02-17 16:53:08 +01:00
parent 1433a24052
commit 5bd896f80f
65 changed files with 1028 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTestCase.java
View File

@@ -1,10 +1,9 @@
package com.twelvemonkeys.servlet;
import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
import javax.servlet.*;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/**
* GenericFilterTestCase
@@ -30,12 +29,12 @@ public final class GenericFilterTestCase extends FilterAbstractTestCase {
fail(e.getMessage());
}
assertFalse("OncePerRequest should default to false", filter.mOncePerRequest);
assertFalse("OncePerRequest should default to false", filter.oncePerRequest);
filter.destroy();
// TRUE
filter = new GenericFilterImpl();
Map params = new HashMap();
Map<String, String> params = new HashMap<String, String>();
params.put("once-per-request", "true");
try {
@@ -45,12 +44,12 @@ public final class GenericFilterTestCase extends FilterAbstractTestCase {
fail(e.getMessage());
}
assertTrue("oncePerRequest should be true", filter.mOncePerRequest);
assertTrue("oncePerRequest should be true", filter.oncePerRequest);
filter.destroy();
// TRUE
filter = new GenericFilterImpl();
params = new HashMap();
params = new HashMap<String, String>();
params.put("oncePerRequest", "true");
try {
@@ -60,7 +59,7 @@ public final class GenericFilterTestCase extends FilterAbstractTestCase {
fail(e.getMessage());
}
assertTrue("oncePerRequest should be true", filter.mOncePerRequest);
assertTrue("oncePerRequest should be true", filter.oncePerRequest);
filter.destroy();
}

12
servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTestCase.java
View File

@@ -35,7 +35,7 @@ public abstract class ServletConfigMapAdapterTestCase extends MapAbstractTestCas
}
private static class TestConfig implements ServletConfig, FilterConfig, ServletContext, Serializable, Cloneable {
Map mMap = new HashMap();
Map map = new HashMap();
public String getServletName() {
return "dummy"; // Not needed for this test
@@ -55,12 +55,12 @@ public abstract class ServletConfigMapAdapterTestCase extends MapAbstractTestCas
}
public String getInitParameter(String s) {
return (String) mMap.get(s);
return (String) map.get(s);
}
public Enumeration getInitParameterNames() {
//noinspection unchecked
return Collections.enumeration(mMap.keySet());
return Collections.enumeration(map.keySet());
}
public ServletContext getContext(String uripath) {
@@ -157,7 +157,7 @@ public abstract class ServletConfigMapAdapterTestCase extends MapAbstractTestCas
public Map makeFullMap() {
ServletConfig config = new TestConfig();
addSampleMappings(((TestConfig) config).mMap);
addSampleMappings(((TestConfig) config).map);
return new ServletConfigMapAdapter(config);
}
}
@@ -171,7 +171,7 @@ public abstract class ServletConfigMapAdapterTestCase extends MapAbstractTestCas
public Map makeFullMap() {
FilterConfig config = new TestConfig();
addSampleMappings(((TestConfig) config).mMap);
addSampleMappings(((TestConfig) config).map);
return new ServletConfigMapAdapter(config);
}
}
@@ -185,7 +185,7 @@ public abstract class ServletConfigMapAdapterTestCase extends MapAbstractTestCas
public Map makeFullMap() {
FilterConfig config = new TestConfig();
addSampleMappings(((TestConfig) config).mMap);
addSampleMappings(((TestConfig) config).map);
return new ServletConfigMapAdapter(config);
}
}