From jbosstools-commits at lists.jboss.org Fri Jan 11 13:58:31 2008 Content-Type: multipart/mixed; boundary="===============7956422512176154125==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r5643 - 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:58:30 -0500 Message-ID: --===============7956422512176154125== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/facelets= Test/WebContent/pages/components/decorate_absolute.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelets= Test/WebContent/pages/components/decorate_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-1517 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/f= aceletsTest/WebContent/pages/components/decorate_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/decorate_absolute.xhtml 2008-01-11 18:55:= 27 UTC (rev 5642) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet= sTest/WebContent/pages/components/decorate_absolute.xhtml 2008-01-11 18:58:= 30 UTC (rev 5643) @@ -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/decorate_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/decorate_related.xhtml 2008-01-11 18:55:2= 7 UTC (rev 5642) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet= sTest/WebContent/pages/components/decorate_related.xhtml 2008-01-11 18:58:3= 0 UTC (rev 5643) @@ -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:55:27 UTC= (rev 5642) +++ 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:58:30 UTC= (rev 5643) @@ -212,30 +212,17 @@ */ public void testDecorate() throws Throwable { // check absolute path - nsIDOMElement element =3D performTestForFaceletComponent("components/deco= rate_absolute.xhtml"); - nsIDOMNode node =3D (nsIDOMNode) element - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + nsIDOMElement element =3D performTestForFaceletComponent("components/comp= osition_absolute.xhtml"); = - 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/decorate_related.x= html"); - node =3D (nsIDOMNode) element.queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + element =3D performTestForFaceletComponent("components/composition_relate= d.xhtml"); = - 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(); } --===============7956422512176154125==--