Author: sdzmitrovich
Date: 2008-09-23 10:58:22 -0400 (Tue, 23 Sep 2008)
New Revision: 10410
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/actionListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/attribute.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertDateTime.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertNumber.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/converter.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/loadBundle.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/param.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/phaseListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/setPropertyActionListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateDoubleRange.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLength.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLongRange.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validator.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/valueChangeListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2797
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -732,6 +732,10 @@
<vpe:tag name="f:setPropertyActionListener">
<vpe:template children="no" modify="no" />
</vpe:tag>
+
+ <vpe:tag name="f:actionListener">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
<vpe:tag name="f:valueChangeListener">
<vpe:template children="no" modify="no" />
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/actionListener.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/actionListener.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/actionListener.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="actionListener" /></h1>
<h:form id="form">
<h:commandButton value="button">
- <f:actionListener type="someType" />
+ <f:actionListener type="someType" id="actionListener" />
</h:commandButton>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/attribute.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/attribute.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/attribute.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="attribute" /></h1>
<h:form id="form">
<h:commandButton value="button">
- <f:attribute name="attributeName" value="attributeValue" />
+ <f:attribute name="attributeName" value="attributeValue"
id="attribute"/>
</h:commandButton>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertDateTime.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertDateTime.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertDateTime.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -9,7 +9,7 @@
<f:view>
<h1><h:outputText value="convertDateTime" /></h1>
<h:inputText value="value">
- <f:convertDateTime pattern="MM/yyyy" />
+ <f:convertDateTime pattern="MM/yyyy" id="convertDateTime" />
</h:inputText>
</f:view>
</body>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertNumber.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertNumber.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/convertNumber.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -9,7 +9,7 @@
<f:view>
<h1><h:outputText value="convertNumber" /></h1>
<h:inputText value="value">
- <f:convertNumber minFractionDigits="2"/>
+ <f:convertNumber minFractionDigits="2" id="convertNumber" />
</h:inputText>
</f:view>
</body>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/converter.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/converter.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/converter.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -9,7 +9,7 @@
<f:view>
<h1><h:outputText value="converter" /></h1>
<h:inputText value="value">
- <f:converter converterId="someConverterId" />
+ <f:converter converterId="someConverterId" id="converter" />
</h:inputText>
</f:view>
</body>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -11,8 +11,9 @@
<h:dataTable value="data">
<h:column>
- <f:facet name="header">
+ <f:facet name="header" id="facet">
<h:outputText value="Last Name" />
+ <h:outputText value="Cut Text" />
</f:facet>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,7 @@
+<tests>
+ <test id="facet">
+ <DIV>
+ <SPAN> Last Name</SPAN>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -9,7 +9,7 @@
<f:view>
<h1><h:outputText value="inputHidden" /></h1>
- <h:inputHidden value="inputHidden"/>
+ <h:inputHidden value="inputHidden" id="inputHidden"/>
</f:view>
</body>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/loadBundle.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/loadBundle.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/loadBundle.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -8,7 +8,7 @@
<f:view>
<h1><h:outputText value="loadBundle" /></h1>
- <f:loadBundle var="var" basename="someBaseName" />
+ <f:loadBundle var="var" basename="someBaseName"
id="loadBundle" />
</f:view>
</body>
</html>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/param.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/param.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/param.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -15,7 +15,7 @@
<h:outputText value="param" />
- <f:param id="paramId" name="param"
value="someParamValue" />
+ <f:param id="param" name="param"
value="someParamValue" />
</h:commandLink>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/phaseListener.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/phaseListener.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/phaseListener.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -9,7 +9,7 @@
<f:view>
<h1><h:outputText value="phaseListener" /></h1>
- <f:phaseListener type="phaseListenerId"/>
+ <f:phaseListener type="phaseListenerId" id="phaseListener"/>
</f:view>
</body>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -12,11 +12,19 @@
<h:outputText value="selectitem:" />
<h:selectManyCheckbox value="someValue">
- <f:selectItem itemLabel="check1" />
- <f:selectItem itemLabel="check2" />
- <f:selectItem itemLabel="check3" />
+ <f:selectItem itemLabel="check1" id="selectItem1" />
</h:selectManyCheckbox>
+ <h:selectManyListbox value="someValue">
+ <f:selectItem itemLabel="value1" itemValue="value1"
id="selectItem2" />
+ </h:selectManyListbox>
+
+ <h:selectOneRadio>
+
+ <f:selectItem itemLabel="value1" id="selectItem3" />
+
+ </h:selectOneRadio>
+
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,19 @@
+<tests>
+ <test id="selectItem1">
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check1</SPAN>
+ </LABEL>
+ </SPAN>
+ </test>
+ <test id="selectItem2">
+ <OPTION> value1</OPTION>
+ </test>
+ <test id="selectItem3">
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_507" />
+ <LABEL> value1</LABEL>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -11,10 +11,18 @@
<h:outputText value="selectitems:" />
- <h:selectManyCheckbox value="someValue">
- <f:selectItems value="someValue" />
+ <h:selectManyCheckbox>
+ <f:selectItems value="someValue" id="selectItems1" />
</h:selectManyCheckbox>
+ <h:selectManyListbox>
+ <f:selectItems value="someValue" id="selectItems2" />
+ </h:selectManyListbox>
+
+ <h:selectOneRadio>
+ <f:selectItems value="someValue" id="selectItems3" />
+ </h:selectOneRadio>
+
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,15 @@
+<tests>
+ <test id="selectItems1">
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ </SPAN>
+ </test>
+ <test id="selectItems2">
+ <OPTION>someValue</OPTION>
+ </test>
+ <test id="selectItems3">
+ <SPAN>
+ <INPUT TYPE="radio" />
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -11,15 +11,25 @@
<h:outputText value="selectOneRadio:" />
- <h:selectOneRadio>
-
+ <h:selectOneRadio layout="pageDirection" border="1"
+ id="selectOneRadio1">
+
<f:selectItem itemLabel="value1" />
<f:selectItem itemLabel="value2" />
<f:selectItem itemLabel="value3" />
<f:selectItem itemLabel="value4" />
-
+
</h:selectOneRadio>
+ <h:selectOneRadio dir="ltr" id="selectOneRadio2">
+
+ <f:selectItem itemLabel="value1" />
+ <f:selectItem itemLabel="value2" />
+ <f:selectItem itemLabel="value3" />
+ <f:selectItem itemLabel="value4" />
+
+ </h:selectOneRadio>
+
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,68 @@
+<tests>
+ <test id="selectOneRadio1">
+ <TABLE BORDER="1">
+ <TR>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_253" DIR=""
SIZE="" />
+ <LABEL> value1</LABEL>
+ </TABLE>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_253" DIR=""
SIZE="" />
+ <LABEL> value2</LABEL>
+ </TABLE>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_253" DIR=""
SIZE="" />
+ <LABEL> value3</LABEL>
+ </TABLE>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_253" DIR=""
SIZE="" />
+ <LABEL> value4</LABEL>
+ </TABLE>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+ <test id="selectOneRadio2">
+ <TABLE>
+ <TR>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_506"
DIR="ltr" />
+ <LABEL> value1</LABEL>
+ </TABLE>
+ </TD>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_506"
DIR="ltr" />
+ <LABEL> value2</LABEL>
+ </TABLE>
+ </TD>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_506"
DIR="ltr" />
+ <LABEL> value3</LABEL>
+ </TABLE>
+ </TD>
+ <TD>
+ <TABLE>
+ <INPUT TYPE="radio" NAME="radio_name_506"
DIR="ltr" />
+ <LABEL> value4</LABEL>
+ </TABLE>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/setPropertyActionListener.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/setPropertyActionListener.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/setPropertyActionListener.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="setPropertyActionListener" /></h1>
<h:form>
<h:commandButton value="click">
- <f:setPropertyActionListener target="#{myBean.currentPage}"
value="1" />
+ <f:setPropertyActionListener target="#{myBean.currentPage}"
value="1" id="setPropertyActionListener" />
</h:commandButton>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -8,9 +8,11 @@
<f:view>
<h1><h:outputText value="subview" /></h1>
- <f:subview id="subviewId">
- <h:outputText value="subview content" />
+ <f:subview id="subview1">
</f:subview>
+ <f:subview id="subview2">
+ subview content
+ </f:subview>
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/subview.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,25 @@
+<tests>
+ <test id="subview1">
+ <TABLE
+ STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+ <TR>
+ <TD>
+ <DIV></DIV>
+ <BR />
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+ <test id="subview2">
+ <TABLE
+ STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+ <TR>
+ <TD>
+ <DIV>
+ <SPAN> subview content</SPAN>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateDoubleRange.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateDoubleRange.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateDoubleRange.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="validateDoubleRange" /></h1>
<h:form>
<h:inputText value="value">
- <f:validateDoubleRange minimum="0" maximum="100" />
+ <f:validateDoubleRange minimum="0" maximum="100"
id="validateDoubleRange"/>
</h:inputText>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLength.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLength.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLength.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="validateLength" /></h1>
<h:form>
<h:inputText value="value">
- <f:validateLength minimum="10" maximum="100" />
+ <f:validateLength minimum="10" maximum="100"
id="validateLength" />
</h:inputText>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLongRange.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLongRange.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validateLongRange.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="validateLongRange" /></h1>
<h:form>
<h:inputText value="value">
- <f:validateLongRange minimum="10" maximum="100" />
+ <f:validateLongRange minimum="10" maximum="100"
id="validateLongRange" />
</h:inputText>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validator.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validator.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/validator.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="validator" /></h1>
<h:form>
<h:inputText value="value">
- <f:validator validatorId="validatorId"/>
+ <f:validator validatorId="validatorId" id="validator" />
</h:inputText>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/valueChangeListener.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/valueChangeListener.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/valueChangeListener.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -10,7 +10,7 @@
<h1><h:outputText value="valueChangeListener" /></h1>
<h:form>
<h:inputText value="value">
- <f:valueChangeListener type="listener" />
+ <f:valueChangeListener type="listener" id="valueChangeListener"
/>
</h:inputText>
</h:form>
</f:view>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -8,18 +8,12 @@
<f:view>
<h1><h:outputText value="verbatim" /></h1>
- <f:verbatim>
- <table width="50%">
- <tr>
- <td>1</td>
- <td>2</td>
- </tr>
- <tr>
- <td>3</td>
- <td>4</td>
- </tr>
- </table>
+ <f:verbatim id="verbatim1">
+ <input type="button" value="button" />
</f:verbatim>
+ <f:verbatim escape="true" id="verbatim2">
+ <input type="button" value="button" />
+ </f:verbatim>
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/verbatim.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,15 @@
+<tests>
+ <test id="verbatim1">
+ <SPAN>
+ <INPUT TYPE="button" VALUE="button" />
+ </SPAN>
+ </test>
+ <test id="verbatim2">
+ <SPAN>
+ <SPAN></SPAN>
+ <SPAN></SPAN>
+ <input type="button" value="button" />
+ <SPAN></SPAN>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp 2008-09-23
14:58:22 UTC (rev 10410)
@@ -6,8 +6,8 @@
</head>
<body>
-<f:view>
- <h1><h:outputText value="view" /></h1>
+<f:view id="view">
+ view
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/view.jsp.xml 2008-09-23
14:58:22 UTC (rev 10410)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="view">
+ <TABLE
+ STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+ <TR>
+ <TD>
+ <DIV>
+ <SPAN> view</SPAN>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-23
14:58:22 UTC (rev 10410)
@@ -46,7 +46,8 @@
}
public void testInputHidden() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/inputHidden.jsp", "inputHidden"); //$NON-NLS-1$
//$NON-NLS-2$
}
public void testInputSecret() throws Throwable {
@@ -127,23 +128,25 @@
*/
public void testActionListener() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/actionListener.jsp", "actionListener"); //$NON-NLS-1$
//$NON-NLS-2$
}
public void testAttribute() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/attribute.jsp", "attribute");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testConvertDateTime() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/convertDateTime.jsp", "convertDateTime");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testConvertNumber() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/convertNumber.jsp",
"convertNumber"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testConverter() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/converter.jsp", "converter");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testFacet() throws Throwable {
@@ -151,15 +154,15 @@
}
public void testLoadBundle() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/loadBundle.jsp", "loadBundle");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testParam() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/param.jsp", "param");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testPhaseListener() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/phaseListener.jsp",
"phaseListener"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testSelectItem() throws Throwable {
@@ -171,7 +174,8 @@
}
public void testSetPropertyActionListener() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/setPropertyActionListener.jsp",
"setPropertyActionListener"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testSubview() throws Throwable {
@@ -180,23 +184,27 @@
}
public void testValidateDoubleRange() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/validateDoubleRange.jsp", "validateDoubleRange");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateLength() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/validateLength.jsp", "validateLength"); //$NON-NLS-1$
//$NON-NLS-2$
}
public void testValidateLongRange() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/validateLongRange.jsp", "validateLongRange");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidator() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest("components/validator.jsp", "validator");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testValueChangeListener() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performInvisibleTagTest(
+ "components/valueChangeListener.jsp", "valueChangeListener");
//$NON-NLS-1$ //$NON-NLS-2$
}
public void testVerbatim() throws Throwable {
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-23
14:58:22 UTC (rev 10410)
@@ -2459,7 +2459,7 @@
nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
span.setAttribute(HTML.TAG_STYLE,
- "border: dashed 1px GREY;color:GREY;font-size:12px;"); //$NON-NLS-1$
+ "border: 1px dashed GREY; color: GREY; font-size: 12px;"); //$NON-NLS-1$
nsIDOMText text = visualDocument.createTextNode(sourceNode
.getNodeName());
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-09-23
14:58:22 UTC (rev 10410)
@@ -20,7 +20,7 @@
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -99,6 +99,14 @@
}
+ /**
+ *
+ * @param controller
+ * @param xmlTestDocument
+ * @param elementId
+ * @param xmlTestId
+ * @return
+ */
protected boolean compareElements(VpeController controller,
Document xmlTestDocument, String elementId, String xmlTestId) {
@@ -119,6 +127,80 @@
}
/**
+ *
+ * @param elementPagePath
+ * - path to test page
+ * @throws Throwable
+ */
+ protected void performInvisibleTagTest(String elementPagePath,
+ String elementId) throws Throwable {
+ setException(null);
+
+ IFile elementPageFile = (IFile) TestUtil.getComponentPath(
+ elementPagePath, getTestProjectName());
+
+ IEditorInput input = new FileEditorInput(elementPageFile);
+
+ TestUtil.waitForJobs();
+
+ IEditorPart editor = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().openEditor(input,
+ EDITOR_ID, true);
+
+ assertNotNull(editor);
+
+ TestUtil.waitForJobs();
+
+ VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+
+ // find source element and check if it is not null
+ Element sourceELement = findSourceElementById(controller, elementId);
+ assertNotNull(sourceELement);
+
+ // find visual element and check if it is null
+ nsIDOMElement visualElement = findElementById(controller, elementId);
+ assertNull(visualElement);
+
+ // set show invisible tag's flag to true
+ controller.getVisualBuilder().setShowInvisibleTags(true);
+ controller.visualRefresh();
+
+ TestUtil.waitForIdle();
+
+ // find visual element and check if it is not null
+ visualElement = findElementById(controller, elementId);
+ assertNotNull(visualElement);
+
+ // generate text for invisible tag
+ String modelInvisibleTagText = generateInvisibleTagText(sourceELement
+ .getNodeName());
+
+ // generate dom document and get root element
+ Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText)
+ .getDocumentElement();
+ assertNotNull(modelElement);
+
+ // compare elements
+ assertEquals(true, TestDomUtil
+ .compareNodes(visualElement, modelElement));
+
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ *
+ * @param tagName
+ * @return
+ */
+ private String generateInvisibleTagText(String tagName) {
+ return "<span style=\"border: 1px dashed GREY; color: GREY; font-size:
12px;\" >" //$NON-NLS-1$
+ + tagName + "</span>"; //$NON-NLS-1$
+ }
+
+ /**
* find visual element by "id" entered in source part of vpe
*
* @param controller
@@ -128,19 +210,34 @@
protected nsIDOMElement findElementById(VpeController controller,
String elementId) {
- Element sourceElement = getSourceDocument(controller).getElementById(
- elementId);
+ Element sourceElement = findSourceElementById(controller, elementId);
- VpeElementMapping elementMapping = controller.getDomMapping()
- .getNearElementMapping(sourceElement);
+ VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(
+ sourceElement);
- return elementMapping.getVisualElement();
+ if (nodeMapping == null)
+ return null;
+
+ return (nsIDOMElement) nodeMapping.getVisualNode();
}
/**
+ * find source element by "id"
*
+ * @param controller
+ * @param elementId
* @return
*/
+ protected Element findSourceElementById(VpeController controller,
+ String elementId) {
+
+ return getSourceDocument(controller).getElementById(elementId);
+ }
+
+ /**
+ *
+ * @return
+ */
abstract protected String getTestProjectName();
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2008-09-23
14:01:49 UTC (rev 10409)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2008-09-23
14:58:22 UTC (rev 10410)
@@ -124,10 +124,11 @@
if (attributes != null) {
for (int i = 0; i < attributes.getLength(); i++) {
Attr attr = (Attr) attributes.item(i);
+
if ((!vpeElement.hasAttribute(attr.getName()))
- || (!attr.getNodeValue().equals(
+ || (!attr.getNodeValue().trim().equals(
vpeElement.getAttributeNode(attr.getName())
- .getNodeValue())))
+ .getNodeValue().trim())))
return false;
}
}
@@ -167,7 +168,8 @@
}
/**
- * get ids of tests
+ * get ids of tests
+ *
* @param testDocument
* @return
*/