Jrst-commits

Download

jrst-commits@list.nuiton.org

November 2010

2 participants
12 discussions

r503 - in trunk/jrst/src/test: java/org/nuiton/jrst resources
by vbriand＠users.nuiton.org 04 Nov '10

04 Nov '10

Author: vbriand Date: 2010-11-04 16:55:25 +0100 (Thu, 04 Nov 2010) New Revision: 503 Url: http://nuiton.org/repositories/revision/jrst/503 Log: Added a test for the empty table of contents Added: trunk/jrst/src/test/resources/testEmptyTableContents.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-04 14:13:42 UTC (rev 502) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-04 15:55:25 UTC (rev 503) @@ -32,6 +32,9 @@ import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; + +import junit.framework.Assert; + import org.junit.Test; /** @@ -69,5 +72,21 @@ // System.out.println(out.toString()); // } } - + + @Test + public void testEmptyTableContents() throws Exception{ + URL url = JRSTReaderTest.class.getResource("/testEmptyTableContents.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String XMLexpected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<document id=\"test\" name=\"test\">" + + "<title>Test</title>" + + "<topic class=\"contents\" id=\"table des matières\" name=\"table des matières\">" + + "<title>Table des matières</title>" + + "</topic>" + + "<paragraph>Texte</paragraph>" + + "</document>"; + Assert.assertEquals(XMLexpected, doc.asXML()); + } } Added: trunk/jrst/src/test/resources/testEmptyTableContents.rst =================================================================== --- trunk/jrst/src/test/resources/testEmptyTableContents.rst (rev 0) +++ trunk/jrst/src/test/resources/testEmptyTableContents.rst 2010-11-04 15:55:25 UTC (rev 503) @@ -0,0 +1,6 @@ +Test +---- + +.. contents:: Table des matières + +Texte \ No newline at end of file

1 0

r502 - trunk/jrst/src/main/java/org/nuiton/jrst
by vbriand＠users.nuiton.org 04 Nov '10

04 Nov '10

Author: vbriand Date: 2010-11-04 15:13:42 +0100 (Thu, 04 Nov 2010) New Revision: 502 Url: http://nuiton.org/repositories/revision/jrst/502 Log: A table of contents without title doesn't stop the file parsing anymore Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-10-29 17:19:24 UTC (rev 501) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-11-04 14:13:42 UTC (rev 502) @@ -129,6 +129,7 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.NoSuchElementException; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringEscapeUtils; @@ -524,6 +525,8 @@ } } int levelInit = 0; + boolean noTitle = false; + try { levelInit = Integer.parseInt(eTitle.getFirst().attributeValue( "level")); @@ -531,6 +534,8 @@ log.error("Can't parse level in: " + eTitle.getFirst().asXML(), eee); return; + } catch (NoSuchElementException eee) { + noTitle = true; } LinkedList<Element> title = new LinkedList<Element>(); @@ -566,7 +571,9 @@ e.addAttribute("name", value); result.addElement("title").setText(titleValue); // on compose les lignes - result.add(composeLineContent(title, "")); + if (!noTitle) { //Si il y a des titres à lier à la table des matières + result.add(composeLineContent(title, "")); + } e.setText(""); e.appendContent(result); }

1 0