Author: dsakovich
Date: 2008-01-12 11:27:13 -0500 (Sat, 12 Jan 2008)
New Revision: 5654
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.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-1584
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml 2008-01-12
15:35:46 UTC (rev 5653)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml 2008-01-12
16:27:13 UTC (rev 5654)
@@ -38,7 +38,7 @@
</td>
</tr>
<tr>
- <td height="1" width="100%"
bgcolor="#CAD6E0"></td>
+ <td height="1" width="100%" bgcolor="#CAD6E0"
align="center">#{user}</td>
</tr>
<tr>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml 2008-01-12
15:35:46 UTC (rev 5653)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml 2008-01-12
16:27:13 UTC (rev 5654)
@@ -10,8 +10,7 @@
<body bgcolor="#ffffff">
<ui:include src="insert.xhtml">
- <ui:param name="user" value="#{currentUser}" />
- <ui:param name="page" value="home"/>
+ <ui:param name="user" value="#{currentUser}" />
</ui:include>
</body>
</html>
\ No newline at end of file
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-12
15:35:46 UTC (rev 5653)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-12
16:27:13 UTC (rev 5654)
@@ -23,6 +23,7 @@
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
import org.mozilla.interfaces.nsIDOMText;
/**
@@ -95,20 +96,26 @@
// find "span" elements
TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN);
- assertEquals(2, elements.size());
+ assertEquals(3, elements.size());
nsIDOMElement elementSpan0 = (nsIDOMElement) elements.get(0)
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
nsIDOMElement elementSpan1 = (nsIDOMElement) elements.get(1)
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMElement elementSpan2 = (nsIDOMElement) elements.get(2)
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
nsIDOMText text0 = (nsIDOMText) elementSpan0.getFirstChild()
.queryInterface(nsIDOMText.NS_IDOMTEXT_IID);
nsIDOMText text1 = (nsIDOMText) elementSpan1.getFirstChild()
.queryInterface(nsIDOMText.NS_IDOMTEXT_IID);
+ nsIDOMText text2 = (nsIDOMText) elementSpan2.getFirstChild()
+ .queryInterface(nsIDOMText.NS_IDOMTEXT_IID);
assertEquals("Defined content is not shown", text0.getNodeValue(),
"Greeting Page");
assertEquals("Defined content is not shown", text1.getNodeValue(),
+ "#{user}");
+ assertEquals("Defined content is not shown", text2.getNodeValue(),
"#{person.name}!");
if (getException() != null) {
@@ -250,7 +257,7 @@
nsIDOMElement elementDT = (nsIDOMElement) elementDL.getFirstChild()
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
-
+
assertEquals("Component's content is not shown", HTML.TAG_DT, elementDT
.getNodeName().toUpperCase());
@@ -360,6 +367,53 @@
return element;
}
+ /**
+ * Test for ui:param
+ *
+ * @throws Throwable
+ */
+ public void testParam() throws Throwable {
+ // check absolute path
+ nsIDOMElement element =
performTestForFaceletComponent("components/composition_absolute.xhtml");
+
+ nsIDOMNode node = (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+
+ // find "table" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_TABLE);
+
+ assertEquals("Component's content is not shown", 1, elements.size());
+
+ nsIDOMElement table = (nsIDOMElement) elements.get(0).queryInterface(
+ nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMElement tbody = (nsIDOMElement) table.getFirstChild()
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ nsIDOMNodeList list = tbody.getChildNodes();
+
+ assertEquals("Component's content is not shown", 4, list.getLength());
+
+ nsIDOMElement tr = (nsIDOMElement) list.item(1).queryInterface(
+ nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ nsIDOMElement td = (nsIDOMElement) tr.getFirstChild().queryInterface(
+ nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMElement span = (nsIDOMElement) td.getFirstChild().queryInterface(
+ nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ nsIDOMText text = (nsIDOMText) span.getFirstChild().queryInterface(
+ nsIDOMText.NS_IDOMTEXT_IID);
+
+ assertEquals("Component's content is not shown", text.getNodeValue(),
+ "#{currentUser}");
+
+ if (getException() != null) {
+ throw getException();
+ }
+ }
+
private void checkTemplatePage(nsIDOMElement element, String contextString,
String message) {
nsIDOMNode node = (nsIDOMNode) element