Author: dmaliarevich Date: 2012-09-27 07:00:29 -0400 (Thu, 27 Sep 2012) New Revision: 44090 Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java Log: https://issues.jboss.org/browse/JBIDE-9181 - tests for jsp templates were added. Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag 2012-09-27 11:00:29 UTC (rev 44090) @@ -2,10 +2,10 @@ <jsp:directive.taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <jsp:directive.attribute name="bookDB" required="true" type="com.sun.bookstore3.database.BookDB" %> -<jsp:directive.attribute name="color" required="true" /> +<jsp:directive.attribute name="color" required="true" id="DirectiveAttribute" /> <jsp:directive.attribute name="normalPrice" fragment="true" /> <jsp:directive.attribute name="onSale" fragment="true" /> -<jsp:directive.variable name-given="price" /> +<jsp:directive.variable name-given="price" id="DirectiveVariable"/> <jsp:directive.variable name-given="salePrice" /> <center> @@ -24,7 +24,7 @@ <c:set var="price" value="${book.price}" /> <c:choose> <c:when test="${book.onSale}" > - <jsp:invoke fragment="onSale" /> + <jsp:invoke fragment="onSale" id="Invoke"/> </c:when> <c:otherwise> <jsp:invoke fragment="normalPrice" /> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag 2012-09-27 11:00:29 UTC (rev 44090) @@ -1,3 +1,3 @@ <%-- double.tag --%> -<jsp:doBody /> +<jsp:doBody id="DoBody"/> <jsp:doBody /> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>jsp:attribute test</h1> - <jsp:attribute name="user">User</jsp:attribute> + <jsp:attribute name="user" id="attribute">User</jsp:attribute> <p>User is : ${param.user}</p> </body> </html> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -8,7 +8,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>jsp:body test</title> </head> - <jsp:body> + <jsp:body id="body"> <h1>jsp:body test</h1> </jsp:body> </html> Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,11 @@ +<tests> +<test id="body"> +<DIV> +<H1> +<SPAN CLASS="vpe-text"> +jsp:body test +</SPAN> +</H1> +</DIV> +</test> +</tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -11,7 +11,7 @@ </head> <body> <h1>Declaration test</h1> - <jsp:declaration> + <jsp:declaration id="declaration"> Date date = new Date(); </jsp:declaration> <jsp:scriptlet> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>jsp:directive.include test with absolute path</h1> - <jsp:directive.include file="/pages/components/include.jsp"/> + <jsp:directive.include file="/pages/components/include.jsp" id="directive_include_absolute"/> </body> </html> </jsp:root> Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,6 @@ +<tests> +<test id="directive_include_absolute"> +<DIV VPE:INCLUDE-ELEMENT="yes"> +</DIV> +</test> +</tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>jsp:directive.include test with relative path</h1> - <jsp:directive.include file="./include.jsp"/> + <jsp:directive.include file="./include.jsp" id="directive_include_relative"/> </body> </html> </jsp:root> Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,6 @@ +<tests> +<test id="directive_include_relative"> +<DIV VPE:INCLUDE-ELEMENT="yes"> +</DIV> +</test> +</tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> - <jsp:directive.page import="java.util.Date" /> + <jsp:directive.page import="java.util.Date" id="directive_page" /> <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" /> <![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -2,6 +2,7 @@ <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" xmlns:c="http://java.sun.com/jsp/jstl/core"> <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" /> + <jsp:directive.tag name="msg" display-name="Message" id="directive_tag" /> <![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]> <html xmlns="http://www.w3.org/1999/xhtml"> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> - <jsp:directive.taglib uri="http://java.sun.com/jstl/core" prefix="c" /> + <jsp:directive.taglib uri="http://java.sun.com/jstl/core" prefix="c" id="directive_taglib"/> <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" /> <![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -8,7 +8,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>jsp:element test</title> </head> - <jsp:element name="body"> + <jsp:element name="body" id="element"> <jsp:body> <h1>jsp:element test</h1> </jsp:body> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -11,7 +11,7 @@ </head> <body> <h1>Expression test</h1> - <jsp:expression> + <jsp:expression id="expression"> new Date() </jsp:expression> </body> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <jsp:body> <h1>jsp:forward test</h1> - <jsp:forward page="forward1.jsp"> + <jsp:forward page="forward1.jsp" id="forward"> <jsp:param name="username" value="User" /> </jsp:forward> </jsp:body> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -12,7 +12,7 @@ <h1>jsp:getProperty test</h1> <jsp:useBean id="calendar" scope="page" class="org.jboss.jsp.test.Calendar" /> <h2>Calendar for <jsp:getProperty name="calendar" - property="username" /></h2> + property="username" id="get_property" /></h2> </body> </html> </jsp:root> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>jsp:include test with absolute path</h1> - <jsp:include page="/pages/components/include.jsp"/> + <jsp:include page="/pages/components/include.jsp" id="include_absolute"/> </body> </html> </jsp:root> Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,6 @@ +<tests> +<test id="include_absolute"> +<DIV VPE:INCLUDE-ELEMENT="yes"> +</DIV> +</test> +</tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>jsp:include test with relative path</h1> - <jsp:include page="./include.jsp"/> + <jsp:include page="./include.jsp" id="include_relative"/> </body> </html> </jsp:root> Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,6 @@ +<tests> +<test id="include_relative"> +<DIV VPE:INCLUDE-ELEMENT="yes"> +</DIV> +</test> +</tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>jsp:output test</h1> - <jsp:output doctype-root-element="html" + <jsp:output doctype-root-element="html" id="output" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... /> </body> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -12,7 +12,7 @@ <h1>jsp:plugin test</h1> <jsp:plugin type="applet" code="JavaClock.class" codebase="/resources/applets" width="160" - height="150"> + height="150" id="plugin"> <jsp:fallback> Plugin tag not supported. </jsp:fallback> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" id="root"> <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" /> <![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -11,7 +11,7 @@ </head> <body> <h1>Scriptlet Test</h1> - <jsp:scriptlet> + <jsp:scriptlet id="scriptlet"> out.print(new Date()); </jsp:scriptlet> </body> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -11,7 +11,7 @@ <body> <h1>jsp:setProperty test</h1> <jsp:useBean id="calendar" scope="page" class="org.jboss.jsp.test.Calendar" /> - <jsp:setProperty name="calendar" property="username" value="User" /> + <jsp:setProperty name="calendar" property="username" value="User" id="set_property"/> <h2>Calendar for <jsp:getProperty name="calendar" property="username" /></h2> </body> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,7 +10,7 @@ </head> <body> <h1>text test</h1> - <jsp:text> + <jsp:text id="text"> Any Text </jsp:text> </body> Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,9 @@ +<tests> +<test id="text"> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +Any Text +</SPAN> +</SPAN> +</test> +</tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp 2012-09-27 11:00:29 UTC (rev 44090) @@ -10,9 +10,9 @@ </head> <body> <h1>jsp:setProperty test</h1> - <jsp:useBean id="calendar" scope="page" class="org.jboss.jsp.test.Calendar" /> - <jsp:setProperty name="calendar" property="username" value="User" /> - <h2>Calendar for <jsp:getProperty name="calendar" + <jsp:useBean scope="page" class="org.jboss.jsp.test.Calendar" id="useBean"/> + <jsp:setProperty name="useBean" property="username" value="User" /> + <h2>Calendar for <jsp:getProperty name="useBean" property="username" /></h2> </body> </html> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2012-09-27 11:00:29 UTC (rev 44090) @@ -16,12 +16,17 @@ import junit.framework.TestSuite; public class JSPAllTests { + + // import project name + public static final String IMPORT_PROJECT_NAME = "jspTest"; //$NON-NLS-1$ + public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe JSP components"); //$NON-NLS-1$ // $JUnit-BEGIN$ suite.addTestSuite(JSPComponentTest.class); suite.addTestSuite(JSPTemplatePluginTest.class); + suite.addTestSuite(JSPComponentContentTest.class); // $JUnit-END$ return new VpeTestSetup(suite); } Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java 2012-09-27 11:00:29 UTC (rev 44090) @@ -0,0 +1,121 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.jsp.test; + +import org.jboss.tools.vpe.base.test.ComponentContentTest; + +public class JSPComponentContentTest extends ComponentContentTest { + + public JSPComponentContentTest(String name) { + super(name); + setCheckWarning(false); + } + + public void testDeclaration() throws Throwable { + performInvisibleTagTest("components/declaration.jsp", "declaration"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testExpression() throws Throwable { + performInvisibleTagTest("components/expression.jsp", "expression"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testScriptlet() throws Throwable { + performInvisibleTagTest("components/scriptlet.jsp", "scriptlet"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDirectiveAttribute() throws Throwable { + performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/catalog.tag", "DirectiveAttribute"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDirectiveInclude() throws Throwable { + performContentTest("components/directive_include_absolute.jsp"); //$NON-NLS-1$ + performContentTest("components/directive_include_relative.jsp"); //$NON-NLS-1$ + } + + public void testInclude() throws Throwable { + performContentTest("components/include_absolute.jsp"); //$NON-NLS-1$ + performContentTest("components/include_relative.jsp"); //$NON-NLS-1$ + } + + public void testDirectivePage() throws Throwable { + performInvisibleTagTest("components/directive_page.jsp", "directive_page"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDirectiveTag() throws Throwable { + performInvisibleTagTest("components/directive_tag.jsp", "directive_tag"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDirectiveTaglib() throws Throwable { + performInvisibleTagTest("components/directive_taglib.jsp", "directive_taglib"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDirectiveVariable() throws Throwable { + performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/catalog.tag", "DirectiveVariable"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testAttribute() throws Throwable { + performInvisibleTagTest("components/attribute.jsp", "attribute"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBody() throws Throwable { + performContentTest("components/body.jsp"); //$NON-NLS-1$ + } + + public void testElement() throws Throwable { + performInvisibleTagTest("components/element.jsp", "element"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoBody() throws Throwable { + performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/double.tag", "DoBody"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testForward() throws Throwable { + performInvisibleTagTest("components/forward.jsp", "forward"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testGetProperty() throws Throwable { + performInvisibleTagTest("components/get_property.jsp", "get_property"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testInvoke() throws Throwable { + performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/catalog.tag", "Invoke"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testOutput() throws Throwable { + performInvisibleTagTest("components/output.jsp", "output"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testPlugin() throws Throwable { + performInvisibleTagTest("components/plugin.jsp", "plugin"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testRoot() throws Throwable { + performInvisibleTagTest("components/root.jsp", "root"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testSetProperty() throws Throwable { + performInvisibleTagTest("components/set_property.jsp", "set_property"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testText() throws Throwable { + performContentTest("components/text.jsp"); //$NON-NLS-1$ + } + + public void testUseBean() throws Throwable { + performInvisibleTagTest("components/useBean.jsp", "useBean"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + @Override + protected String getTestProjectName() { + return JSPAllTests.IMPORT_PROJECT_NAME; + } + +} Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2012-09-27 10:46:01 UTC (rev 44089) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2012-09-27 11:00:29 UTC (rev 44090) @@ -23,9 +23,6 @@ */ public class JSPComponentTest extends VpeTest { - // import project name - public static final String IMPORT_PROJECT_NAME = "jspTest"; //$NON-NLS-1$ - public JSPComponentTest(String name) { super(name); setCheckWarning(false); @@ -38,7 +35,7 @@ */ public void testDeclaration() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/declaration.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/declaration.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } /** @@ -48,7 +45,7 @@ */ public void testExpression() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/expression.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/expression.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } /** @@ -58,7 +55,7 @@ */ public void testScriptlet() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/scriptlet.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/scriptlet.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } /** @@ -68,7 +65,7 @@ */ public void testDirectiveAttribute() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "../WEB-INF/tags/catalog.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } /** @@ -78,10 +75,10 @@ */ public void testDirectiveInclude() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/directive_include_absolute.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/directive_include_relative.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -92,10 +89,10 @@ */ public void testInclude() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/include_absolute.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/include_relative.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -106,7 +103,7 @@ */ public void testDirectivePage() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_page.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/directive_page.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -117,7 +114,7 @@ */ public void testDirectiveTag() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_tag.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/directive_tag.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -128,7 +125,7 @@ */ public void testDirectiveTaglib() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_taglib.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/directive_taglib.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -139,7 +136,7 @@ */ public void testDirectiveVariable() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "../WEB-INF/tags/catalog.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -150,7 +147,7 @@ */ public void testAttribute() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/attribute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/attribute.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -161,7 +158,7 @@ */ public void testBody() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/body.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/body.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -172,7 +169,7 @@ */ public void testElement() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/element.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/element.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -183,7 +180,7 @@ */ public void testDoBody() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/double.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "../WEB-INF/tags/double.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -194,7 +191,7 @@ */ public void testForward() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/forward.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/forward.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -205,7 +202,7 @@ */ public void testGetProperty() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/get_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/get_property.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -216,7 +213,7 @@ */ public void testInvoke() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "../WEB-INF/tags/catalog.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -227,7 +224,7 @@ */ public void testOutput() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/output.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/output.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -238,7 +235,7 @@ */ public void testPlugin() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/plugin.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/plugin.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -249,7 +246,7 @@ */ public void testRoot() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/root.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/root.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -260,7 +257,7 @@ */ public void testSetProperty() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/set_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/set_property.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -271,7 +268,7 @@ */ public void testText() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/text.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } @@ -282,7 +279,7 @@ */ public void testUseBean() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/useBean.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/useBean.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ }