Author: yradtsevich Date: 2009-05-20 11:52:00 -0400 (Wed, 20 May 2009) New Revision: 15367 Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml Log: RESOLVED - issue JBIDE-4225: 3 tests fail in HtmlAllTests (testJBIDE3280, testPre) https://jira.jboss.org/jira/browse/JBIDE-4225 - testPre and testPre are fixed Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml 2009-05-20 15:48:31 UTC (rev 15366) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml 2009-05-20 15:52:00 UTC (rev 15367) @@ -1,48 +1,27 @@ <tests> <test id="xmp"> <XMP ID="xmp" STYLE="-moz-user-modify: read-only;" > -<SPAN><BR _MOZ_DIRTY=""/> - -while (&lt;&gt;) {<BR _MOZ_DIRTY=""/> - -$org=$_;<BR _MOZ_DIRTY=""/> - -s/\\["']//g;<BR _MOZ_DIRTY=""/> - -s/\/\/[^:].*//;<BR _MOZ_DIRTY=""/> - -s/\/\*.*\*\///g;<BR _MOZ_DIRTY=""/> - -if ($comment == 1) {<BR _MOZ_DIRTY=""/> - -if (s/.*\*\///) {<BR _MOZ_DIRTY=""/> - -$comment = 0;<BR _MOZ_DIRTY=""/> - -}<BR _MOZ_DIRTY=""/> - -else {<BR _MOZ_DIRTY=""/> - -next;<BR _MOZ_DIRTY=""/> - -}<BR _MOZ_DIRTY=""/> - -}<BR _MOZ_DIRTY=""/> - -if (s/\/\*.*//) {<BR _MOZ_DIRTY=""/> - -$comment = 1;<BR _MOZ_DIRTY=""/> - -}<BR _MOZ_DIRTY=""/> - -if (/^\s*#/) {<BR _MOZ_DIRTY=""/> - -next;<BR _MOZ_DIRTY=""/> - -}<BR _MOZ_DIRTY=""/> - -}<BR _MOZ_DIRTY=""/> - +<SPAN> +while (&lt;&gt;) { + $org=$_; + s/\\["']//g; + s/\/\/[^:].*//; + s/\/\*.*\*\///g; + if ($comment == 1) { + if (s/.*\*\///) { + $comment = 0; + } + else { + next; + } + } + if (s/\/\*.*//) { + $comment = 1; + } + if (/^\s*#/) { + next; + } + } </SPAN> </XMP> </test> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml 2009-05-20 15:48:31 UTC (rev 15366) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml 2009-05-20 15:52:00 UTC (rev 15367) @@ -2,16 +2,10 @@ <test id="pre"> <PRE WIDTH="30" ID="pre" CLASS="preClass" STYLE="color: red; -moz-user-modify: read-write;"> - <SPAN CLASS="vpe-text"> - <BR _MOZ_DIRTY="" /> - - string 1 - <BR _MOZ_DIRTY="" /> - - string 2 - <BR _MOZ_DIRTY="" /> - - </SPAN> +<SPAN CLASS="vpe-text"> +string 1 + string 2 +</SPAN> </PRE> </test> </tests> \ No newline at end of file