Author: apetrelli
Date: Fri Feb 13 12:25:34 2009
New Revision: 744097
URL: http://svn.apache.org/viewvc?rev=744097&view=rev
Log:
TILES-365
Added test case to avoid regression.
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java?rev=744097&r1=744096&r2=744097&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
Fri Feb 13 12:25:34 2009
@@ -37,7 +37,9 @@
import java.util.Map;
import java.util.Set;
+import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
+import org.apache.tiles.ListAttribute;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.context.TilesRequestContext;
@@ -656,4 +658,29 @@
definition = definitionDao.getDefinition("test.def3", null);
assertNotNull("The simple definition is null", definition);
}
+
+ /**
+ * Tests
+ * {...@link ResolvingLocaleUrlDefinitionDAO#getDefinition(String, Locale)}
+ * when loading multiple files for a locale.
+ *
+ * @throws IOException If something goes wrong.
+ */
+ @SuppressWarnings("unchecked")
+ public void testListAttributeLocaleInheritance() throws IOException {
+ URL url = this.getClass().getClassLoader().getResource(
+ "org/apache/tiles/config/tiles-defs-2.1.xml");
+ definitionDao.addSourceURL(url);
+ TilesApplicationContext applicationContext = EasyMock
+ .createMock(TilesApplicationContext.class);
+ definitionDao.setReader(new DigesterDefinitionsReader());
+ EasyMock.replay(applicationContext);
+
+ Definition definition = definitionDao.getDefinition(
+ "test.inherit.list", Locale.ITALIAN);
+ ListAttribute listAttribute = (ListAttribute) definition
+ .getAttribute("list");
+ List<Attribute> attributes = (List<Attribute>)
listAttribute.getValue();
+ assertEquals(2, attributes.size());
+ }
}