Author: dsakovich
Date: 2008-01-11 13:58:30 -0500 (Fri, 11 Jan 2008)
New Revision: 5643
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_absolute.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_related.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1517
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_absolute.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_absolute.xhtml 2008-01-11
18:55:27 UTC (rev 5642)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_absolute.xhtml 2008-01-11
18:58:30 UTC (rev 5643)
@@ -1,14 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core">
-
- <ui:decorate template="/pages/components/insert.xhtml">
-
- <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat.
KickStart Application</ui:define>
-
- <ui:define name="pageHeader">JSF 1.2 Hello
Application</ui:define>
-
- </ui:decorate>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core">
+
+<ui:decorate template="/pages/components/insert.xhtml">
+
+ <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat. KickStart
Application</ui:define>
+
+</ui:decorate>
+</html>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_related.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_related.xhtml 2008-01-11
18:55:27 UTC (rev 5642)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate_related.xhtml 2008-01-11
18:58:30 UTC (rev 5643)
@@ -1,14 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core">
-
- <ui:decorate template="./insert.xhtml">
-
- <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat.
KickStart Application</ui:define>
-
- <ui:define name="pageHeader">JSF 1.2 Hello
Application</ui:define>
-
- </ui:decorate>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core">
+
+<ui:decorate template="./insert.xhtml">
+
+ <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat. KickStart
Application</ui:define>
+
+</ui:decorate>
+</html>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-11
18:55:27 UTC (rev 5642)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-11
18:58:30 UTC (rev 5643)
@@ -212,30 +212,17 @@
*/
public void testDecorate() throws Throwable {
// check absolute path
- nsIDOMElement element =
performTestForFaceletComponent("components/decorate_absolute.xhtml");
- nsIDOMNode node = (nsIDOMNode) element
- .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+ nsIDOMElement element =
performTestForFaceletComponent("components/composition_absolute.xhtml");
- List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+ checkTemplatePage(element, "Page Header",
+ "Template with absolute path is not included");
- // find "table" elements
- TestUtil.findElementsByName(node, elements, HTML.TAG_TABLE);
-
- assertEquals("Template with absolute path is not included", 1, elements
- .size());
-
// check related path
- element =
performTestForFaceletComponent("components/decorate_related.xhtml");
- node = (nsIDOMNode) element.queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+ element =
performTestForFaceletComponent("components/composition_related.xhtml");
- elements = new ArrayList<nsIDOMNode>();
+ checkTemplatePage(element, "Page Header",
+ "Template with related path is not included");
- // find "table" elements
- TestUtil.findElementsByName(node, elements, HTML.TAG_TABLE);
-
- assertEquals("Template with related path is not included", 1, elements
- .size());
-
if (getException() != null) {
throw getException();
}