You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2008/03/13 21:00:05 UTC
svn commit: r636859 - in /tiles/framework/trunk/tiles-core/src:
main/java/org/apache/tiles/evaluator/el/
test/java/org/apache/tiles/evaluator/el/
test/java/org/apache/tiles/evaluator/impl/
Author: apetrelli
Date: Thu Mar 13 13:00:03 2008
New Revision: 636859
URL: http://svn.apache.org/viewvc?rev=636859&view=rev
Log:
TILES-48
Fixed resolvers.
Removed unnecessary code in ELAttributeResolver.
Renamed DirectEvaluatorTest to DirectAttributeEvaluatorTest.
Added test for ELAttributeEvaluator.
Added:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java (with props)
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
- copied, changed from r636835, tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectEvaluatorTest.java
Removed:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectEvaluatorTest.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java?rev=636859&r1=636858&r2=636859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java Thu Mar 13 13:00:03 2008
@@ -31,8 +31,6 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.awareness.TilesContainerAware;
import org.apache.tiles.awareness.TilesContextFactoryAware;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
@@ -51,7 +49,7 @@
* @since 2.1.0
*/
public class ELAttributeEvaluator implements AttributeEvaluator,
- TilesContextFactoryAware, TilesContainerAware {
+ TilesContextFactoryAware {
/**
* The Tiles application context.
@@ -68,13 +66,6 @@
protected TilesContextFactory contextFactory;
/**
- * The Tiles container.
- *
- * @since 2.1.0
- */
- protected TilesContainer container;
-
- /**
* The EL expression factory.
*
* @since 2.1.0
@@ -116,11 +107,6 @@
/** {@inheritDoc} */
public void setContextFactory(TilesContextFactory contextFactory) {
this.contextFactory = contextFactory;
- }
-
- /** {@inheritDoc} */
- public void setContainer(TilesContainer container) {
- this.container = container;
}
/** {@inheritDoc} */
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java?rev=636859&r1=636858&r2=636859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java Thu Mar 13 13:00:03 2008
@@ -77,6 +77,7 @@
Object obj = findObjectByProperty(context, property);
if (obj != null) {
+ context.setPropertyResolved(true);
return obj.getClass();
}
return null;
@@ -89,7 +90,13 @@
return null;
}
- return findObjectByProperty(context, property);
+ Object retValue = findObjectByProperty(context, property);
+
+ if (retValue != null) {
+ context.setPropertyResolved(true);
+ }
+
+ return retValue;
}
/** {@inheritDoc} */
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java?rev=636859&r1=636858&r2=636859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java Thu Mar 13 13:00:03 2008
@@ -32,7 +32,6 @@
import javax.el.BeanELResolver;
import javax.el.ELContext;
-import javax.el.PropertyNotFoundException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -119,7 +118,7 @@
return null;
}
- Class<?> retValue;
+ Class<?> retValue = null;
if (requestProperties.contains(property)) {
TilesRequestContext request = (TilesRequestContext) context
.getContext(TilesRequestContext.class);
@@ -128,13 +127,12 @@
TilesApplicationContext applicationContext = (TilesApplicationContext) context
.getContext(TilesApplicationContext.class);
retValue = super.getType(context, applicationContext, property);
- } else {
- throw new PropertyNotFoundException(
- "Cannot find property "
- + property
- + " neither in TilesRequestContext nor in TilesApplicationContext");
}
- context.setPropertyResolved(true);
+
+ if (retValue != null) {
+ context.setPropertyResolved(true);
+ }
+
return retValue;
}
@@ -146,7 +144,7 @@
return null;
}
- Object retValue;
+ Object retValue = null;
if (requestProperties.contains(property)) {
TilesRequestContext request = (TilesRequestContext) context
@@ -156,11 +154,10 @@
TilesApplicationContext applicationContext = (TilesApplicationContext) context
.getContext(TilesApplicationContext.class);
retValue = super.getValue(context, applicationContext, property);
- } else {
- throw new PropertyNotFoundException(
- "Cannot find property "
- + property
- + " neither in TilesRequestContext nor in TilesApplicationContext");
+ }
+
+ if (retValue != null) {
+ context.setPropertyResolved(true);
}
return retValue;
Added: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java?rev=636859&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java (added)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java Thu Mar 13 13:00:03 2008
@@ -0,0 +1,109 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tiles.evaluator.el;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tiles.Attribute;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.context.TilesContextFactory;
+import org.apache.tiles.context.TilesRequestContext;
+import org.easymock.EasyMock;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests {@link ELAttributeEvaluator}.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ELAttributeEvaluatorTest extends TestCase {
+
+ /**
+ * The evaluator to test.
+ */
+ private ELAttributeEvaluator evaluator;
+
+ /**
+ * The request object to use.
+ */
+ private TilesRequestContext request;
+
+ /** {@inheritDoc} */
+ protected void setUp() throws Exception {
+ super.setUp();
+ evaluator = new ELAttributeEvaluator();
+ TilesContextFactory factory = EasyMock
+ .createMock(TilesContextFactory.class);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+ Map<String, Object> sessionScope = new HashMap<String, Object>();
+ Map<String, Object> applicationScope = new HashMap<String, Object>();
+ requestScope.put("object1", "value");
+ sessionScope.put("object2", new Integer(1));
+ applicationScope.put("object3", new Float(2.0));
+ request = EasyMock.createMock(TilesRequestContext.class);
+ EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
+ .anyTimes();
+ EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
+ .anyTimes();
+ TilesApplicationContext applicationContext = EasyMock
+ .createMock(TilesApplicationContext.class);
+ EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
+ applicationScope).anyTimes();
+ EasyMock.replay(request, applicationContext);
+
+ evaluator.setContextFactory(factory);
+ evaluator.setApplicationContext(applicationContext);
+ }
+
+ /**
+ * Tests
+ * {@link ELAttributeEvaluator#evaluate(Attribute, TilesRequestContext)}.
+ */
+ public void testEvaluate() {
+ Attribute attribute = new Attribute();
+ attribute.setValue("${requestScope.object1}");
+ assertEquals("The value is not correct", "value", evaluator.evaluate(
+ attribute, request));
+ attribute.setValue("${sessionScope.object2}");
+ assertEquals("The value is not correct", new Integer(1), evaluator
+ .evaluate(attribute, request));
+ attribute.setValue("${applicationScope.object3}");
+ assertEquals("The value is not correct", new Float(2.0), evaluator
+ .evaluate(attribute, request));
+ attribute.setValue("${object1}");
+ assertEquals("The value is not correct", "value", evaluator.evaluate(
+ attribute, request));
+ attribute.setValue("${object2}");
+ assertEquals("The value is not correct", new Integer(1), evaluator
+ .evaluate(attribute, request));
+ attribute.setValue("${object3}");
+ assertEquals("The value is not correct", new Float(2.0), evaluator
+ .evaluate(attribute, request));
+ attribute.setValue("String literal");
+ assertEquals("The value is not correct", "String literal", evaluator
+ .evaluate(attribute, request));
+ attribute.setValue(new Integer(2));
+ assertEquals("The value is not correct", new Integer(2), evaluator
+ .evaluate(attribute, request));
+ }
+}
Propchange: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java (from r636835, tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectEvaluatorTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java?p2=tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java&p1=tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectEvaluatorTest.java&r1=636835&r2=636859&rev=636859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectEvaluatorTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java Thu Mar 13 13:00:03 2008
@@ -29,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public class DirectEvaluatorTest extends TestCase {
+public class DirectAttributeEvaluatorTest extends TestCase {
/**
* The evaluator to test.