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

Polishing EL integration.

Browse Source
This commit is contained in:
Jeremy Grelle
2007-08-01 16:33:08 +00:00
parent 6e4b13f273
commit 1647f0151f
15 changed files with 283 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-binding/src/test/java/org/springframework/binding/expression/el/JBossELExpressionParserTests.java → spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java
View File

@@ -5,7 +5,8 @@ import java.util.Map;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.easymock.EasyMock;
import org.jboss.el.ExpressionFactoryImpl;
import org.springframework.binding.expression.Expression;
import org.springframework.binding.expression.support.TestBean;
import org.springframework.binding.expression.support.TestMethods;
@@ -14,22 +15,20 @@ import org.springframework.binding.expression.support.TestMethods;
* Tests to exercise the extended method invoking expression extensions of JBoss-el.
* @author Jeremy Grelle
*/
public class JBossELExpressionParserTests extends TestCase {
public class ELExpressionParserTests extends TestCase {
JBossELExpressionParser parser = new JBossELExpressionParser();
ELExpressionParser parser = new ELExpressionParser(new ExpressionFactoryImpl());
Map context;
Map container;
TestMethods target;
MockControl targetMockControl;
protected void setUp() throws Exception {
context = new HashMap();
container = new HashMap();
targetMockControl = MockControl.createControl(TestMethods.class);
target = (TestMethods) targetMockControl.getMock();
target = (TestMethods) EasyMock.createMock(TestMethods.class);
context.put("container", container);
container.put("myObject", target);
}
@@ -39,10 +38,10 @@ public class JBossELExpressionParserTests extends TestCase {
int param = 5;
container.put("param1", new Integer(param));
target.doSomethingWithInt(param);
targetMockControl.replay();
EasyMock.replay(new Object[] { target });
parser.parseExpression(expression).evaluate(context, null);
targetMockControl.verify();
EasyMock.verify(new Object[] { target });
}
@@ -51,11 +50,11 @@ public class JBossELExpressionParserTests extends TestCase {
String expression = "#{container.myObject.returnStringFromInt(container.param1)}";
int param = 5;
container.put("param1", new Integer(param));
targetMockControl.expectAndReturn(target.returnStringFromInt(param), expected);
targetMockControl.replay();
EasyMock.expect(target.returnStringFromInt(param)).andReturn(expected);
EasyMock.replay(new Object[] { target });
String result = (String) parser.parseExpression(expression).evaluate(context, null);
targetMockControl.verify();
EasyMock.verify(new Object[] { target });
assertEquals(expected, result);
}
@@ -66,11 +65,11 @@ public class JBossELExpressionParserTests extends TestCase {
container.put("param1", new Integer(param1));
TestBean param2 = new TestBean();
container.put("param2", param2);
targetMockControl.expectAndReturn(target.returnStringFromIntAndObject(param1, param2), expected);
targetMockControl.replay();
EasyMock.expect(target.returnStringFromIntAndObject(param1, param2)).andReturn(expected);
EasyMock.replay(new Object[] { target });
String result = (String) parser.parseExpression(expression).evaluate(context, null);
targetMockControl.verify();
EasyMock.verify(new Object[] { target });
assertEquals(expected, result);
}

12
spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java
View File

@@ -18,10 +18,11 @@ package org.springframework.binding.expression.support;
import java.util.ArrayList;
import java.util.List;
import org.jboss.el.ExpressionFactoryImpl;
import org.springframework.binding.expression.EvaluationException;
import org.springframework.binding.expression.ExpressionParser;
import org.springframework.binding.expression.ParserException;
import org.springframework.binding.expression.el.JBossELExpressionParser;
import org.springframework.binding.expression.el.ELExpressionParser;
import org.springframework.binding.expression.ognl.OgnlExpressionParser;
import junit.framework.TestCase;
@@ -48,9 +49,12 @@ public class SimpleExpressionTests extends TestCase {
suite.addTest(new SimpleExpressionTests("testGetValue", new BeanWrapperExpressionParser(), "$"));
suite.addTest(new SimpleExpressionTests("testSetValue", new BeanWrapperExpressionParser(), "$"));
suite.addTest(new SimpleExpressionTests("testSyntaxError", new BeanWrapperExpressionParser(), "$"));
suite.addTest(new SimpleExpressionTests("testGetValue", new JBossELExpressionParser(), "#"));
suite.addTest(new SimpleExpressionTests("testSetValue", new JBossELExpressionParser(), "#"));
suite.addTest(new SimpleExpressionTests("testSyntaxError", new JBossELExpressionParser(), "#"));
suite.addTest(new SimpleExpressionTests("testGetValue", new ELExpressionParser(new ExpressionFactoryImpl()),
"#"));
suite.addTest(new SimpleExpressionTests("testSetValue", new ELExpressionParser(new ExpressionFactoryImpl()),
"#"));
suite.addTest(new SimpleExpressionTests("testSyntaxError", new ELExpressionParser(new ExpressionFactoryImpl()),
"#"));
return suite;
}