[webbeans-commits] Webbeans SVN: r3514 - ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck and 2 other directories.

Author: pete.muir(a)jboss.org Date: 2009-08-16 05:52:30 -0400 (Sun, 16 Aug 2009) New Revision: 3514 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java Log: Enable test Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java 2009-08-16 09:51:06 UTC (rev 3513) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java 2009-08-16 09:52:30 UTC (rev 3514) @@ -164,10 +164,14 @@ if (!(o instanceof ELCreationalContextStack)) { ELCreationalContextStack store = ELCreationalContextStack.addToContext(context); + o = store; + } + ELCreationalContextStack store = (ELCreationalContextStack) o; + if (store.isEmpty()) + { // TODO need to use correct manager for module ELCreationalContext<?> creationalContext = ELCreationalContext.of(CurrentManager.rootManager().createCreationalContext(CONTEXTUAL)); store.push(creationalContext); - o = store; } return (ELCreationalContextStack) o; } Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java 2009-08-16 09:51:06 UTC (rev 3513) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java 2009-08-16 09:52:30 UTC (rev 3514) @@ -11,15 +11,19 @@ @SuppressWarnings("unchecked") public <T> T evaluateValueExpression(String expression, Class<T> expectedType) { - ELContext elContext = EL.createELContext(); + ELContext elContext = createELContext(); return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext); } @SuppressWarnings("unchecked") public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams) { - ELContext elContext = EL.createELContext(); + ELContext elContext = createELContext(); return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams); } + public ELContext createELContext() + { + return EL.createELContext(); + } } Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java 2009-08-16 09:51:06 UTC (rev 3513) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java 2009-08-16 09:52:30 UTC (rev 3514) @@ -1,5 +1,7 @@ package org.jboss.jsr299.tck.spi; +import javax.el.ELContext; + /** * This interface provides operations relating to EL. * @@ -33,4 +35,6 @@ */ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams); + public ELContext createELContext(); + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-08-16 09:51:06 UTC (rev 3513) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-08-16 09:52:30 UTC (rev 3514) @@ -51,11 +51,10 @@ assert tunaFarm.tuna != null; } - @Test(groups={"el", "broken"}) - // TODO PLM Marked broken, as the spec says the *el resolver* returns null, not the whole value expression + @Test(groups={"el"}) @SpecAssertion(section="5.8", id="bb") public void testUnresolvedNameReturnsNull() { - assert getCurrentConfiguration().getEl().evaluateValueExpression("#{nonExistingTuna}", Tuna.class) == null; + assert getCurrentManager().getELResolver().getValue(getCurrentConfiguration().getEl().createELContext(), null, "nonExistingTuna") == null; } @Test(groups = "el")