introduced TypeDescriptor.OBJECT and TypeDescriptor.STRING

This commit is contained in:
Juergen Hoeller
2009-12-15 10:21:16 +00:00
parent 1b0c6b848d
commit f52986ea15
16 changed files with 109 additions and 116 deletions

View File

@@ -257,10 +257,10 @@ public class ExpressionStateTests extends ExpressionTestCase {
@Test
public void testTypeConversion() throws EvaluationException {
ExpressionState state = getState();
String s = (String)state.convertValue(34,TypeDescriptor.valueOf(String.class));
String s = (String)state.convertValue(34,TypeDescriptor.STRING);
Assert.assertEquals("34",s);
s = (String)state.convertValue(new TypedValue(34),TypeDescriptor.valueOf(String.class));
s = (String)state.convertValue(new TypedValue(34),TypeDescriptor.STRING);
Assert.assertEquals("34",s);
}

View File

@@ -78,7 +78,7 @@ public class MapAccessTests extends ExpressionTestCase {
}
public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
return new TypedValue(((Map) target).get(name), TypeDescriptor.valueOf(Object.class));
return new TypedValue(((Map) target).get(name), TypeDescriptor.OBJECT);
}
public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {

View File

@@ -155,7 +155,7 @@ public class PropertyAccessTests extends ExpressionTestCase {
public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
if (!name.equals("flibbles"))
throw new RuntimeException("Assertion Failed! name should be flibbles");
return new TypedValue(flibbles, TypeDescriptor.valueOf(String.class));
return new TypedValue(flibbles, TypeDescriptor.STRING);
}
public void write(EvaluationContext context, Object target, String name, Object newValue)

View File

@@ -219,7 +219,7 @@ public class SpringEL300Tests extends ExpressionTestCase {
}
public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
return new TypedValue(((Map) target).get(name), TypeDescriptor.valueOf(Object.class));
return new TypedValue(((Map) target).get(name), TypeDescriptor.OBJECT);
}
public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {