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

expression parser uses context's ConversionService by default

Browse Source
This commit is contained in:
Juergen Hoeller
2009-09-07 18:37:59 +00:00
parent efaf76b46f
commit 7123e4f81e
6 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.expression.spel;
import java.util.HashMap;
@@ -29,7 +30,6 @@ import org.springframework.expression.TypedValue;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.expression.spel.testresources.Inventor;
/**
* Tests for the expression state object - some features are not yet exploited in the language (eg nested scopes)
*
@@ -47,7 +47,6 @@ public class ExpressionStateTests extends ExpressionTestCase {
// Local variables are in variable scopes which come and go during evaluation. Normal variables are
// accessible through the evaluation context
@Test
public void testLocalVariables() {
ExpressionState state = getState();
@@ -62,7 +61,6 @@ public class ExpressionStateTests extends ExpressionTestCase {
state.setLocalVariable("foo",null);
value = state.lookupLocalVariable("foo");
Assert.assertEquals(null,value);
}
@Test
@@ -119,8 +117,8 @@ public class ExpressionStateTests extends ExpressionTestCase {
ExpressionState state = getState();
Assert.assertEquals(Inventor.class,state.getRootContextObject().getValue().getClass());
state.getEvaluationContext().setRootObject(null);
Assert.assertEquals(null,state.getRootContextObject().getValue());
((StandardEvaluationContext) state.getEvaluationContext()).setRootObject(null);
Assert.assertEquals(null, state.getRootContextObject().getValue());
state = new ExpressionState(new StandardEvaluationContext());
Assert.assertEquals(TypedValue.NULL_TYPED_VALUE,state.getRootContextObject());
@@ -259,4 +257,5 @@ public class ExpressionStateTests extends ExpressionTestCase {
ExpressionState state = new ExpressionState(context);
return state;
}
}

7
org.springframework.expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
View File

@@ -48,8 +48,6 @@ public class SpelDocumentationTests extends ExpressionTestCase {
static Inventor tesla ;
static Inventor pupin ;
static {
GregorianCalendar c = new GregorianCalendar();
@@ -115,7 +113,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
ExpressionParser parser = new SpelExpressionParser();
Expression exp = parser.parseExpression("name");
EvaluationContext context = new StandardEvaluationContext();
StandardEvaluationContext context = new StandardEvaluationContext();
context.setRootObject(tesla);
String name = (String) exp.getValue(context);
@@ -124,10 +122,9 @@ public class SpelDocumentationTests extends ExpressionTestCase {
@Test
public void testEqualityCheck() throws Exception {
ExpressionParser parser = new SpelExpressionParser();
EvaluationContext context = new StandardEvaluationContext();
StandardEvaluationContext context = new StandardEvaluationContext();
context.setRootObject(tesla);
Expression exp = parser.parseExpression("name == 'Nikola Tesla'");