Author: dsakovich
Date: 2008-01-11 14:01:05 -0500 (Fri, 11 Jan 2008)
New Revision: 5644
Modified:
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-1522
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:58:30 UTC (rev 5643)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-11
19:01:05 UTC (rev 5644)
@@ -266,30 +266,17 @@
*/
public void testInclude() throws Throwable {
// check absolute path
- nsIDOMElement element =
performTestForFaceletComponent("components/include_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/include_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();
}