[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...
Gavin King
gavin.king at jboss.com
Mon Apr 23 22:32:59 EDT 2007
User: gavin
Date: 07/04/23 22:32:59
Modified: src/main/org/jboss/seam/mock MockApplication.java
SeamTest.java
Log:
remove old pre-jboss-el stuff
Revision Changes Path
1.10 +83 -48 jboss-seam/src/main/org/jboss/seam/mock/MockApplication.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MockApplication.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockApplication.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- MockApplication.java 27 Oct 2006 12:58:10 -0000 1.9
+++ MockApplication.java 24 Apr 2007 02:32:58 -0000 1.10
@@ -1,6 +1,5 @@
package org.jboss.seam.mock;
-
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collection;
@@ -40,128 +39,151 @@
import org.jboss.seam.util.Reflections;
import org.jboss.seam.util.UnifiedELValueBinding;
-public class MockApplication extends Application {
+public class MockApplication extends Application
+{
@Override
- public ActionListener getActionListener() {
+ public ActionListener getActionListener()
+ {
throw new UnsupportedOperationException();
}
@Override
- public void setActionListener(ActionListener listener) {
+ public void setActionListener(ActionListener listener)
+ {
throw new UnsupportedOperationException();
}
private Locale defaultLocale = Locale.ENGLISH;
@Override
- public Locale getDefaultLocale() {
+ public Locale getDefaultLocale()
+ {
return defaultLocale;
}
@Override
- public void setDefaultLocale(Locale locale) {
+ public void setDefaultLocale(Locale locale)
+ {
defaultLocale = locale;
}
@Override
- public String getDefaultRenderKitId() {
+ public String getDefaultRenderKitId()
+ {
throw new UnsupportedOperationException();
}
@Override
- public void setDefaultRenderKitId(String rk) {
+ public void setDefaultRenderKitId(String rk)
+ {
throw new UnsupportedOperationException();
}
private String msgBundleName;
@Override
- public String getMessageBundle() {
+ public String getMessageBundle()
+ {
return msgBundleName;
}
@Override
- public void setMessageBundle(String bundleName) {
+ public void setMessageBundle(String bundleName)
+ {
this.msgBundleName = bundleName;
}
private NavigationHandler navigationHandler = new MockNavigationHandler();
@Override
- public NavigationHandler getNavigationHandler() {
+ public NavigationHandler getNavigationHandler()
+ {
return navigationHandler;
}
@Override
- public void setNavigationHandler(NavigationHandler navigationHandler) {
+ public void setNavigationHandler(NavigationHandler navigationHandler)
+ {
this.navigationHandler = navigationHandler;
}
@Override
- public PropertyResolver getPropertyResolver() {
+ public PropertyResolver getPropertyResolver()
+ {
throw new UnsupportedOperationException();
}
@Override
- public void setPropertyResolver(PropertyResolver pr) {
+ public void setPropertyResolver(PropertyResolver pr)
+ {
throw new UnsupportedOperationException();
}
- private VariableResolver variableResolver = null; //TODO: big big todo!!!!!!!!!!
+ private VariableResolver variableResolver = null; // TODO: big big todo!!!!!!!!!!
@Override
- public VariableResolver getVariableResolver() {
+ public VariableResolver getVariableResolver()
+ {
return variableResolver;
}
@Override
- public void setVariableResolver(VariableResolver variableResolver) {
+ public void setVariableResolver(VariableResolver variableResolver)
+ {
this.variableResolver = variableResolver;
}
private ViewHandler viewHandler = new MockViewHandler();
@Override
- public ViewHandler getViewHandler() {
+ public ViewHandler getViewHandler()
+ {
return viewHandler;
}
@Override
- public void setViewHandler(ViewHandler viewHandler) {
+ public void setViewHandler(ViewHandler viewHandler)
+ {
this.viewHandler = viewHandler;
}
private StateManager stateManager = new MockStateManager();
@Override
- public StateManager getStateManager() {
+ public StateManager getStateManager()
+ {
return stateManager;
}
@Override
- public void setStateManager(StateManager stateManager) {
+ public void setStateManager(StateManager stateManager)
+ {
this.stateManager = stateManager;
}
@Override
- public void addComponent(String name, String x) {
+ public void addComponent(String name, String x)
+ {
throw new UnsupportedOperationException();
}
@Override
- public UIComponent createComponent(String name) throws FacesException {
+ public UIComponent createComponent(String name) throws FacesException
+ {
throw new UnsupportedOperationException();
}
@Override
- public UIComponent createComponent(ValueBinding vb, FacesContext fc,
- String x) throws FacesException {
+ public UIComponent createComponent(ValueBinding vb, FacesContext fc, String x)
+ throws FacesException
+ {
throw new UnsupportedOperationException();
}
@Override
- public Iterator getComponentTypes() {
+ public Iterator getComponentTypes()
+ {
throw new UnsupportedOperationException();
}
@@ -194,13 +216,15 @@
}
@Override
- public void addConverter(String id, String converterClass) {
- convertersById.put( id, instantiateConverter(converterClass) );
+ public void addConverter(String id, String converterClass)
+ {
+ convertersById.put(id, instantiateConverter(converterClass));
}
@Override
- public void addConverter(Class type, String converterClass) {
- converters.put( type, instantiateConverter(converterClass) );
+ public void addConverter(Class type, String converterClass)
+ {
+ converters.put(type, instantiateConverter(converterClass));
}
private Converter instantiateConverter(String converterClass)
@@ -216,59 +240,70 @@
}
@Override
- public Converter createConverter(String id) {
+ public Converter createConverter(String id)
+ {
return convertersById.get(id);
}
@Override
- public Converter createConverter(Class clazz) {
+ public Converter createConverter(Class clazz)
+ {
return converters.get(clazz);
}
@Override
- public Iterator getConverterIds() {
+ public Iterator getConverterIds()
+ {
return convertersById.keySet().iterator();
}
@Override
- public Iterator getConverterTypes() {
+ public Iterator getConverterTypes()
+ {
return converters.keySet().iterator();
}
@Override
public MethodBinding createMethodBinding(final String methodExpression, final Class[] args)
- throws ReferenceSyntaxException {
+ throws ReferenceSyntaxException
+ {
return new UnifiedELMethodBinding(methodExpression, args);
}
@Override
- public Iterator getSupportedLocales() {
+ public Iterator getSupportedLocales()
+ {
return Collections.singleton(defaultLocale).iterator();
}
@Override
- public void setSupportedLocales(Collection locales) {
+ public void setSupportedLocales(Collection locales)
+ {
throw new UnsupportedOperationException();
}
@Override
- public void addValidator(String id, String validator) {
+ public void addValidator(String id, String validator)
+ {
throw new UnsupportedOperationException();
}
@Override
- public Validator createValidator(String id) throws FacesException {
+ public Validator createValidator(String id) throws FacesException
+ {
throw new UnsupportedOperationException();
}
@Override
- public Iterator getValidatorIds() {
+ public Iterator getValidatorIds()
+ {
throw new UnsupportedOperationException();
}
@Override
public ValueBinding createValueBinding(final String valueExpression)
- throws ReferenceSyntaxException {
+ throws ReferenceSyntaxException
+ {
return new UnifiedELValueBinding(valueExpression);
}
1.66 +4 -5 jboss-seam/src/main/org/jboss/seam/mock/SeamTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/SeamTest.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- SeamTest.java 7 Mar 2007 05:20:41 -0000 1.65
+++ SeamTest.java 24 Apr 2007 02:32:58 -0000 1.66
@@ -32,7 +32,6 @@
import org.hibernate.validator.InvalidValue;
import org.jboss.seam.Component;
import org.jboss.seam.Model;
-import org.jboss.seam.actionparam.ActionParamMethodBinding;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Expressions;
@@ -42,7 +41,7 @@
import org.jboss.seam.core.Pageflow;
import org.jboss.seam.init.Initialization;
import org.jboss.seam.jsf.AbstractSeamPhaseListener;
-import org.jboss.seam.jsf.SeamApplication11;
+import org.jboss.seam.jsf.SeamApplication;
import org.jboss.seam.jsf.SeamNavigationHandler;
import org.jboss.seam.jsf.SeamPhaseListener;
import org.jboss.seam.jsf.SeamStateManager;
@@ -57,7 +56,7 @@
*
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.65 $
+ * @version $Revision: 1.66 $
*/
public class SeamTest
{
@@ -398,7 +397,7 @@
*/
protected Object invokeMethod(String methodExpression)
{
- return new ActionParamMethodBinding(application, methodExpression).invoke(facesContext, null);
+ return application.createMethodBinding(methodExpression, null).invoke(facesContext, null);
}
/**
@@ -409,7 +408,7 @@
{
HttpServletRequest request = new MockHttpServletRequest( session, getPrincipalName(), getPrincipalRoles(), getCookies().toArray( new Cookie[]{} ) );
externalContext = new MockExternalContext(servletContext, request);
- application = new SeamApplication11(SeamTest.this.application);
+ application = new SeamApplication(SeamTest.this.application);
facesContext = new MockFacesContext( externalContext, application );
facesContext.setCurrent();
More information about the jboss-cvs-commits
mailing list