Author: yradtsevich Date: 2009-01-12 13:47:26 -0500 (Mon, 12 Jan 2009) New Revision: 13000 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml Log: CODING IN PROGRESS - issue JBIDE-3511: Text body of h:outputText and h:outputFormat is rendered in incorrect sequence. https://jira.jboss.org/jira/browse/JBIDE-3511 - JUnit tests in richfaces package have been fixed partially. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,22 +1,47 @@ <tests> <test id="column1"> - <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN> FIELDS</SPAN> + <TD COLSPAN="3" ID="column1" CLASS="dr-table-headercell rich-table-headercell"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + FIELDS + </SPAN> + </SPAN> </TD> </test> <test id="column2"> - <TD BREAKBEFORE="true" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN> field1</SPAN> + <TD BREAKBEFORE="true" ID="column2" + CLASS="dr-table-headercell rich-table-headercell"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + field1 + </SPAN> + </SPAN> </TD> </test> <test id="column3"> - <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN> #{row.field1}</SPAN> + <TD ID="column3" CLASS="dr-table-cell rich-table-cell"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{row.field1} + </SPAN> + </SPAN> </TD> </test> <test id="column4"> - <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN> footer1</SPAN> + <TD ID="column4" CLASS="dr-table-footercell rich-table-footercell"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + footer1 + </SPAN> + </SPAN> </TD> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml 2009-01-12 18:47:26 UTC (rev 13000) @@ -5,7 +5,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <head> </head> <body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,7 +1,14 @@ <tests> <test id="columns"> - <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN> #{book.price}</SPAN> + <TD VALUE="#{bookList.books}" VAR="label" ID="columns" + CLASS="dr-table-cell rich-table-cell"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{book.price} + </SPAN> + </SPAN> </TD> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,111 +1,212 @@ <tests> <test id="dataDefinitionList"> + <DL CLASS="yellow-background"> <DT CLASS="headerClass"> <DIV> - <SPAN> - TERM-VISIBLE + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + TERM-VISIBLE </SPAN> + </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN> - col1 + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col1 </SPAN> - <SPAN> - col2 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col2 </SPAN> - <SPAN> - col3 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col3 </SPAN> - <SPAN> - col4 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col4 </SPAN> + </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN> - TERM-VISIBLE + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + TERM-VISIBLE </SPAN> + </SPAN> </DIV> </DT> <DD CLASS="columnClass blue-text"> - <SPAN> - col1 + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col1 </SPAN> - <SPAN> - col2 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col2 </SPAN> - <SPAN> - col3 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col3 </SPAN> - <SPAN> - col4 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col4 </SPAN> + </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN> - TERM-VISIBLE + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + TERM-VISIBLE </SPAN> + </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN> - col1 + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col1 </SPAN> - <SPAN> - col2 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col2 </SPAN> - <SPAN> - col3 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col3 </SPAN> - <SPAN> - col4 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col4 </SPAN> + </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN> - TERM-VISIBLE + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + TERM-VISIBLE </SPAN> + </SPAN> </DIV> </DT> <DD CLASS="columnClass blue-text"> - <SPAN> - col1 + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col1 </SPAN> - <SPAN> - col2 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col2 </SPAN> - <SPAN> - col3 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col3 </SPAN> - <SPAN> - col4 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col4 </SPAN> + </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN> - TERM-VISIBLE + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + TERM-VISIBLE </SPAN> + </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN> - col1 + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col1 </SPAN> - <SPAN> - col2 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col2 </SPAN> - <SPAN> - col3 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col3 </SPAN> - <SPAN> - col4 + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + col4 </SPAN> + </SPAN> </DD> </DL> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,16 +1,65 @@ <tests> <test id="dataList"> + <UL VAR="data" VALUE="#{bean.dtList}" ROWS="4" ID="dataList" CLASS="dr-list rich-datalist"> <LI CLASS="dr-list-item rich-list-item"> - <SPAN> field1:</SPAN> - <SPAN > #{data.field1}</SPAN> - <SPAN> field2:</SPAN> - <SPAN> #{data.field2}</SPAN> - <SPAN> field3:</SPAN> - <SPAN> #{data.field3}</SPAN> - <SPAN> number:</SPAN> - <SPAN> #{data.number}</SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + field1: +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{data.field1} +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + field2: +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{data.field2} +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + field3: +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{data.field3} +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + number: +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{data.number} +</SPAN> + </SPAN> </LI> </UL> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,30 +1,228 @@ <tests> <test id="dataOrderedList"> - <OL TYPE="A" VALUE="" ROWS="5" CLASS="dr-list rich-orderedlist"> + + <OL TYPE="A" ID="dataOrderedList" VALUE="" ROWS="5" + CLASS="dr-list rich-orderedlist"> <LI CLASS="dr-list-item rich-list-item"> - <SPAN> row=1 </SPAN> - <SPAN> row=2 </SPAN> - <SPAN> row=3 </SPAN> - <SPAN> row=4 </SPAN> - <SPAN> row=5 </SPAN> - <SPAN> row=6 </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=1 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=2 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=3 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=4 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=5 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=6 +</SPAN> + </SPAN> </LI> <LI CLASS="dr-list-item rich-list-item"> - <SPAN> row=1 </SPAN> - <SPAN> row=2 </SPAN> - <SPAN> row=3 </SPAN> - <SPAN> row=4 </SPAN> - <SPAN> row=5 </SPAN> - <SPAN> row=6 </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=1 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=2 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=3 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=4 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=5 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=6 +</SPAN> + </SPAN> </LI> <LI CLASS="dr-list-item rich-list-item"> - <SPAN> row=1 </SPAN> - <SPAN> row=2 </SPAN> - <SPAN> row=3 </SPAN> - <SPAN> row=4 </SPAN> - <SPAN> row=5 </SPAN> - <SPAN> row=6 </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=1 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=2 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=3 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=4 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=5 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=6 +</SPAN> + </SPAN> </LI> + <LI CLASS="dr-list-item rich-list-item"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=1 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=2 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=3 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=4 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=5 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=6 +</SPAN> + </SPAN> + </LI> + <LI CLASS="dr-list-item rich-list-item"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=1 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=2 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=3 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=4 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=5 +</SPAN> + </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + row=6 +</SPAN> + </SPAN> + </LI> </OL> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,5 +1,6 @@ <tests> <test id="messages"> + <TABLE CELLSPACING="0" CELLPADDING="0" STYLE="border-style: dotted; color: Turquoise; text-align: center; font-size: small; font-style: italic; background-color: Orchid; font-family: Arial CE,Arial Narrow; text-decoration: line-through; font-weight: bolder;" CLASS="rich-messages infoClass"> @@ -7,50 +8,90 @@ <TD> <SPAN CLASS="rich-messages-marker"> <DIV> - <SPAN> Passed </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + Passed +</SPAN> + </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label"> No Error </SPAN> + <SPAN CLASS="rich-messages-label"> + No Error +</SPAN> </TD> </TR> <TR> <TD CLASS="errorClass"> <SPAN CLASS="rich-messages-marker markerError"> <DIV> - <SPAN> Error </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + Error +</SPAN> + </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label errorLabel"> Error message </SPAN> + <SPAN CLASS="rich-messages-label errorLabel"> + Error message +</SPAN> </TD> </TR> <TR> <TD CLASS="fatalClass"> <SPAN CLASS="rich-messages-marker markerFatal"> <DIV> - <SPAN> Fatal </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + Fatal +</SPAN> + </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label fatalLabel"> Fatal message </SPAN> + <SPAN CLASS="rich-messages-label fatalLabel"> + Fatal message +</SPAN> </TD> </TR> <TR> <TD CLASS="infoClass"> <SPAN CLASS="rich-messages-marker markerInfo"> <DIV> - <SPAN> Info </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + Info +</SPAN> + </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label infoLabel"> Info message </SPAN> + <SPAN CLASS="rich-messages-label infoLabel"> + Info message +</SPAN> </TD> </TR> <TR> <TD CLASS="warnClass"> <SPAN CLASS="rich-messages-marker markerWarn"> <DIV> - <SPAN> Warning </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + Warning +</SPAN> + </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label warnLabel"> Warning message </SPAN> + <SPAN CLASS="rich-messages-label warnLabel"> + Warning message +</SPAN> </TD> </TR> </TABLE> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -1,5 +1,6 @@ <tests> <test id="scrollableDataTable"> + <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 500px; height: 100px;"> <TABLE CLASS="dr-table rich-sdt"> <COLGROUP SPAN="6"> @@ -8,39 +9,63 @@ <TR CLASS="dr-table-subheader dr-sdt-hr"> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> - Make - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="headerText"> + Make +</SPAN> + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> - Model - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="headerText"> + Model +</SPAN> + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> - Price - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="headerText"> + Price +</SPAN> + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> - Mileage - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="headerText"> + Mileage +</SPAN> + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> - VIN - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="headerText"> + VIN +</SPAN> + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> - Stock - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="headerText"> + Stock +</SPAN> + </SPAN> </TD> </TR> </THEAD> @@ -52,162 +77,282 @@ </TBODY> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.make} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.make} +</SPAN> + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.model} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.model} +</SPAN> + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.price} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.price} +</SPAN> + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.mileage} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.mileage} +</SPAN> + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.vin} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.vin} +</SPAN> + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.stock} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.stock} +</SPAN> + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.make} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.make} +</SPAN> + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.model} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.model} +</SPAN> + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.price} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.price} +</SPAN> + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.mileage} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.mileage} +</SPAN> + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.vin} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.vin} +</SPAN> + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.stock} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.stock} +</SPAN> + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.make} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.make} +</SPAN> + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.model} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.model} +</SPAN> + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.price} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.price} +</SPAN> + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.mileage} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.mileage} +</SPAN> + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.vin} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.vin} +</SPAN> + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.stock} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.stock} +</SPAN> + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.make} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.make} +</SPAN> + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.model} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.model} +</SPAN> + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.price} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.price} +</SPAN> + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.mileage} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.mileage} +</SPAN> + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.vin} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.vin} +</SPAN> + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.stock} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.stock} +</SPAN> + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.make} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.make} +</SPAN> + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.model} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.model} +</SPAN> + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.price} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.price} +</SPAN> + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.mileage} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.mileage} +</SPAN> + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.vin} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.vin} +</SPAN> + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN> - #{category.stock} - </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + #{category.stock} +</SPAN> + </SPAN> </TD> </TR> </TABLE> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -2,7 +2,13 @@ <test id="toggleControl"> <SPAN STYLE="color: blue; text-decoration: underline;" VPE-USER-TOGGLE-ID=""> - <SPAN> CLOSED </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + CLOSED + </SPAN> + </SPAN> </SPAN> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2009-01-12 18:16:11 UTC (rev 12999) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2009-01-12 18:47:26 UTC (rev 13000) @@ -3,7 +3,13 @@ <DIV> <SPAN STYLE="color: blue; text-decoration: underline;" VPE-USER-TOGGLE-ID=""> - <SPAN> CLOSED </SPAN> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + CLOSED + </SPAN> + </SPAN> </SPAN> </DIV> </test>