You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by rd...@apache.org on 2010/07/30 22:01:30 UTC
svn commit: r980934 - in /myfaces/test/trunk/test12/src:
main/java/org/apache/myfaces/test/el/ test/java/org/apache/myfaces/test/el/
Author: rdebusscher
Date: Fri Jul 30 20:01:30 2010
New Revision: 980934
URL: http://svn.apache.org/viewvc?rev=980934&view=rev
Log:
MYFACESTEST-20: Fixed problem with getValue() for MyFaces-core Impl.
Modified:
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockValueExpressionTest.java
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java?rev=980934&r1=980933&r2=980934&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java Fri Jul 30 20:01:30 2010
@@ -81,14 +81,28 @@ public class MockCompositeValueExpressio
@Override
public Object getValue(ELContext context)
{
- // Well only composite strings are supported.
+ if (valueExpressionChain.size() > 1)
+ {
+ // Well only composite strings are supported.
- StringBuilder result = new StringBuilder();
- for (ValueExpression valueExpression : valueExpressionChain)
+ StringBuilder result = new StringBuilder();
+ for (ValueExpression valueExpression : valueExpressionChain)
+ {
+ result.append(valueExpression.getValue(context));
+ }
+ return result.toString();
+ }
+ else
{
- result.append(valueExpression.getValue(context));
+ if (valueExpressionChain.size() == 1)
+ {
+ return valueExpressionChain.get(0).getValue(context);
+ }
+ else
+ {
+ return null;
+ }
}
- return result.toString();
}
@Override
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java?rev=980934&r1=980933&r2=980934&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java Fri Jul 30 20:01:30 2010
@@ -150,8 +150,7 @@ public class MockExpressionFactory exten
String expression,
Class expectedType) {
- //return new MockCompositeValueExpression(expression, expectedType); -> Failing tests in MyFaces-Core-Impl
- return new MockValueExpression(expression, expectedType);
+ return new MockCompositeValueExpression(expression, expectedType);
}
Modified: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockValueExpressionTest.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockValueExpressionTest.java?rev=980934&r1=980933&r2=980934&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockValueExpressionTest.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockValueExpressionTest.java Fri Jul 30 20:01:30 2010
@@ -60,9 +60,7 @@ public class MockValueExpressionTest ext
assertEquals("BAR", value);
}
- /*
- MockCompositeValueExpression -> Failing tests in MyFaces-Core-Impl
- public void testGetCompositeValue()
+ public void testGetCompositeValue()
{
// set value of #{foo} to BAR in request scope
externalContext.getRequestMap().put("foo", "BAR");
@@ -73,5 +71,5 @@ public class MockValueExpressionTest ext
Object value = ve.getValue(elContext);
assertEquals("test BAR", value);
}
-*/
+
}