Author: tmortagne Date: 2009-05-04 17:34:15 +0200 (Mon, 04 May 2009) New Revision: 19341 Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ resources/section/section10.test Modified: platform/core/trunk/xwiki-rendering/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ java/org/xwiki/rendering/RenderingTests.java Log: XWIKI-3668: Problem when there is a {{velocity}} marker in a title : double line under the title Modified: platform/core/trunk/xwiki-rendering/pom.xml =================================================================== --- platform/core/trunk/xwiki-rendering/pom.xml 2009-05-04 14:56:49 UTC (rev 19340) +++ platform/core/trunk/xwiki-rendering/pom.xml 2009-05-04 15:34:15 UTC (rev 19341) @@ -41,7 +41,7 @@ <dependency> <groupId>org.wikimodel</groupId> <artifactId>org.wikimodel.wem</artifactId> - <version>2.0.7-20090430</version> + <version>2.0.7-20090504</version> </dependency> </dependencies> </dependencyManagement> Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ src/test/java/org/xwiki/rendering/RenderingTests.java =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/java/org/xwiki/rendering/RenderingTests.java 2009-05-04 14:56:49 UTC (rev 19340) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/java/org/xwiki/rendering/RenderingTests.java 2009-05-04 15:34:15 UTC (rev 19341) @@ -179,6 +179,7 @@ suite.addTestsFromResource("section/section7", false); suite.addTestsFromResource("section/section8", false); suite.addTestsFromResource("section/section9", false); + suite.addTestsFromResource("section/section10", false); // Escaping suite.addTestsFromResource("escape/escape1", false); Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/section/section10.test =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/section/section10.test (rev 0) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/section/section10.test 2009-05-04 15:34:15 UTC (rev 19341) @@ -0,0 +1,33 @@ + .#-------------------------------------------------------------------------------- +.input|xwiki/2.0 +.# Verify that a header content can start on a new line

+ .#-------------------------------------------------------------------------------- += Title level 1 {{simplemacro}}{{/simplemacro}}= +.#----------------------------------------------------- +.expect|event/1.0 +.#----------------------------------------------------- +beginDocument +beginSection +beginHeader [1, HTitlelevel1] +onWord [Title] +onSpace +onWord [level] +onSpace +onWord [1] +onSpace +onMacroInline [simplemacro] [] [] +endHeader [1, HTitlelevel1] +endSection +endDocument +.#----------------------------------------------------- +.expect|xhtml/1.0 +.#----------------------------------------------------- +<h1 id="HTitlelevel1"><span>Title level 1 <!-- startmacro:simplemacro|-||-|--><!--stopmacro--></span></h1> +.#----------------------------------------------------- +.expect|xwiki/2.0 +.#----------------------------------------------------- += Title level 1 {{simplemacro/}} = +.#----------------------------------------------------- +.input|xhtml/1.0 +.#----------------------------------------------------- +<h1 id="HTitlelevel1"><span>Title level 1 <!-- startmacro:simplemacro|-||-|--><!--stopmacro--></span></h1> \ No newline at end of file