December 2011 - Jrst-commits - mailman.cloud.codelutin.com

r638 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by jruchaud＠users.nuiton.org Dec. 23, 2011

Dec. 23, 2011

Author: jruchaud Date: 2011-12-23 11:35:21 +0100 (Fri, 23 Dec 2011) New Revision: 638 Url: http://nuiton.org/repositories/revision/jrst/638 Log: #1844 Process strong and emphasis in contents directive Added: trunk/jrst/src/test/resources/bugs/testContents.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-12-16 16:14:28 UTC (rev 637) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-12-23 10:35:21 UTC (rev 638) @@ -698,8 +698,25 @@ } } - reference.setText(text.replaceAll("_", "").trim()); + + text = text.trim(); + text = text.replaceAll("_", ""); + + text = REGEX_STRONG.matcher(text).replaceAll( + "<" + STRONG + ">$1</" + STRONG + ">"); + text = REGEX_EMPHASIS.matcher(text).replaceAll( + "<" + EMPHASIS + ">$1</" + EMPHASIS + ">"); + + try { + Element textElement = DocumentHelper.parseText("<TMP>" + text + "</TMP>").getRootElement(); + reference.appendContent(textElement); + } catch (DocumentException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't inline text for " + e, eee); + } + } + } else { do { e.addAttribute(LEVEL, "" + (level - 1)); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-12-16 16:14:28 UTC (rev 637) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-12-23 10:35:21 UTC (rev 638) @@ -81,4 +81,21 @@ String content = FileUtils.readFileToString(out); assertTrue(content.indexOf("Table des matières") > 0); } + + /** + * Test strong and emphasis in title. + * + * @throws Exception + */ + @Test + public void testContentsDirective() throws Exception { + File in = getBugTestFile("testContents.rst"); + File out = getOutputTestFile("jrst-testContents.html"); +// out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + assertTrue(content.indexOf("<b>") > 0); + assertTrue(content.indexOf("<em>") > 0); + } } Copied: trunk/jrst/src/test/resources/bugs/testContents.rst (from rev 637, trunk/jrst/src/test/resources/bugs/testNoContentSubtitles.rst) =================================================================== --- trunk/jrst/src/test/resources/bugs/testContents.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testContents.rst 2011-12-23 10:35:21 UTC (rev 638) @@ -0,0 +1,52 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +Prérequis +========= + +.. contents:: + +Prérequis normal +---------------- + +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla + +Prérequis **strong** +-------------------- + +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla + +Prérequis *emphasis* +-------------------- + +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla

1 0

r637 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by maven-release＠users.nuiton.org Dec. 16, 2011

Dec. 16, 2011

Author: maven-release Date: 2011-12-16 17:14:28 +0100 (Fri, 16 Dec 2011) New Revision: 637 Url: http://nuiton.org/repositories/revision/jrst/637 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-12-16 16:14:27 UTC (rev 636) +++ trunk/doxia-module-jrst/pom.xml 2011-12-16 16:14:28 UTC (rev 637) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-12-16 16:14:27 UTC (rev 636) +++ trunk/jrst/pom.xml 2011-12-16 16:14:28 UTC (rev 637) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-12-16 16:14:27 UTC (rev 636) +++ trunk/jrst-doc/pom.xml 2011-12-16 16:14:28 UTC (rev 637) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-12-16 16:14:27 UTC (rev 636) +++ trunk/maven-jrst-plugin/pom.xml 2011-12-16 16:14:28 UTC (rev 637) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-16 16:14:27 UTC (rev 636) +++ trunk/pom.xml 2011-12-16 16:14:28 UTC (rev 637) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <modules> <module>jrst</module> @@ -404,11 +404,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.5</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.5 + scm:svn:http://svn.nuiton.org/svn/jrst/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.5</url> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> <distributionManagement>

1 0

r636 - tags
by maven-release＠users.nuiton.org Dec. 16, 2011

Dec. 16, 2011

Author: maven-release Date: 2011-12-16 17:14:27 +0100 (Fri, 16 Dec 2011) New Revision: 636 Url: http://nuiton.org/repositories/revision/jrst/636 Log: [maven-release-plugin] copy for tag jrst-1.5 Added: tags/jrst-1.5/

1 0

r635 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by maven-release＠users.nuiton.org Dec. 16, 2011

Dec. 16, 2011

Author: maven-release Date: 2011-12-16 17:14:26 +0100 (Fri, 16 Dec 2011) New Revision: 635 Url: http://nuiton.org/repositories/revision/jrst/635 Log: [maven-release-plugin] prepare release jrst-1.5 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-12-16 16:12:29 UTC (rev 634) +++ trunk/doxia-module-jrst/pom.xml 2011-12-16 16:14:26 UTC (rev 635) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-12-16 16:12:29 UTC (rev 634) +++ trunk/jrst/pom.xml 2011-12-16 16:14:26 UTC (rev 635) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-12-16 16:12:29 UTC (rev 634) +++ trunk/jrst-doc/pom.xml 2011-12-16 16:14:26 UTC (rev 635) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-12-16 16:12:29 UTC (rev 634) +++ trunk/maven-jrst-plugin/pom.xml 2011-12-16 16:14:26 UTC (rev 635) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-16 16:12:29 UTC (rev 634) +++ trunk/pom.xml 2011-12-16 16:14:26 UTC (rev 635) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <modules> <module>jrst</module> @@ -404,11 +404,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.5</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/trunk + scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.5 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.5</url> </scm> <distributionManagement>

1 0

