You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2006/12/02 23:43:41 UTC
svn commit: r481656 - in
/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles:
config/defs1.xml config/defs1_fr.xml
definition/TestUrlDefinitionsFactory.java
Author: apetrelli
Date: Sat Dec 2 14:43:40 2006
New Revision: 481656
URL: http://svn.apache.org/viewvc?view=rev&rev=481656
Log:
SB-100
Added test cases to check inheritance between files.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml?view=diff&rev=481656&r1=481655&r2=481656
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml Sat Dec 2 14:43:40 2006
@@ -54,4 +54,24 @@
<put name="body" value="doc.portal.body" />
</definition>
+ <!-- This definition will be extended -->
+ <definition name="test.def.toextend" template="/test.jsp">
+ <put name="country" value="default"/>
+ <put name="title" value="Definition to be extended" />
+ <put name="header" value="/common/header.jsp" />
+ <put name="menu" value="doc.menu.main" />
+ <put name="footer" value="/common/footer.jsp" />
+ <put name="body" value="doc.portal.body" />
+ </definition>
+
+ <!-- This definition will be overridden -->
+ <definition name="test.def.overridden" template="/test.jsp">
+ <put name="country" value="default"/>
+ <put name="title" value="Definition to be overridden" />
+ <put name="header" value="/common/header.jsp" />
+ <put name="menu" value="doc.menu.main" />
+ <put name="footer" value="/common/footer.jsp" />
+ <put name="body" value="doc.portal.body" />
+ </definition>
+
</tiles-definitions>
Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml?view=diff&rev=481656&r1=481655&r2=481656
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml Sat Dec 2 14:43:40 2006
@@ -53,4 +53,8 @@
<put name="body" value="doc.portal.body" />
</definition>
+ <definition name="test.def.overridden" extends="test.def.toextend">
+ <put name="country" value="France"/>
+ </definition>
+
</tiles-definitions>
Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?view=diff&rev=481656&r1=481655&r2=481656
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java Sat Dec 2 14:43:40 2006
@@ -142,6 +142,9 @@
assertNotNull("test.common definition in CHINA locale not found.", factory.getDefinition("test.common", chinaContext));
assertNotNull("test.common.french definition in FRENCH locale not found.", factory.getDefinition("test.common.french", frenchContext));
assertNotNull("test.common.french definition in CANADA_FRENCH locale not found.", factory.getDefinition("test.common.french", canadaFrenchContext));
+ assertNotNull("test.def.toextend definition not found.", factory.getDefinition("test.def.toextend", emptyContext));
+ assertNotNull("test.def.overridden definition not found.", factory.getDefinition("test.def.overridden", emptyContext));
+ assertNotNull("test.def.overridden definition in FRENCH locale not found.", factory.getDefinition("test.def.overridden", frenchContext));
assertEquals("Incorrect default country value", "default",
factory.getDefinition("test.def1", emptyContext).getAttribute("country"));
@@ -151,6 +154,14 @@
factory.getDefinition("test.def1", frenchContext).getAttribute("country"));
assertEquals("Incorrect Chinese country value (should be default)", "default",
factory.getDefinition("test.def1", chinaContext).getAttribute("country"));
+ assertEquals("Incorrect default country value", "default",
+ factory.getDefinition("test.def.overridden", emptyContext).getAttribute("country"));
+ assertEquals("Incorrect default title value", "Definition to be overridden",
+ factory.getDefinition("test.def.overridden", emptyContext).getAttribute("title"));
+ assertEquals("Incorrect France country value", "France",
+ factory.getDefinition("test.def.overridden", frenchContext).getAttribute("country"));
+ assertEquals("Incorrect France title value", "Definition to be extended",
+ factory.getDefinition("test.def.overridden", frenchContext).getAttribute("title"));
}
/**