From jbosstools-commits at lists.jboss.org Fri Jan 11 13:55:28 2008 Content-Type: multipart/mixed; boundary="===============7581494726955464918==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r5642 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test: src/org/jboss/tools/jsf/vpe/facelets/test and 1 other directory. Date: Fri, 11 Jan 2008 13:55:27 -0500 Message-ID: --===============7581494726955464918== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dsakovich Date: 2008-01-11 13:55:27 -0500 (Fri, 11 Jan 2008) New Revision: 5642 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelets= Test/WebContent/pages/components/composition_absolute.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelets= Test/WebContent/pages/components/composition_related.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool= s/jsf/vpe/facelets/test/FaceletsComponentTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1515 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/f= aceletsTest/WebContent/pages/components/composition_absolute.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet= sTest/WebContent/pages/components/composition_absolute.xhtml 2008-01-11 18:= 27:31 UTC (rev 5641) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet= sTest/WebContent/pages/components/composition_absolute.xhtml 2008-01-11 18:= 55:27 UTC (rev 5642) @@ -1,14 +1,12 @@ - - - = - - = - JSF 1.2 and Facelets under Tomcat. KickSt= art Application - = - JSF 1.2 Hello Application - = - - + + + + + + JSF 1.2 and Facelets under Tomcat. KickStar= t Application + + + Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/f= aceletsTest/WebContent/pages/components/composition_related.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet= sTest/WebContent/pages/components/composition_related.xhtml 2008-01-11 18:2= 7:31 UTC (rev 5641) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet= sTest/WebContent/pages/components/composition_related.xhtml 2008-01-11 18:5= 5:27 UTC (rev 5642) @@ -1,14 +1,12 @@ - - - = - - = - JSF 1.2 and Facelets under Tomcat. KickSt= art Application - = - JSF 1.2 Hello Application - = - - + + + + + + JSF 1.2 and Facelets under Tomcat. KickStar= t Application + + + Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbo= ss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too= ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-11 18:27:31 UTC= (rev 5641) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too= ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-11 18:55:27 UTC= (rev 5642) @@ -125,29 +125,16 @@ = // check absolute path nsIDOMElement element =3D performTestForFaceletComponent("components/comp= osition_absolute.xhtml"); - nsIDOMNode node =3D (nsIDOMNode) element - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); = - List elements =3D new ArrayList(); + 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 =3D performTestForFaceletComponent("components/composition_relate= d.xhtml"); - node =3D (nsIDOMNode) element.queryInterface(nsIDOMNode.NS_IDOMNODE_IID); = - elements =3D new ArrayList(); + 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() !=3D null) { throw getException(); } @@ -399,4 +386,35 @@ return element; } = + private void checkTemplatePage(nsIDOMElement element, String contextSt= ring, + String message) { + nsIDOMNode node =3D (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + + List elements =3D new ArrayList(); + + // find "table" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_TABLE); + + assertEquals(message, 1, elements.size()); + + nsIDOMElement table =3D (nsIDOMElement) elements.get(0).queryInterface( + nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement tbody =3D (nsIDOMElement) table.getFirstChild() + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement tr =3D (nsIDOMElement) tbody.getFirstChild() + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement td =3D (nsIDOMElement) tr.getFirstChild().queryInterface( + nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement div =3D (nsIDOMElement) td.getFirstChild().queryInterface( + nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement span =3D (nsIDOMElement) div.getFirstChild() + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + + nsIDOMText text =3D (nsIDOMText) span.getFirstChild().queryInterface( + nsIDOMText.NS_IDOMTEXT_IID); + + assertEquals(message, contextString, text.getNodeValue()); + } + } --===============7581494726955464918==--