Author: echatellier Date: 2011-02-17 11:34:11 +0100 (Thu, 17 Feb 2011) New Revision: 541 Url: http://nuiton.org/repositories/revision/jrst/541 Log: Test resources in classpath Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-16 21:14:16 UTC (rev 540) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-17 10:34:11 UTC (rev 541) @@ -116,11 +116,11 @@ protected static final String rst2docbook = "/xsl/dn2dbk.xsl"; /** XSL Stylesheet to transform Docbook into xHTML. */ - protected static final String docbook2xhtml = "/xhtml/docbook.xsl"; + protected static final String docbook2xhtml = "/docbook/xhtml/docbook.xsl"; /** XSL Stylesheet to transform Docbook into javahelp. */ - protected static final String docbook2javahelp = "/javahelp/javahelp.xsl"; + protected static final String docbook2javahelp = "/docbook/javahelp/javahelp.xsl"; /** XSL Stylesheet to transform Docbook into htmlhelp. */ - protected static final String docbook2htmlhelp = "/htmlhelp/htmlhelp.xsl"; + protected static final String docbook2htmlhelp = "/docbook/htmlhelp/htmlhelp.xsl"; // /** XSL Stylesheet to transform xml into rst. */ // protected static final String rst2rst = "JRSTWriter"; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2011-02-16 21:14:16 UTC (rev 540) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2011-02-17 10:34:11 UTC (rev 541) @@ -28,12 +28,14 @@ import java.io.File; import java.util.Arrays; import java.util.List; + 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.util.Resource; /** * @@ -43,7 +45,9 @@ /** to use log facility, just put in your code: log.info("..."); */ protected static Log log = LogFactory.getLog(JRSTTest.class); + static File basedir; + static File testBasedir; @BeforeClass @@ -62,7 +66,25 @@ log.info("test basedir : " + testBasedir); } + /** + * Test que les ressources sont bien dans le classpath. + * + * Test du cas particulier de la dependance docbook-xsl. + */ @Test + public void testResources() { + Assert.assertNotNull(Resource.getURL(JRST.rst2xhtml)); + Assert.assertNotNull(Resource.getURL(JRST.rst2xdoc)); + Assert.assertNotNull(Resource.getURL(JRST.rst2docbook)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2xhtml)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2javahelp)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2htmlhelp)); + // FIXME echatellier 20110217 following assert fails + //Assert.assertNotNull(Resource.getURL(JRST.docbook2odf)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2fo)); + } + + @Test public void generateRst() throws Exception { File in = new File(testBasedir, "toRst1-in.rst");