Author: sletellier Date: 2011-10-27 13:39:00 +0200 (Thu, 27 Oct 2011) New Revision: 622 Url: http://nuiton.org/repositories/revision/jrst/622 Log: - #1787 Admonition not parsed - Create test Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-09-22 17:25:48 UTC (rev 621) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-27 11:39:00 UTC (rev 622) @@ -1089,7 +1089,7 @@ String line = in.readLine(); if (line != null) { String lineTest = line.toLowerCase(); - Pattern pAdmonition = Pattern.compile("^\\.\\.\\s*(" + Pattern pAdmonition = Pattern.compile("^\\s*\\.\\.\\s(" + ADMONITION_PATTERN + ")::\\s*(.*)$"); Matcher matcher = pAdmonition.matcher(lineTest); Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2011-10-27 11:39:00 UTC (rev 622) @@ -0,0 +1,49 @@ +package org.nuiton.jrst.bugs; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; + +import java.io.File; +import java.io.IOException; + +/** + * Test concernant les admonitions. + * + * @author sletellier + */ +public class AdmonitionTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(AdmonitionTest.class); + + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + + /** + * Test que les options des admonitions dans des listes sont bien parsée + * parsées. + * + * @throws Exception + */ + @Test + public void testAdmonitionInList() throws Exception { + File in = new File("src/test/resources/bugs/testAdminitionInList1787.rst"); + File out = File.createTempFile("jrst-testAdminitionInList1787", ".html"); +// out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + +// Must contains <div class="note"> + Assert.assertTrue(content.contains("<div class=\"note\">")); + } + +} Added: trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst 2011-10-27 11:39:00 UTC (rev 622) @@ -0,0 +1,5 @@ +* item + + .. Note:: note + +* item2