r634 - in trunk: doxia-module-jrst/src/license jrst/src/main/java/org/nuiton/jrst jrst/src/test/java/org/nuiton/jrst
by maven-release＠users.nuiton.org Dec. 16, 2011

Dec. 16, 2011

Author: maven-release Date: 2011-12-16 17:12:29 +0100 (Fri, 16 Dec 2011) New Revision: 634 Url: http://nuiton.org/repositories/revision/jrst/634 Log: Fix header + optimize third party Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2011-12-16 16:04:06 UTC (rev 633) +++ trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2011-12-16 16:12:29 UTC (rev 634) @@ -3,6 +3,7 @@ # Already used licenses in project : # - Apache License # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -20,12 +21,10 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:17:51 CEST 2011 +#Fri Dec 16 17:05:07 CET 2011 com.ibm.icu--icu4j--2.6.1=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-classworlds--1.2-alpha-9=http\://classworlds.co… -org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 -xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java 2011-12-16 16:04:06 UTC (rev 633) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java 2011-12-16 16:12:29 UTC (rev 634) @@ -1,3 +1,27 @@ +/* + * #%L + * JRst :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.jrst; import org.apache.commons.logging.Log; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java 2011-12-16 16:04:06 UTC (rev 633) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java 2011-12-16 16:12:29 UTC (rev 634) @@ -1,3 +1,27 @@ +/* + * #%L + * JRst :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.jrst; import org.junit.Assert;

1 0

r633 - trunk/doxia-module-jrst
by jruchaud＠users.nuiton.org Dec. 16, 2011

Dec. 16, 2011

Author: jruchaud Date: 2011-12-16 17:04:06 +0100 (Fri, 16 Dec 2011) New Revision: 633 Url: http://nuiton.org/repositories/revision/jrst/633 Log: Fix dependency Modified: trunk/doxia-module-jrst/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-12-09 14:52:23 UTC (rev 632) +++ trunk/doxia-module-jrst/pom.xml 2011-12-16 16:04:06 UTC (rev 633) @@ -79,6 +79,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <scope>runtime</scope>

1 0

r632 - trunk/jrst/src/test/resources/bugs
by jruchaud＠users.nuiton.org Dec. 9, 2011

Dec. 9, 2011

Author: jruchaud Date: 2011-12-09 15:52:23 +0100 (Fri, 09 Dec 2011) New Revision: 632 Url: http://nuiton.org/repositories/revision/jrst/632 Log: #1847 Changement de la regexp pour autoriser les urls relatives dans les embedded links Added: trunk/jrst/src/test/resources/bugs/testEmbeddedURIs.rst Copied: trunk/jrst/src/test/resources/bugs/testEmbeddedURIs.rst (from rev 630, trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst) =================================================================== --- trunk/jrst/src/test/resources/bugs/testEmbeddedURIs.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testEmbeddedURIs.rst 2011-12-09 14:52:23 UTC (rev 632) @@ -0,0 +1,31 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +See the `Python home page <http://www.python.org>`_ for info. + +See the `Python home page bis <./python>`_ for info. + +`RFC 2396 <http://www.rfc-editor.org/rfc/rfc2396.txt>`__ and `RFC +2732 <http://www.rfc-editor.org/rfc/rfc2732.txt>`__ together +define the syntax of URIs.

1 0

r631 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs
by jruchaud＠users.nuiton.org Dec. 9, 2011

Dec. 9, 2011

Author: jruchaud Date: 2011-12-09 15:52:16 +0100 (Fri, 09 Dec 2011) New Revision: 631 Url: http://nuiton.org/repositories/revision/jrst/631 Log: #1847 Changement de la regexp pour autoriser les urls relatives dans les embedded links Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2011-11-29 17:40:40 UTC (rev 630) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2011-12-09 14:52:16 UTC (rev 631) @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% JRst - * Copyright (C) 2004 - 2008 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ package org.nuiton.jrst; @@ -205,7 +189,7 @@ public static final Pattern REGEX_REFERENCE = Pattern .compile("(https?://[-/%#[\\&&&[^(>)]]\\._\\w:]+\\w+)((\\W|&|$)+)"); public static final Pattern REGEX_INLINE_REFERENCE = Pattern - .compile("`(.+?) \\&lt\\;(https?://[-/%#&\\._\\w:[^ ]]+)(\\&gt\\;)`_"); + .compile("`(.+?) \\&lt\\;((https?://)?[-/%#&\\._\\w:[^ ]]+)(\\&gt\\;)`_"); public static final Pattern REGEX_EMAIL = Pattern .compile("(^|[^_\\w])([-\\._\\w]+(a)[-\\._\\w]+)([^-\\._\\w]|$)"); public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-11-29 17:40:40 UTC (rev 630) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-12-09 14:52:16 UTC (rev 631) @@ -141,4 +141,22 @@ assertTrue(content.indexOf("echapement de lien1_") > 0); assertTrue(content.indexOf("echapement de *.txt") > 0); } + + /** + * Test embedded links + */ + @Test + public void testEmbededURIs() throws Exception { + File in = getBugTestFile("testEmbeddedURIs.rst"); + File out = getOutputTestFile("jrst-testEmbeddedURIs.html"); + + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + assertTrue(content.contains("href=\"http://www.python.org\"")); + assertTrue(content.contains("href=\"./python\"")); + assertTrue(content.contains("href=\"http://www.rfc-editor.org/rfc/rfc2396.txt\"")); + assertTrue(content.contains("href=\"http://www.rfc-editor.org/rfc/rfc2732.txt\"")); + } + }

1 0