On Nov 30, 2010, at 10:14 AM, tmortagne (SVN) wrote:
> Author: tmortagne
> Date: 2010-11-30 10:14:58 +0100 (Tue, 30 Nov 2010)
> New Revision: 33178
>
> Added:
>
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/test/resources/html/html19.test
> Modified:
>
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/main/java/org/xwiki/rendering/internal/parser/xwiki10/HTMLFilter.java
> Log:
> XWIKI-4468: timeout on xwiki syntax 1.0 to syntax 2.0 conversion
>
> Modified:
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/main/java/org/xwiki/rendering/internal/parser/xwiki10/HTMLFilter.java
> ===================================================================
> ---
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/main/java/org/xwiki/rendering/internal/parser/xwiki10/HTMLFilter.java
> 2010-11-30 03:52:53 UTC (rev 33177)
> +++
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/main/java/org/xwiki/rendering/internal/parser/xwiki10/HTMLFilter.java
> 2010-11-30 09:14:58 UTC (rev 33178)
> @@ -429,6 +429,7 @@
> }
> } catch (InvalidHtmlException e) {
> getLogger().debug("Invalid HTML block at char [" + i +
> "]", e);
> + ++i;
> }
> } else {
> elementContent.append(c);
>
> Added:
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/test/resources/html/html19.test
> ===================================================================
> ---
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/test/resources/html/html19.test
> (rev 0)
> +++
> platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki10/src/test/resources/html/html19.test
> 2010-11-30 09:14:58 UTC (rev 33178)
> @@ -0,0 +1,10 @@
> +.#-----------------------------------------------------
> +.input|xwiki/1.0
Would be good to put a comment to explain what this is testing since it's not
obvious.
Thanks
-Vincent
> +.#-----------------------------------------------------
> +<element> < </element>
> +.#-----------------------------------------------------
> +.expect|xwiki/2.0
> +.#-----------------------------------------------------
> +{{html clean="false" wiki="true"}}
> +<element> < </element>
> +{{/html}}
> \ No newline at end of file
_______________________________________________
devs mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/devs
