updated for core.el move and new resolvers
This commit is contained in:
@@ -7,8 +7,8 @@ import org.springframework.faces.expression.LegacyJSFELExpressionParser;
|
||||
import org.springframework.faces.model.converter.FacesConversionService;
|
||||
import org.springframework.faces.webflow.JSFMockHelper;
|
||||
import org.springframework.faces.webflow.JsfViewFactoryCreator;
|
||||
import org.springframework.webflow.core.expression.el.WebFlowELExpressionParser;
|
||||
import org.springframework.webflow.engine.builder.support.FlowBuilderServices;
|
||||
import org.springframework.webflow.expression.el.WebFlowELExpressionParser;
|
||||
|
||||
public class FacesFlowBuilderServicesBeanDefinitionParserTests extends TestCase {
|
||||
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
package org.springframework.faces.expression;
|
||||
|
||||
import javax.el.ELContext;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.springframework.binding.expression.el.DefaultELContext;
|
||||
import org.springframework.webflow.execution.RequestContext;
|
||||
import org.springframework.webflow.execution.RequestContextHolder;
|
||||
import org.springframework.webflow.test.MockRequestContext;
|
||||
|
||||
public class ImplicitFlowVariableELResolverTests extends TestCase {
|
||||
|
||||
RequestContext requestContext = new MockRequestContext();
|
||||
ELContext elContext = new DefaultELContext(new ImplicitFlowVariableELResolver(), null, null);
|
||||
|
||||
public void setUp() {
|
||||
RequestContextHolder.setRequestContext(requestContext);
|
||||
}
|
||||
|
||||
public void testGetValue_UnknownVariable() {
|
||||
Object result = elContext.getELResolver().getValue(elContext, null, "foo");
|
||||
assertNull(result);
|
||||
assertFalse(elContext.isPropertyResolved());
|
||||
}
|
||||
|
||||
public void testGetValue_FlashScope() {
|
||||
Object result = elContext.getELResolver().getValue(elContext, null, "flashScope");
|
||||
assertNotNull(result);
|
||||
assertTrue(elContext.isPropertyResolved());
|
||||
assertSame(requestContext.getFlashScope(), result);
|
||||
}
|
||||
|
||||
public void testGetValue_FlowScope() {
|
||||
Object result = elContext.getELResolver().getValue(elContext, null, "flowScope");
|
||||
assertNotNull(result);
|
||||
assertTrue(elContext.isPropertyResolved());
|
||||
assertSame(requestContext.getFlowScope(), result);
|
||||
}
|
||||
|
||||
public void testGetValue_ConversationScope() {
|
||||
Object result = elContext.getELResolver().getValue(elContext, null, "conversationScope");
|
||||
assertNotNull(result);
|
||||
assertTrue(elContext.isPropertyResolved());
|
||||
assertSame(requestContext.getConversationScope(), result);
|
||||
}
|
||||
}
|
||||
@@ -27,9 +27,9 @@ import org.springframework.mock.web.MockServletContext;
|
||||
import org.springframework.webflow.core.collection.AttributeMap;
|
||||
import org.springframework.webflow.core.collection.LocalAttributeMap;
|
||||
import org.springframework.webflow.core.collection.LocalParameterMap;
|
||||
import org.springframework.webflow.core.expression.el.WebFlowELExpressionParser;
|
||||
import org.springframework.webflow.execution.RequestContext;
|
||||
import org.springframework.webflow.execution.RequestContextHolder;
|
||||
import org.springframework.webflow.expression.el.WebFlowELExpressionParser;
|
||||
import org.springframework.webflow.test.MockExternalContext;
|
||||
|
||||
public class JsfFinalResponseActionTests extends TestCase {
|
||||
|
||||
@@ -23,13 +23,13 @@ import org.springframework.faces.ui.AjaxViewRoot;
|
||||
import org.springframework.webflow.core.collection.AttributeMap;
|
||||
import org.springframework.webflow.core.collection.LocalAttributeMap;
|
||||
import org.springframework.webflow.core.collection.LocalParameterMap;
|
||||
import org.springframework.webflow.core.expression.el.WebFlowELExpressionParser;
|
||||
import org.springframework.webflow.definition.FlowDefinition;
|
||||
import org.springframework.webflow.definition.StateDefinition;
|
||||
import org.springframework.webflow.execution.RequestContext;
|
||||
import org.springframework.webflow.execution.RequestContextHolder;
|
||||
import org.springframework.webflow.execution.View;
|
||||
import org.springframework.webflow.execution.ViewFactory;
|
||||
import org.springframework.webflow.expression.el.WebFlowELExpressionParser;
|
||||
import org.springframework.webflow.test.MockExternalContext;
|
||||
|
||||
public class JsfViewFactoryTests extends TestCase {
|
||||
|
||||
Reference in New Issue
Block a user