Author: mareshkau Date: 2009-10-13 11:22:56 -0400 (Tue, 13 Oct 2009) New Revision: 18070 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/block/div.html.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/td.html.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/tr.html.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/hr.html.xml Log: Fixing corrupted junit tests, https://jira.jboss.org/jira/browse/JBIDE-2248 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 2009-10-13 15:22:56 UTC (rev 18070) @@ -87,16 +87,16 @@ div.setAttribute(VPE_USER_TOGGLE_ID, toggleId); // Encode Header - String headerActiveStyle = barHeaderStyle + String headerActiveStyle = (barHeaderStyle + SPACE + ComponentUtil.getAttribute(sourceElement, HEADER_STYLE) + SPACE + barHeaderActiveStyle + SPACE + ComponentUtil - .getAttribute(sourceElement, HEADER_ACTIVE_STYLE); - String headerStyle = barHeaderStyle + SPACE - + ComponentUtil.getAttribute(sourceElement, HEADER_STYLE); + .getAttribute(sourceElement, HEADER_ACTIVE_STYLE)).trim(); + String headerStyle = (barHeaderStyle + SPACE + + ComponentUtil.getAttribute(sourceElement, HEADER_STYLE)).trim(); String internContentClass = ComponentUtil.getAttribute(sourceElement, CONTENT_CLASS); @@ -108,16 +108,16 @@ sourceElement, HEADER_ACTIVE_CLASS); if (active) { - String headerClass = DR_PNLBAR_H_RICH_PANELBAR_HEADER + SPACE + String headerClass = (DR_PNLBAR_H_RICH_PANELBAR_HEADER + SPACE + barHeaderStyleClass + SPACE + internHeaderClass + SPACE + barHeaderActiveStyleClass + SPACE - + internHeaderActiveClass; + + internHeaderActiveClass).trim(); encodeHeader(creationData, pageContext, sourceElement, visualDocument, div, headerClass, headerActiveStyle, toggleId); } else { - String headerClass = DR_PNLBAR_H_RICH_PANELBAR_HEADER + SPACE - + barHeaderStyleClass + SPACE + internHeaderClass; + String headerClass = (DR_PNLBAR_H_RICH_PANELBAR_HEADER + SPACE + + barHeaderStyleClass + SPACE + internHeaderClass).trim(); encodeHeader(creationData, pageContext, sourceElement, visualDocument, div, headerClass, headerStyle, toggleId); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -16,7 +16,7 @@ <TABLE CLASS="dr-table rich-sdt"> <COLGROUP SPAN="1"> </COLGROUP> -<TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;"> +<TBODY HEIGHT="100px;" STYLE="background-color: blue;" WIDTH="100px;"> </TBODY> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2009-10-13 15:22:56 UTC (rev 18070) @@ -91,8 +91,8 @@ * Doctype should have the correct type. */ assertEquals( - "Doctype should have the correct type: \" html \", but was: "+ doctype.getNodeName(), //$NON-NLS-1$ - "html", doctype.getNodeName()); //$NON-NLS-1$ + "Doctype should have the correct type: \" HTML \", but was: "+ doctype.getNodeName(), //$NON-NLS-1$ + "HTML", doctype.getNodeName()); //$NON-NLS-1$ } else { /* * Fail the test when we cannot process jar file correctly. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -142,7 +142,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="300" STYLE=""> + <DIV WIDTH="300px;" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -318,7 +318,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100%" STYLE="float: left; width: 165%;"> + <DIV WIDTH="165%" STYLE="float: left; width: 165%;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -364,7 +364,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100%" STYLE="float: left; width: 165%;"> + <DIV WIDTH="165%" STYLE="float: left; width: 165%;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -410,7 +410,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100%" STYLE="float: left; width: 165%;"> + <DIV WIDTH="165%" STYLE="float: left; width: 165%;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -48,7 +48,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="30" STYLE="float: right; width: 30px;"> + <DIV WIDTH="30px" STYLE="float: right; width: 30px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL @@ -87,7 +87,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="35" STYLE="float: left; width: 35px;"> + <DIV WIDTH="35px" STYLE="float: left; width: 35px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -179,7 +179,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: left; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: left; width: 65px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -278,7 +278,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: right; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: right; width: 65px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL @@ -317,14 +317,14 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100%" STYLE="float: left; width: 165%;"> + <DIV WIDTH="165%" STYLE="float: left; width: 165%;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="300" STYLE="float: right; width: 300px;"> + <DIV WIDTH="300px" STYLE="float: right; width: 300px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL @@ -356,7 +356,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: left; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: left; width: 65px;"> <DIV> <SPAN CLASS="vpe-text"> LEFT PANEL @@ -409,7 +409,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="165" STYLE="float: left; width: 165px;"> + <DIV WIDTH="165px" STYLE="float: left; width: 165px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -28,7 +28,7 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL @@ -74,21 +74,21 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;" > - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="25" STYLE="float: left; width: 25px;"> + <DIV WIDTH="25px" STYLE="float: left; width: 25px;"> <DIV> <SPAN CLASS="vpe-text"> LEFT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="35" STYLE="float: left; width: 35px;"> + <DIV WIDTH="35px" STYLE="float: left; width: 35px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -102,7 +102,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -120,14 +120,14 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="90" STYLE=""> + <DIV WIDTH="90px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="20" STYLE="float: left; width: 20px;"> + <DIV WIDTH="20px" STYLE="float: left; width: 20px;"> <DIV> <SPAN CLASS="vpe-text"> LEFT PANEL @@ -148,7 +148,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="80" STYLE=""> + <DIV WIDTH="80px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -166,35 +166,35 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="25" STYLE="float: left; width: 25px;"> + <DIV WIDTH="25px" STYLE="float: left; width: 25px;"> <DIV> <SPAN CLASS="vpe-text"> LEFT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: left; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: left; width: 65px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="45" STYLE="float: right; width: 45px;"> + <DIV WIDTH="45px" STYLE="float: right; width: 45px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -212,35 +212,35 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="10" STYLE="float: left; width: 10px;"> + <DIV WIDTH="10px" STYLE="float: left; width: 10px;"> <DIV> <SPAN CLASS="vpe-text"> LEFT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="20" STYLE="float: left; width: 20px;"> + <DIV WIDTH="20px" STYLE="float: left; width: 20px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="30" STYLE="float: right; width: 30px;"> + <DIV WIDTH="30px" STYLE="float: right; width: 30px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -258,7 +258,7 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL @@ -272,21 +272,21 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: left; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: left; width: 65px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: right; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: right; width: 65px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -304,7 +304,7 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL @@ -318,7 +318,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="165" STYLE="float: left; width: 165px;"> + <DIV WIDTH="165px" STYLE="float: left; width: 165px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -332,7 +332,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -350,21 +350,21 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV> <SPAN CLASS="vpe-text"> TOP PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: left; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: left; width: 65px;"> <DIV> <SPAN CLASS="vpe-text"> LEFT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="165" STYLE="float: left; width: 165px;"> + <DIV WIDTH="165px" STYLE="float: left; width: 165px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL @@ -378,7 +378,7 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . @@ -396,7 +396,7 @@ </SPAN> </H1> <DIV STYLE="border: 1px solid black;"> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV > <SPAN CLASS="vpe-text"> TOP PANEL @@ -410,21 +410,21 @@ </SPAN> </DIV> </DIV> - <DIV WIDTH="165" STYLE="float: left; width: 165px;"> + <DIV WIDTH="165px" STYLE="float: left; width: 165px;"> <DIV> <SPAN STYLE="font-size: 2em;"> CENTER PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="65" STYLE="float: right; width: 65px;"> + <DIV WIDTH="65px" STYLE="float: right; width: 65px;"> <DIV> <SPAN CLASS="vpe-text"> RIGHT PANEL </SPAN> </DIV> </DIV> - <DIV WIDTH="100" STYLE=""> + <DIV WIDTH="100px" STYLE=""> <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;"> . Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/block/div.html.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/block/div.html.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/block/div.html.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -1,7 +1,7 @@ <tests> <test id="div"> - <DIV ALIGN="left" ID="div" CLASS="divClass" STYLE="background: grey none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; color: white; -moz-user-modify: read-write;" DIR="ltr"> -<SPAN> + <DIV ALIGN="left" ID="div" CLASS="divClass" STYLE="background: grey none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; color: white; -moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> some text </SPAN> </DIV> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -1,10 +1,10 @@ <tests> <test id="table"> <TABLE WIDTH="400" CELLSPACING="0" CELLPADDING="5" BORDER="0" - ID="table" STYLE="-moz-user-modify: read-write;" > + ID="table" STYLE="-moz-user-modify: read-write;"> <COLGROUP WIDTH="150" STYLE="-moz-user-modify: read-write;"> </COLGROUP> - <COLGROUP WIDTH="50" ALIGN="center" SPAN="9" + <COLGROUP WIDTH="50" SPAN="9" ALIGN="center" STYLE="-moz-user-modify: read-write;"> <COL SPAN="5" STYLE="-moz-user-modify: read-only;" /> @@ -13,28 +13,28 @@ </COLGROUP> <TR STYLE="-moz-user-modify: read-write;"> <TD - STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> + STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> <SPAN> Some Text - </SPAN> +</SPAN> </TD> <TD - STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> + STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> <SPAN> Some Text - </SPAN> +</SPAN> </TD> <TD - STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> + STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> <SPAN> Some Text - </SPAN> +</SPAN> </TD> <TD - STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> + STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> <SPAN> Some Text - </SPAN> +</SPAN> </TD> </TR> </TABLE> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/td.html.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/td.html.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/td.html.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -1,9 +1,9 @@ <tests> <test id="td"> <TD ID="td" - STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;" + STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;" CLASS="tdClass"> - <SPAN> + <SPAN CLASS="vpe-text"> Some Text </SPAN> </TD> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/tr.html.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/tr.html.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/tr.html.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -1,26 +1,30 @@ <tests> <test id="tr"> <TR ID="tr" CLASS="trClass" STYLE="color: red; -moz-user-modify: read-write;"> -<TD STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> -<SPAN> -Some Text -</SPAN> -</TD> -<TD STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> -<SPAN> -Some Text -</SPAN> -</TD> -<TD STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> -<SPAN> -Some Text -</SPAN> -</TD> -<TD STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-write;"> -<SPAN> -Some Text -</SPAN> -</TD> -</TR> + <TD + STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + Some Text + </SPAN> + </TD> + <TD + STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + Some Text + </SPAN> + </TD> + <TD + STYLE="background: rgb(176, 178, 142) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + Some Text + </SPAN> + </TD> + <TD + STYLE="background: rgb(204, 204, 204) none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + Some Text + </SPAN> + </TD> + </TR> </test> </tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/hr.html.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/hr.html.xml 2009-10-13 14:47:00 UTC (rev 18069) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/hr.html.xml 2009-10-13 15:22:56 UTC (rev 18070) @@ -1,5 +1,5 @@ <tests> <test id="hr"> - <HR SIZE="20" ALIGN="left" ID="hr" CLASS="hrClass" STYLE="background: red none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; -moz-user-modify: read-only;" DIR="ltr"/> + <HR SIZE="20" ALIGN="left" ID="hr" CLASS="hrClass" STYLE="background: red none repeat scroll 0% 0%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; -moz-user-modify: read-only;"/> </test> </tests> \ No newline at end of file