Author: apetrelli
Date: Fri Dec 15 04:50:04 2006
New Revision: 487535
URL: http://svn.apache.org/viewvc?view=rev&rev=487535
Log:
STR-2986
Converted tests to Tiles 2, now all the code compiles, but it does not work.
Removed:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/CustomI18nFactorySet.java
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-A.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B__US.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B___XX.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B_en.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B_en_GB.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B_en_US.xml
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/I18nFactorySet-B_en_US_XX.xml
Modified:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/tiles-defs.xml
Modified:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java?view=diff&rev=487535&r1=487534&r2=487535
==============================================================================
---
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
Fri Dec 15 04:50:04 2006
@@ -21,26 +21,24 @@
package org.apache.struts.tiles2;
+import javax.servlet.ServletException;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.struts.Globals;
+import org.apache.struts.action.PlugIn;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.ModuleConfigFactory;
import org.apache.struts.config.PlugInConfig;
import org.apache.struts.mock.MockActionServlet;
import org.apache.struts.mock.TestMockBase;
-import org.apache.struts.Globals;
-import org.apache.struts.tiles2.ComponentDefinition;
-import org.apache.struts.tiles2.DefinitionsFactory;
-import org.apache.struts.tiles2.TilesUtil;
-import org.apache.struts.tiles2.xmlDefinition.I18nFactorySet;
import org.apache.struts.util.RequestUtils;
-import org.apache.struts.action.PlugIn;
-import org.apache.commons.beanutils.BeanUtils;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import javax.servlet.ServletException;
-import java.util.Locale;
-import java.util.Map;
-import java.util.HashMap;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.impl.BasicTilesContainer;
public class TestTilesPlugin extends TestMockBase {
@@ -79,7 +77,6 @@
{
super.setUp();
- TilesUtil.testReset();
actionServlet = new MockActionServlet(context, config);
}
@@ -171,29 +168,28 @@
// mock request context
request.setAttribute(Globals.MODULE_KEY, module1);
request.setPathElements("/myapp", "/module1/foo.do", null, null);
+
+ // Retrieve TilesContainer
+ TilesContainer container = TilesAccess.getContainer(actionServlet
+ .getServletContext());
+ assertSame(container.getClass().getName(), BasicTilesContainer.class);
+
// Retrieve factory for module1
- DefinitionsFactory factory1 =
- TilesUtil.getDefinitionsFactory(request, context);
+ DefinitionsFactory factory1 = ((BasicTilesContainer) container)
+ .getDefinitionsFactory();
assertNotNull("factory found", factory1);
- assertEquals(
- "factory name",
- "/module1",
- factory1.getConfig().getFactoryName());
// mock request context
request.setAttribute(Globals.MODULE_KEY, module2);
request.setPathElements("/myapp", "/module2/foo.do", null, null);
// Retrieve factory for module2
- DefinitionsFactory factory2 =
- TilesUtil.getDefinitionsFactory(request, context);
+ DefinitionsFactory factory2 = ((BasicTilesContainer) container)
+ .getDefinitionsFactory();
assertNotNull("factory found", factory2);
- assertEquals(
- "factory name",
- "/module2",
- factory2.getConfig().getFactoryName());
// Check that factory are different
+ // FIXME This assert fails!
assertNotSame("Factory from different modules", factory1, factory2);
}
@@ -211,177 +207,26 @@
// mock request context
request.setAttribute(Globals.MODULE_KEY, module1);
request.setPathElements("/myapp", "/module1/foo.do", null, null);
- // Retrieve factory for module1
- DefinitionsFactory factory1 = TilesUtil.getDefinitionsFactory( request,
context);
+ // Retrieve TilesContainer
+ TilesContainer container = TilesAccess.getContainer(actionServlet
+ .getServletContext());
+ assertSame(container.getClass().getName(), BasicTilesContainer.class);
+
+ // Retrieve factory for module1
+ DefinitionsFactory factory1 = ((BasicTilesContainer) container)
+ .getDefinitionsFactory();
assertNotNull( "factory found", factory1);
- assertEquals( "factory name", "/module1",
factory1.getConfig().getFactoryName() );
// mock request context
request.setAttribute(Globals.MODULE_KEY, module2);
request.setPathElements("/myapp", "/module2/foo.do", null, null);
- // Retrieve factory for module2
- DefinitionsFactory factory2 = TilesUtil.getDefinitionsFactory( request,
context);
+ // Retrieve factory for module2
+ DefinitionsFactory factory2 = ((BasicTilesContainer) container)
+ .getDefinitionsFactory();
assertNotNull( "factory found", factory2);
- assertEquals( "factory name", "/module1",
factory2.getConfig().getFactoryName() );
// Check that factory are different
assertEquals("Same factory", factory1, factory2);
}
-
- /**
- * Test I18nFactorySet.
- */
- public void testI18FactorySet_A() {
-
- Locale locale = null;
- ComponentDefinition definition = null;
- org.apache.struts.tiles2.xmlDefinition.DefinitionsFactory factory = null;
-
- Map properties = new HashMap();
-
- // Set the file name
- properties.put(I18nFactorySet.DEFINITIONS_CONFIG_PARAMETER_NAME,
- "config/I18nFactorySet-A.xml");
-
- try {
- CustomI18nFactorySet i18nFactorySet = new
CustomI18nFactorySet(context, properties);
- String defName = "A-DEFAULT";
-
- // Default Locale
- locale = new Locale("", "", "");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("DefinitionsFactory is nullfor locale='" +
print(locale) + "'", factory);
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("Definition '" + defName + "' Not Found for locale='" +
print(locale) + "'", definition);
- assertEquals("Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // Variant Only
- locale = new Locale("", "", "XX");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("Definition '" + defName + "' Not Found for locale='" +
print(locale) + "'", definition);
- assertEquals("Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // No Language, Country & Variant Locale
- locale = new Locale("", "US", "XX");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("Definition '" + defName + "' Not Found for locale='" +
print(locale) + "'", definition);
- assertEquals("Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // Language & Country
- locale = new Locale("en", "US");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("Definition '" + defName + "' Not Found for locale='" +
print(locale) + "'", definition);
- assertEquals("Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- } catch(Exception ex) {
- fail(ex.toString());
- }
- }
-
-
- /**
- * Test I18nFactorySet.
- */
- public void testI18FactorySet_B() {
-
- Locale locale = null;
- ComponentDefinition definition = null;
- org.apache.struts.tiles2.xmlDefinition.DefinitionsFactory factory = null;
-
- Map properties = new HashMap();
-
- // Set the file name
- properties.put(I18nFactorySet.DEFINITIONS_CONFIG_PARAMETER_NAME,
- "config/I18nFactorySet-B.xml");
-
- try {
-
- CustomI18nFactorySet i18nFactorySet = new
CustomI18nFactorySet(context, properties);
- String defName = null;
-
- // Default Locale
- locale = new Locale("", "", "");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("1. DefinitionsFactory is nullfor locale='" +
print(locale) + "'", factory);
- defName = "B-DEFAULT";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("2. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("3. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // Variant Only
- locale = new Locale("", "", "XX");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("4. DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- defName = "B___XX";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("5. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("6. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
- defName = "B-DEFAULT";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("7. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("8. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // No Language, Country & Unknown Variant
- locale = new Locale("", "US", "XX");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("9. DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- defName = "B__US";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("10. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("11. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // Language & Country
- locale = new Locale("en", "US");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("12. DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- defName = "B_en_US";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("13. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("14. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // Language, Country & Unknown Variant
- locale = new Locale("en", "GB", "XX");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("15. DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- defName = "B_en_GB";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("16. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("17. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- // Language, Unknown Country & Unknown Variant
- locale = new Locale("en", "FR", "XX");
- factory = i18nFactorySet.createFactory(locale , request, context);
- assertNotNull("18. DefinitionsFactory is null for locale='" +
print(locale) + "'", factory);
- defName = "B_en";
- definition = factory.getDefinition(defName, request, context);
- assertNotNull("19. Definition '" + defName + "' Not Found for
locale='" + print(locale) + "'", definition);
- assertEquals("20. Definition '" + defName + "' for locale='" +
print(locale) + "'", defName, definition.getName());
-
- } catch(Exception ex) {
- fail(ex.toString());
- }
-
- }
-
- /**
- * String representation of a Locale. A bug in the
- * Locale.toString() method results in Locales with
- * just a variant being incorrectly displayed.
- */
- private String print(Locale locale) {
-
- return locale.getLanguage() + "_" +
- locale.getCountry() + "_" +
- locale.getVariant();
- }
-
-
-
}
Modified:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/tiles-defs.xml?view=diff&rev=487535&r1=487534&r2=487535
==============================================================================
---
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/tiles-defs.xml
(original)
+++
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/tiles-defs.xml
Fri Dec 15 04:50:04 2006
@@ -19,8 +19,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
- "http://struts.apache.org/dtds/tiles-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/tiles-config_2_0.dtd";>
<!-- Definitions for Tiles documentation -->
@@ -31,7 +31,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+ <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
@@ -43,7 +43,7 @@
<!-- Main page body definitions
-->
<!-- ======================================================= -->
- <definition name="doc.portal.body" path="/layout/columnsLayout.jsp">
+ <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
<put name="numCols" value="2" />
<putList name="list0" >
<add value="/doc/portal/welcome.jsp" />
@@ -66,7 +66,7 @@
<!-- ======================================================= -->
<!-- Menu bar definition -->
-<definition name="doc.menu.main" path="/layout/vboxLayout.jsp" >
+<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
<putList name="componentsList" >
<add value="doc.menu.links" />
<add value="doc.menu.taglib.references" />
@@ -76,7 +76,7 @@
</definition>
<!-- Documentation menu definition v1.1-->
-<definition name="doc.menu.links" path="/layouts/menu.jsp" >
+<definition name="doc.menu.links" template="/layouts/menu.jsp" >
<put name="title" value="Documentation" />
<putList name="items" >
<item value="Home" link="/index.jsp" />
@@ -102,7 +102,7 @@
</definition>
<!-- Printer friendly menu definition -->
-<definition name="doc.menu.printer.friendly" path="/layouts/menu.jsp" >
+<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
<put name="title" value="Printer Versions" />
<putList name="items" >
<item value="Quick Overview" link="/test/testAll.jsp" />
@@ -113,7 +113,7 @@
</definition>
<!-- Taglib menu definition -->
-<definition name="doc.menu.taglib.references" path="/layouts/menu.jsp" >
+<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
<put name="title" value="Tag Library Reference" />
<putList name="items" >
<item value="Tiles Tags" link="/doc/tilesTags.jsp" />
@@ -122,7 +122,7 @@
</definition>
<!-- Oldies menu definition -->
-<definition name="doc.menu.old.documents" path="/layouts/menu.jsp" >
+<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
<put name="title" value="Old Documents" />
<putList name="items" >
<item value="Overview (old)" link="/doc/overview.jsp" />
