Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor code to use Java 5 features

Browse Source 
- Apply and use Generics
- Remove JdkVersion.isAtLeastJava15() conditionals
- Replace iterator loops with foreach syntax
- Switch on warning in eclipse

Issues: SWF-1532
This commit is contained in:
Phil Webb
2012-03-29 21:02:07 -07:00
parent 619249b52b
commit 4d008f3f09
457 changed files with 3220 additions and 3148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-faces/src/test/java/org/springframework/faces/config/FacesFlowBuilderServicesBeanDefinitionParserTests.java
View File

@@ -1,7 +1,5 @@
package org.springframework.faces.config;
import java.util.Set;
import junit.framework.TestCase;
import org.springframework.binding.convert.ConversionException;
@@ -91,29 +89,25 @@ public class FacesFlowBuilderServicesBeanDefinitionParserTests extends TestCase
public static class TestConversionService implements ConversionService {
public Object executeConversion(Object source, Class targetClass) throws ConversionException {
public Object executeConversion(Object source, Class<?> targetClass) throws ConversionException {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public Object executeConversion(String converterId, Object source, Class targetClass) {
public Object executeConversion(String converterId, Object source, Class<?> targetClass) {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public ConversionExecutor getConversionExecutor(Class sourceClass, Class targetClass)
public ConversionExecutor getConversionExecutor(Class<?> sourceClass, Class<?> targetClass)
throws ConversionExecutionException {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public ConversionExecutor getConversionExecutor(String id, Class sourceClass, Class targetClass)
public ConversionExecutor getConversionExecutor(String id, Class<?> sourceClass, Class<?> targetClass)
throws ConversionExecutorNotFoundException {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public Set getConversionExecutors(Class sourceClass) {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public Class getClassForAlias(String name) throws ConversionExecutionException {
public Class<?> getClassForAlias(String name) throws ConversionExecutionException {
throw new UnsupportedOperationException("Auto-generated method stub");
}

6
spring-faces/src/test/java/org/springframework/faces/config/ResourcesBeanDefinitionParserTests.java
View File

@@ -21,7 +21,7 @@ public class ResourcesBeanDefinitionParserTests extends TestCase {
}
public void testConfigureDefaults() {
Map map = context.getBeansOfType(HttpRequestHandlerAdapter.class);
Map<String, ?> map = context.getBeansOfType(HttpRequestHandlerAdapter.class);
assertEquals(1, map.values().size());
Object resourceHandler = context.getBean(ResourcesBeanDefinitionParser.RESOURCE_HANDLER_BEAN_NAME);
@@ -31,8 +31,8 @@ public class ResourcesBeanDefinitionParserTests extends TestCase {
map = context.getBeansOfType(SimpleUrlHandlerMapping.class);
assertEquals(1, map.values().size());
SimpleUrlHandlerMapping handlerMapping = (SimpleUrlHandlerMapping) map.values().iterator().next();
assertEquals(ResourcesBeanDefinitionParser.RESOURCE_HANDLER_BEAN_NAME, handlerMapping.getUrlMap().get(
"/javax.faces.resource/**"));
assertEquals(ResourcesBeanDefinitionParser.RESOURCE_HANDLER_BEAN_NAME,
handlerMapping.getUrlMap().get("/javax.faces.resource/**"));
assertEquals(0, handlerMapping.getOrder());
}

6
spring-faces/src/test/java/org/springframework/faces/model/SelectionTrackingActionListenerTests.java
View File

@@ -36,7 +36,7 @@ public class SelectionTrackingActionListenerTests extends TestCase {
/**
* The list of row data objects to
*/
private OneSelectionTrackingListDataModel dataModel;
private OneSelectionTrackingListDataModel<Object> dataModel;
/**
* The delegate action listener that should be called
@@ -51,11 +51,11 @@ public class SelectionTrackingActionListenerTests extends TestCase {
public void setUp() throws Exception {
jsfMockHelper.setUp();
viewToTest = new UIViewRoot();
List rows = new ArrayList();
List<Object> rows = new ArrayList<Object>();
rows.add(new TestRowData());
rows.add(new TestRowData());
rows.add(new TestRowData());
dataModel = new OneSelectionTrackingListDataModel(rows);
dataModel = new OneSelectionTrackingListDataModel<Object>(rows);
}
protected void tearDown() throws Exception {

22
spring-faces/src/test/java/org/springframework/faces/model/converter/DataModelConverterTests.java
View File

@@ -16,28 +16,33 @@ public class DataModelConverterTests extends TestCase {
Converter converter = new DataModelConverter();
@SuppressWarnings("unchecked")
public void testConvertListToDataModel() throws Exception {
List sourceList = new ArrayList();
List<Object> sourceList = new ArrayList<Object>();
DataModel resultModel = (DataModel) converter.convertSourceToTargetClass(sourceList, DataModel.class);
DataModel<Object> resultModel = (DataModel<Object>) converter.convertSourceToTargetClass(sourceList,
DataModel.class);
assertNotNull(resultModel);
assertSame(sourceList, resultModel.getWrappedData());
}
@SuppressWarnings("unchecked")
public void testConvertListToListDataModel() throws Exception {
List sourceList = new ArrayList();
List<Object> sourceList = new ArrayList<Object>();
DataModel resultModel = (DataModel) converter.convertSourceToTargetClass(sourceList, ListDataModel.class);
DataModel<Object> resultModel = (DataModel<Object>) converter.convertSourceToTargetClass(sourceList,
ListDataModel.class);
assertNotNull(resultModel);
assertSame(sourceList, resultModel.getWrappedData());
}
@SuppressWarnings("unchecked")
public void testConvertListToSerializableListDataModel() throws Exception {
List sourceList = new ArrayList();
List<Object> sourceList = new ArrayList<Object>();
DataModel resultModel = (DataModel) converter.convertSourceToTargetClass(sourceList,
DataModel<Object> resultModel = (DataModel<Object>) converter.convertSourceToTargetClass(sourceList,
SerializableListDataModel.class);
assertNotNull(resultModel);
@@ -45,10 +50,11 @@ public class DataModelConverterTests extends TestCase {
assertTrue(resultModel instanceof Serializable);
}
@SuppressWarnings("unchecked")
public void testConvertListToSerializableListDataModelNullSource() throws Exception {
List sourceList = null;
List<Object> sourceList = null;
DataModel resultModel = (DataModel) converter.convertSourceToTargetClass(sourceList,
DataModel<Object> resultModel = (DataModel<Object>) converter.convertSourceToTargetClass(sourceList,
SerializableListDataModel.class);
assertNotNull(resultModel);

2
spring-faces/src/test/java/org/springframework/faces/model/converter/FacesConversionServiceTests.java
View File

@@ -18,7 +18,7 @@ public class FacesConversionServiceTests extends TestCase {
public void testGetAbstractType() {
ConversionExecutor executor = service.getConversionExecutor(List.class, DataModel.class);
ArrayList list = new ArrayList();
ArrayList<Object> list = new ArrayList<Object>();
list.add("foo");
executor.execute(list);
}

2
spring-faces/src/test/java/org/springframework/faces/mvc/JsfViewTests.java
View File

@@ -47,7 +47,7 @@ public class JsfViewTests extends TestCase {
JsfView view = (JsfView) resolver.resolveViewName("intro", new Locale("EN"));
view.setApplicationContext(new StaticWebApplicationContext());
view.setServletContext(new MockServletContext());
view.render(new HashMap(), new MockHttpServletRequest(), new MockHttpServletResponse());
view.render(new HashMap<String, Object>(), new MockHttpServletRequest(), new MockHttpServletResponse());
}
private class ResourceCheckingViewHandler extends MockViewHandler {

10
spring-faces/src/test/java/org/springframework/faces/ui/AjaxViewRootTests.java
View File

@@ -67,14 +67,16 @@ public class AjaxViewRootTests extends TestCase {
assertEquals(1, ajaxRoot.getProcessIds().length);
assertEquals(1, ajaxRoot.getRenderIds().length);
assertEquals(StringUtils.arrayToCommaDelimitedString(ajaxRoot.getProcessIds()), StringUtils
.arrayToCommaDelimitedString(ajaxRoot.getRenderIds()));
assertEquals(StringUtils.arrayToCommaDelimitedString(ajaxRoot.getProcessIds()),
StringUtils.arrayToCommaDelimitedString(ajaxRoot.getRenderIds()));
}
public void testEncodeAll_RenderIdsExpr() throws IOException {
jsf.externalContext().getRequestMap().put(View.RENDER_FRAGMENTS_ATTRIBUTE,
StringUtils.delimitedListToStringArray("foo:bar,foo:baz", ",", " "));
jsf.externalContext()
.getRequestMap()
.put(View.RENDER_FRAGMENTS_ATTRIBUTE,
StringUtils.delimitedListToStringArray("foo:bar,foo:baz", ",", " "));
AjaxViewRoot ajaxRoot = new AjaxViewRoot(testTree);

12
spring-faces/src/test/java/org/springframework/faces/ui/ProgressiveCommandLinkRendererTests.java
View File

@@ -31,8 +31,7 @@ public class ProgressiveCommandLinkRendererTests extends TestCase {
link.setId("foo");
form.getChildren().add(link);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
RenderAttributeCallback callback = renderer.getAttributeCallbacks(link).get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
@@ -62,8 +61,7 @@ public class ProgressiveCommandLinkRendererTests extends TestCase {
link.getChildren().add(param1);
link.getChildren().add(param2);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
RenderAttributeCallback callback = renderer.getAttributeCallbacks(link).get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
@@ -84,8 +82,7 @@ public class ProgressiveCommandLinkRendererTests extends TestCase {
link.setAjaxEnabled(Boolean.FALSE);
form.getChildren().add(link);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
RenderAttributeCallback callback = renderer.getAttributeCallbacks(link).get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
@@ -116,8 +113,7 @@ public class ProgressiveCommandLinkRendererTests extends TestCase {
link.getChildren().add(param1);
link.getChildren().add(param2);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
RenderAttributeCallback callback = renderer.getAttributeCallbacks(link).get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);

6
spring-faces/src/test/java/org/springframework/faces/webflow/FlowActionListenerTests.java
View File

@@ -24,14 +24,14 @@ public class FlowActionListenerTests extends TestCase {
JSFMockHelper jsfMock = new JSFMockHelper();
RequestContext context = (RequestContext) EasyMock.createMock(RequestContext.class);
RequestContext context = EasyMock.createMock(RequestContext.class);
protected void setUp() throws Exception {
jsfMock.setUp();
listener = new FlowActionListener(jsfMock.application().getActionListener());
RequestContextHolder.setRequestContext(context);
LocalAttributeMap flash = new LocalAttributeMap();
LocalAttributeMap<Object> flash = new LocalAttributeMap<Object>();
EasyMock.expect(context.getFlashScope()).andStubReturn(flash);
EasyMock.expect(context.getCurrentState()).andStubReturn(new MockViewState());
EasyMock.replay(new Object[] { context });
@@ -79,7 +79,7 @@ public class FlowActionListenerTests extends TestCase {
this.result = result;
}
public Class getType(FacesContext context) throws MethodNotFoundException {
public Class<?> getType(FacesContext context) throws MethodNotFoundException {
return String.class;
}

34
spring-faces/src/test/java/org/springframework/faces/webflow/FlowFacesContextTests.java
View File

@@ -73,9 +73,9 @@ public class FlowFacesContextTests extends TestCase {
facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "FOO", "BAR"));
int iterationCount = 0;
Iterator i = facesContext.getMessages(null);
Iterator<FacesMessage> i = facesContext.getMessages(null);
while (i.hasNext()) {
FacesMessage message = (FacesMessage) i.next();
FacesMessage message = i.next();
assertNotNull(message);
iterationCount++;
}
@@ -91,9 +91,9 @@ public class FlowFacesContextTests extends TestCase {
facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "FOO", "BAR"));
int iterationCount = 0;
Iterator i = facesContext.getMessages();
Iterator<FacesMessage> i = facesContext.getMessages();
while (i.hasNext()) {
FacesMessage message = (FacesMessage) i.next();
FacesMessage message = i.next();
assertNotNull(message);
iterationCount++;
}
@@ -125,7 +125,7 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.replay(new Object[] { requestContext });
int iterationCount = 0;
Iterator i = facesContext.getMessages();
Iterator<FacesMessage> i = facesContext.getMessages();
while (i.hasNext()) {
assertNotNull(i.next());
iterationCount++;
@@ -139,7 +139,7 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.replay(new Object[] { requestContext });
facesContext.addMessage("TESTID", new FacesMessage("summary1"));
FacesMessage soruceMessage = (FacesMessage) facesContext.getMessages("TESTID").next();
FacesMessage soruceMessage = facesContext.getMessages("TESTID").next();
soruceMessage.setSummary("summary2");
// check that message sticks around even when the facesContext has been torn down and re-created during the
@@ -147,7 +147,7 @@ public class FlowFacesContextTests extends TestCase {
FacesContext newFacesContext = new FlowFacesContext(requestContext, jsf.facesContext());
assertSame(FacesContext.getCurrentInstance(), newFacesContext);
FacesMessage gotMessage = (FacesMessage) newFacesContext.getMessages("TESTID").next();
FacesMessage gotMessage = newFacesContext.getMessages("TESTID").next();
assertEquals("summary2", gotMessage.getSummary());
}
@@ -157,9 +157,9 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.replay(new Object[] { requestContext });
int iterationCount = 0;
Iterator i = facesContext.getMessages("componentId");
Iterator<FacesMessage> i = facesContext.getMessages("componentId");
while (i.hasNext()) {
FacesMessage message = (FacesMessage) i.next();
FacesMessage message = i.next();
assertNotNull(message);
assertEquals("componentId_summary" + (iterationCount + 1), message.getSummary());
assertEquals("componentId_detail" + (iterationCount + 1), message.getDetail());
@@ -174,9 +174,9 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.replay(new Object[] { requestContext });
int iterationCount = 0;
Iterator i = facesContext.getMessages("userMessage");
Iterator<FacesMessage> i = facesContext.getMessages("userMessage");
while (i.hasNext()) {
FacesMessage message = (FacesMessage) i.next();
FacesMessage message = i.next();
assertNotNull(message);
assertEquals("userMessage", message.getSummary());
assertEquals("userMessage", message.getDetail());
@@ -190,7 +190,7 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.expect(requestContext.getMessageContext()).andStubReturn(messageContext);
EasyMock.replay(new Object[] { requestContext });
Iterator i = facesContext.getMessages("unknown");
Iterator<FacesMessage> i = facesContext.getMessages("unknown");
assertFalse(i.hasNext());
}
@@ -199,15 +199,15 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.expect(requestContext.getMessageContext()).andStubReturn(messageContext);
EasyMock.replay(new Object[] { requestContext });
List expectedOrderedIds = new ArrayList();
List<String> expectedOrderedIds = new ArrayList<String>();
expectedOrderedIds.add(null);
expectedOrderedIds.add("componentId");
expectedOrderedIds.add("userMessage");
int iterationCount = 0;
Iterator i = facesContext.getClientIdsWithMessages();
Iterator<String> i = facesContext.getClientIdsWithMessages();
while (i.hasNext()) {
String clientId = (String) i.next();
String clientId = i.next();
assertEquals("Client id not expected", expectedOrderedIds.get(iterationCount), clientId);
iterationCount++;
}
@@ -220,7 +220,7 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.replay(new Object[] { requestContext });
facesContext.addMessage("TESTID", new FacesMessage("summary1"));
FacesMessage sourceMessage = (FacesMessage) facesContext.getMessages("TESTID").next();
FacesMessage sourceMessage = facesContext.getMessages("TESTID").next();
sourceMessage.setSummary("summary2");
sourceMessage.setSeverity(FacesMessage.SEVERITY_FATAL);
@@ -244,7 +244,7 @@ public class FlowFacesContextTests extends TestCase {
FacesContext newFacesContext = new FlowFacesContext(requestContext, jsf.facesContext());
assertSame(FacesContext.getCurrentInstance(), newFacesContext);
FacesMessage gotMessage = (FacesMessage) newFacesContext.getMessages("TESTID").next();
FacesMessage gotMessage = newFacesContext.getMessages("TESTID").next();
assertEquals("summary2", gotMessage.getSummary());
assertEquals(FacesMessage.SEVERITY_FATAL, gotMessage.getSeverity());
}

2
spring-faces/src/test/java/org/springframework/faces/webflow/FlowPartialViewContextTests.java
View File

@@ -16,7 +16,6 @@ import org.springframework.webflow.test.MockRequestContext;
public class FlowPartialViewContextTests extends TestCase {
@SuppressWarnings("unchecked")
public void testReturnFragmentIds() throws Exception {
String[] fragmentIds = new String[] { "foo", "bar" };
@@ -47,7 +46,6 @@ public class FlowPartialViewContextTests extends TestCase {
assertEquals(renderIds, context.getRenderIds());
}
@SuppressWarnings("unchecked")
public void testReturnFragmentIdsMutable() throws Exception {
String[] fragmentIds = new String[] { "foo", "bar" };

4
spring-faces/src/test/java/org/springframework/faces/webflow/FlowViewResponseStateManagerTests.java
View File

@@ -37,7 +37,7 @@ public class FlowViewResponseStateManagerTests extends TestCase {
public void testWriteFlowSerializedView() throws Exception {
EasyMock.expect(flowExecutionContext.getKey()).andReturn(new MockFlowExecutionKey("e1s1"));
LocalAttributeMap viewMap = new LocalAttributeMap();
LocalAttributeMap<Object> viewMap = new LocalAttributeMap<Object>();
EasyMock.expect(requestContext.getViewScope()).andStubReturn(viewMap);
EasyMock.expect(requestContext.getFlowExecutionContext()).andReturn(flowExecutionContext);
EasyMock.replay(requestContext, flowExecutionContext);
@@ -57,7 +57,7 @@ public class FlowViewResponseStateManagerTests extends TestCase {
Object componentState = new Object();
FlowSerializedView flowSerializedView = new FlowSerializedView("viewId", treeStructure, componentState);
LocalAttributeMap viewMap = new LocalAttributeMap();
LocalAttributeMap<Object> viewMap = new LocalAttributeMap<Object>();
viewMap.put(FlowViewStateManager.SERIALIZED_VIEW_STATE, flowSerializedView);
EasyMock.expect(requestContext.getViewScope()).andStubReturn(viewMap);
EasyMock.replay(requestContext);

4
spring-faces/src/test/java/org/springframework/faces/webflow/JSFManagedBean.java
View File

@@ -7,7 +7,7 @@ public class JSFManagedBean {
String prop1;
JSFModel model;
List values = new ArrayList();
List<String> values = new ArrayList<String>();
public JSFModel getModel() {
return model;
@@ -29,7 +29,7 @@ public class JSFManagedBean {
values.add(value);
}
public List getValues() {
public List<String> getValues() {
return values;
}
}

14
spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java
View File

@@ -39,7 +39,7 @@ public class JsfFinalResponseActionTests extends TestCase {
private JSFMockHelper jsfMock = new JSFMockHelper();
private RequestContext context = (RequestContext) EasyMock.createMock(RequestContext.class);
private RequestContext context = EasyMock.createMock(RequestContext.class);
private ViewHandler viewHandler = new NoRenderViewHandler();
@@ -74,9 +74,10 @@ public class JsfFinalResponseActionTests extends TestCase {
ext.setNativeRequest(new MockHttpServletRequest());
ext.setNativeResponse(new MockHttpServletResponse());
EasyMock.expect(context.getExternalContext()).andStubReturn(ext);
LocalAttributeMap requestMap = new LocalAttributeMap();
LocalAttributeMap<Object> requestMap = new LocalAttributeMap<Object>();
EasyMock.expect(context.getFlashScope()).andStubReturn(requestMap);
EasyMock.expect(context.getRequestParameters()).andStubReturn(new LocalParameterMap(new HashMap()));
EasyMock.expect(context.getRequestParameters()).andStubReturn(
new LocalParameterMap(new HashMap<String, Object>()));
}
public void testRender() throws Exception {
@@ -116,7 +117,7 @@ public class JsfFinalResponseActionTests extends TestCase {
private class TrackingPhaseListener implements PhaseListener {
private List phaseCallbacks = new ArrayList();
private List<String> phaseCallbacks = new ArrayList<String>();
public void afterPhase(PhaseEvent event) {
String phaseCallback = "AFTER_" + event.getPhaseId();
@@ -135,11 +136,6 @@ public class JsfFinalResponseActionTests extends TestCase {
public PhaseId getPhaseId() {
return PhaseId.ANY_PHASE;
}
public List getPhaseCallbacks() {
return phaseCallbacks;
}
}
private class NoRenderViewHandler extends MockViewHandler {

2
spring-faces/src/test/java/org/springframework/faces/webflow/JsfFlowHandlerAdapterTests.java
View File

@@ -43,7 +43,7 @@ public class JsfFlowHandlerAdapterTests extends TestCase {
throw new UnsupportedOperationException("Not expected");
}
public FlowExecutionResult launchExecution(String flowId, MutableAttributeMap input, ExternalContext context)
public FlowExecutionResult launchExecution(String flowId, MutableAttributeMap<?> input, ExternalContext context)
throws FlowException {
throw new UnsupportedOperationException("Not expected");
}

4
spring-faces/src/test/java/org/springframework/faces/webflow/JsfManagedBeanPropertyAccessorTests.java
View File

@@ -53,7 +53,7 @@ public class JsfManagedBeanPropertyAccessorTests extends TestCase {
public void testCanWrite() throws Exception {
assertFalse(accessor.canWrite(null, null, "myJsfBean"));
MutableAttributeMap map = requestContext.getExternalContext().getRequestMap();
MutableAttributeMap<Object> map = requestContext.getExternalContext().getRequestMap();
map.put("myJsfBean", new Object());
assertTrue(accessor.canWrite(null, null, "myJsfBean"));
map.clear();
@@ -73,7 +73,7 @@ public class JsfManagedBeanPropertyAccessorTests extends TestCase {
Object jsfBean1 = new Object();
Object jsfBean2 = new Object();
MutableAttributeMap map = requestContext.getExternalContext().getRequestMap();
MutableAttributeMap<Object> map = requestContext.getExternalContext().getRequestMap();
accessor.write(null, null, "myJsfBean", jsfBean1);
assertNull("Write occurs only if bean is present in the map", map.get("myJsfBean"));

11
spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java
View File

@@ -15,7 +15,7 @@ import org.apache.myfaces.test.mock.lifecycle.MockLifecycle;
public class JsfUtilsTests extends TestCase {
public void testBeforeListenersCalledInForwardOrder() throws Exception {
List list = new ArrayList();
List<OrderVerifyingPhaseListener> list = new ArrayList<OrderVerifyingPhaseListener>();
MockLifecycle lifecycle = new MockLifecycle();
PhaseListener listener1 = new OrderVerifyingPhaseListener(null, list);
lifecycle.addPhaseListener(listener1);
@@ -30,7 +30,7 @@ public class JsfUtilsTests extends TestCase {
}
public void testAfterListenersCalledInReverseOrder() throws Exception {
List list = new ArrayList();
List<OrderVerifyingPhaseListener> list = new ArrayList<OrderVerifyingPhaseListener>();
MockLifecycle lifecycle = new MockLifecycle();
PhaseListener listener1 = new OrderVerifyingPhaseListener(list, null);
lifecycle.addPhaseListener(listener1);
@@ -46,10 +46,11 @@ public class JsfUtilsTests extends TestCase {
private class OrderVerifyingPhaseListener implements PhaseListener {
private List afterPhaseList;
private List beforePhaseList;
private List<OrderVerifyingPhaseListener> afterPhaseList;
private List<OrderVerifyingPhaseListener> beforePhaseList;
public OrderVerifyingPhaseListener(List afterPhaseList, List beforePhaseList) {
public OrderVerifyingPhaseListener(List<OrderVerifyingPhaseListener> afterPhaseList,
List<OrderVerifyingPhaseListener> beforePhaseList) {
this.afterPhaseList = afterPhaseList;
this.beforePhaseList = beforePhaseList;
}

14
spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java
View File

@@ -54,7 +54,7 @@ public class JsfViewFactoryTests extends TestCase {
private RequestContext context = EasyMock.createMock(RequestContext.class);
private LocalAttributeMap flashMap = new LocalAttributeMap();
private LocalAttributeMap<Object> flashMap = new LocalAttributeMap<Object>();
private ViewHandler viewHandler = new MockViewHandler();
@@ -80,7 +80,8 @@ public class JsfViewFactoryTests extends TestCase {
RequestContextHolder.setRequestContext(context);
EasyMock.expect(context.getFlashScope()).andStubReturn(flashMap);
EasyMock.expect(context.getExternalContext()).andStubReturn(extContext);
EasyMock.expect(context.getRequestParameters()).andStubReturn(new LocalParameterMap(new HashMap()));
EasyMock.expect(context.getRequestParameters()).andStubReturn(
new LocalParameterMap(new HashMap<String, Object>()));
}
protected void tearDown() throws Exception {
@@ -299,7 +300,7 @@ public class JsfViewFactoryTests extends TestCase {
private class TrackingPhaseListener implements PhaseListener {
private List phaseCallbacks = new ArrayList();
private List<String> phaseCallbacks = new ArrayList<String>();
public void afterPhase(PhaseEvent event) {
String phaseCallback = "AFTER_" + event.getPhaseId();
@@ -318,11 +319,6 @@ public class JsfViewFactoryTests extends TestCase {
public PhaseId getPhaseId() {
return PhaseId.ANY_PHASE;
}
public List getPhaseCallbacks() {
return phaseCallbacks;
}
}
private class NormalViewState implements StateDefinition {
@@ -339,7 +335,7 @@ public class JsfViewFactoryTests extends TestCase {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public MutableAttributeMap getAttributes() {
public MutableAttributeMap<Object> getAttributes() {
throw new UnsupportedOperationException("Auto-generated method stub");
}

11
spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewTests.java
View File

@@ -40,11 +40,12 @@ public class JsfViewTests extends TestCase {
private String event = "foo";
private RequestContext context = (RequestContext) EasyMock.createMock(RequestContext.class);
private FlowExecutionContext flowExecutionContext = (FlowExecutionContext) EasyMock
.createMock(FlowExecutionContext.class);
private MutableAttributeMap flashScope = (MutableAttributeMap) EasyMock.createMock(MutableAttributeMap.class);
private MutableAttributeMap flowMap = (MutableAttributeMap) EasyMock.createMock(MutableAttributeMap.class);
private RequestContext context = EasyMock.createMock(RequestContext.class);
private FlowExecutionContext flowExecutionContext = EasyMock.createMock(FlowExecutionContext.class);
@SuppressWarnings("unchecked")
private MutableAttributeMap<Object> flashScope = EasyMock.createMock(MutableAttributeMap.class);
@SuppressWarnings("unchecked")
private MutableAttributeMap<Object> flowMap = EasyMock.createMock(MutableAttributeMap.class);
private FlowExecutionKey key = new FlowExecutionKey() {

18
spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java
View File

@@ -115,41 +115,41 @@ public class MockApplication extends Application {
return null;
}
public Iterator getComponentTypes() {
public Iterator<String> getComponentTypes() {
return null;
}
public void addConverter(String converterId, String converterClass) {
}
public void addConverter(Class targetClass, String converterClass) {
public void addConverter(Class<?> targetClass, String converterClass) {
}
public Converter createConverter(String converterId) {
return null;
}
public Converter createConverter(Class targetClass) {
public Converter createConverter(Class<?> targetClass) {
return null;
}
public Iterator getConverterIds() {
public Iterator<String> getConverterIds() {
return null;
}
public Iterator getConverterTypes() {
public Iterator<Class<?>> getConverterTypes() {
return null;
}
public MethodBinding createMethodBinding(String ref, Class[] params) throws ReferenceSyntaxException {
public MethodBinding createMethodBinding(String ref, Class<?>[] params) throws ReferenceSyntaxException {
return null;
}
public Iterator getSupportedLocales() {
public Iterator<Locale> getSupportedLocales() {
return null;
}
public void setSupportedLocales(Collection locales) {
public void setSupportedLocales(Collection<Locale> locales) {
}
public void addValidator(String validatorId, String validatorClass) {
@@ -159,7 +159,7 @@ public class MockApplication extends Application {
return null;
}
public Iterator getValidatorIds() {
public Iterator<String> getValidatorIds() {
return null;
}

2
spring-faces/src/test/java/org/springframework/faces/webflow/MockBaseFacesContext.java
View File

@@ -26,7 +26,7 @@ public class MockBaseFacesContext extends MockFacesContext20 {
super(externalContext, lifecycle);
}
public Map getAttributes() {
public Map<Object, Object> getAttributes() {
return super.getAttributes();
}

6
spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java
View File

@@ -58,7 +58,7 @@ public class MockFacesContext extends FacesContext {
this.application = application;
}
public Iterator getClientIdsWithMessages() {
public Iterator<String> getClientIdsWithMessages() {
return null;
}
@@ -78,11 +78,11 @@ public class MockFacesContext extends FacesContext {
return null;
}
public Iterator getMessages() {
public Iterator<FacesMessage> getMessages() {
return null;
}
public Iterator getMessages(String arg0) {
public Iterator<FacesMessage> getMessages(String arg0) {
return null;
}

36
spring-faces/src/test/java/org/springframework/faces/webflow/MockJsfExternalContext.java
View File

@@ -32,13 +32,13 @@ import javax.faces.context.ExternalContext;
public class MockJsfExternalContext extends ExternalContext {
private Map applicationMap = new HashMap();
private Map<String, Object> applicationMap = new HashMap<String, Object>();
private Map sessionMap = new HashMap();
private Map<String, Object> sessionMap = new HashMap<String, Object>();
private Map requestMap = new HashMap();
private Map<String, Object> requestMap = new HashMap<String, Object>();
private Map requestParameterMap = Collections.EMPTY_MAP;
private Map<String, String> requestParameterMap = Collections.emptyMap();
public void dispatch(String arg0) throws IOException {
}
@@ -55,7 +55,7 @@ public class MockJsfExternalContext extends ExternalContext {
return null;
}
public Map getApplicationMap() {
public Map<String, Object> getApplicationMap() {
return applicationMap;
}
@@ -71,7 +71,7 @@ public class MockJsfExternalContext extends ExternalContext {
return null;
}
public Map getInitParameterMap() {
public Map<String, Object> getInitParameterMap() {
return null;
}
@@ -87,15 +87,15 @@ public class MockJsfExternalContext extends ExternalContext {
return null;
}
public Map getRequestCookieMap() {
public Map<String, Object> getRequestCookieMap() {
return null;
}
public Map getRequestHeaderMap() {
public Map<String, String> getRequestHeaderMap() {
return null;
}
public Map getRequestHeaderValuesMap() {
public Map<String, String[]> getRequestHeaderValuesMap() {
return null;
}
@@ -103,11 +103,11 @@ public class MockJsfExternalContext extends ExternalContext {
return null;
}
public Iterator getRequestLocales() {
public Iterator<Locale> getRequestLocales() {
return null;
}
public Map getRequestMap() {
public Map<String, Object> getRequestMap() {
return requestMap;
}
@@ -115,11 +115,11 @@ public class MockJsfExternalContext extends ExternalContext {
* Set the request map for this external context.
* @param requestMap The requestMap to set.
*/
public void setRequestMap(Map requestMap) {
public void setRequestMap(Map<String, Object> requestMap) {
this.requestMap = requestMap;
}
public Map getRequestParameterMap() {
public Map<String, String> getRequestParameterMap() {
return requestParameterMap;
}
@@ -127,15 +127,15 @@ public class MockJsfExternalContext extends ExternalContext {
* Set the request parameter map for this external context.
* @param requestParameterMap the request parameter map to set.
*/
public void setRequestParameterMap(Map requestParameterMap) {
public void setRequestParameterMap(Map<String, String> requestParameterMap) {
this.requestParameterMap = requestParameterMap;
}
public Iterator getRequestParameterNames() {
public Iterator<String> getRequestParameterNames() {
return requestParameterMap.keySet().iterator();
}
public Map getRequestParameterValuesMap() {
public Map<String, String[]> getRequestParameterValuesMap() {
return null;
}
@@ -155,7 +155,7 @@ public class MockJsfExternalContext extends ExternalContext {
return null;
}
public Set getResourcePaths(String arg0) {
public Set<String> getResourcePaths(String arg0) {
return null;
}
@@ -167,7 +167,7 @@ public class MockJsfExternalContext extends ExternalContext {
return null;
}
public Map getSessionMap() {
public Map<String, Object> getSessionMap() {
return sessionMap;
}

26
spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/RequestParameterMapTests.java → spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestParameterMapTests.java
View File

@@ -4,27 +4,16 @@ import junit.framework.TestCase;
import org.springframework.mock.web.portlet.MockPortletRequest;
public class RequestParameterMapTests extends TestCase {
public class MultiValueRequestParameterMapTests extends TestCase {
private RequestParameterMap requestMap;
private MultiValueRequestParameterMap requestMap;
private MockPortletRequest request;
protected void setUp() throws Exception {
super.setUp();
request = new MockPortletRequest();
requestMap = new RequestParameterMap(request);
}
protected void tearDown() throws Exception {
super.tearDown();
request = null;
requestMap = null;
}
public void testSingleValueParameter() throws Exception {
request.setParameter("key", "value");
assertEquals("value", requestMap.getAttribute("key"));
requestMap = new MultiValueRequestParameterMap(request);
}
public void testMultiValueParameter() throws Exception {
@@ -39,19 +28,10 @@ public class RequestParameterMapTests extends TestCase {
public void testSingleValueParameterAsArray() throws Exception {
request.setParameter("key", "value");
requestMap.setUseArrayForMultiValueAttributes(Boolean.TRUE);
Object actual = requestMap.getAttribute("key");
assertTrue(actual.getClass().isArray());
assertEquals(1, ((String[]) actual).length);
assertEquals("value", ((String[]) actual)[0]);
}
public void testMultiValueParameterAsString() throws Exception {
request.setParameter("key", "value");
request.addParameter("key", "value2");
requestMap.setUseArrayForMultiValueAttributes(Boolean.FALSE);
Object actual = requestMap.getAttribute("key");
assertEquals("value", actual);
}
}

28
spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/RequestPropertyMapTests.java → spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTest.java
View File

@@ -4,34 +4,22 @@ import junit.framework.TestCase;
import org.springframework.mock.web.portlet.MockPortletRequest;
public class RequestPropertyMapTests extends TestCase {
public class MultiValueRequestPropertyMapTest extends TestCase {
private RequestPropertyMap requestMap;
private MultiValueRequestPropertyMap requestMap;
private MockPortletRequest request;
protected void setUp() throws Exception {
super.setUp();
request = new MockPortletRequest();
requestMap = new RequestPropertyMap(request);
}
protected void tearDown() throws Exception {
super.tearDown();
request = null;
requestMap = null;
}
public void testSingleValueProperty() throws Exception {
request.setProperty("key", "value");
assertEquals("value", requestMap.getAttribute("key"));
requestMap = new MultiValueRequestPropertyMap(request);
}
public void testMultiValueProperty() throws Exception {
request.setProperty("key", "value");
request.addProperty("key", "value2");
Object actual = requestMap.getAttribute("key");
assertTrue(actual.getClass().isArray());
assertEquals(2, ((String[]) actual).length);
assertEquals("value", ((String[]) actual)[0]);
assertEquals("value2", ((String[]) actual)[1]);
@@ -39,18 +27,8 @@ public class RequestPropertyMapTests extends TestCase {
public void testSingleValuePropertyAsArray() throws Exception {
request.setProperty("key", "value");
requestMap.setUseArrayForMultiValueAttributes(Boolean.TRUE);
Object actual = requestMap.getAttribute("key");
assertTrue(actual.getClass().isArray());
assertEquals(1, ((String[]) actual).length);
assertEquals("value", ((String[]) actual)[0]);
}
public void testMultiValuePropertyAsString() throws Exception {
request.setProperty("key", "value");
request.addProperty("key", "value2");
requestMap.setUseArrayForMultiValueAttributes(Boolean.FALSE);
Object actual = requestMap.getAttribute("key");
assertEquals("value", actual);
}
}

30
spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestParameterMapTests.java Normal file
View File

@@ -0,0 +1,30 @@
package org.springframework.faces.webflow.context.portlet;
import junit.framework.TestCase;
import org.springframework.mock.web.portlet.MockPortletRequest;
public class SingleValueRequestParameterMapTests extends TestCase {
private SingleValueRequestParameterMap requestMap;
private MockPortletRequest request;
protected void setUp() throws Exception {
super.setUp();
request = new MockPortletRequest();
requestMap = new SingleValueRequestParameterMap(request);
}
public void testSingleValueParameter() throws Exception {
request.setParameter("key", "value");
assertEquals("value", requestMap.getAttribute("key"));
}
public void testMultiValueParameterAsString() throws Exception {
request.setParameter("key", "value");
request.addParameter("key", "value2");
Object actual = requestMap.getAttribute("key");
assertEquals("value", actual);
}
}

30
spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTest.java Normal file
View File

@@ -0,0 +1,30 @@
package org.springframework.faces.webflow.context.portlet;
import junit.framework.TestCase;
import org.springframework.mock.web.portlet.MockPortletRequest;
public class SingleValueRequestPropertyMapTest extends TestCase {
private SingleValueRequestPropertyMap requestMap;
private MockPortletRequest request;
protected void setUp() throws Exception {
super.setUp();
request = new MockPortletRequest();
requestMap = new SingleValueRequestPropertyMap(request);
}
public void testSingleValueProperty() throws Exception {
request.setProperty("key", "value");
assertEquals("value", requestMap.getAttribute("key"));
}
public void testMultiValuePropertyAsString() throws Exception {
request.setProperty("key", "value");
request.addProperty("key", "value2");
Object actual = requestMap.getAttribute("key");
assertEquals("value", actual);
}
}