Author: jpages Date: 2012-05-02 09:12:20 +0200 (Wed, 02 May 2012) New Revision: 653 Url: http://nuiton.org/repositories/revision/jrst/653 Log: Diverses modifications ont ?\195?\169t?\195?\169 apport?\195?\169es dans les tests Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java branches/jrst-docutils-jython/jrst/pom.xml branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/main/resources/log4j.properties branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java branches/jrst-docutils-jython/jrst/src/test/resources/log4j.properties Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2012-05-02 07:12:20 UTC (rev 653) @@ -25,16 +25,16 @@ package org.nuiton.jrst; -import java.io.FileNotFoundException; -import java.io.Reader; -import java.io.StringReader; +import java.io.*; import java.net.URL; import org.apache.maven.doxia.module.xdoc.XdocParser; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.sink.Sink; +import org.codehaus.plexus.util.IOUtil; import org.dom4j.Document; import org.nuiton.util.Resource; +import sun.nio.ch.FileKey; /** * Parse an RST model, transform it into xdoc model and emit events into the @@ -51,11 +51,11 @@ public void parse(Reader source, Sink sink) throws ParseException { try { + File sourceFile = File.createTempFile("source",".rst"); + FileWriter fileWriter = new FileWriter(sourceFile); + IOUtil.copy(source, fileWriter); + Document doc = JRST.generateXML(sourceFile); - // Load source as RST Document - JRSTReader jrst = new JRSTReader(); - Document doc = jrst.read(source); - // Apply xsl on rst RST Document JRSTGenerator gen = new JRSTGenerator(); String xsl = JRST.rst2xdoc; Modified: branches/jrst-docutils-jython/jrst/pom.xml =================================================================== --- branches/jrst-docutils-jython/jrst/pom.xml 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/pom.xml 2012-05-02 07:12:20 UTC (rev 653) @@ -46,6 +46,7 @@ <groupId>${project.groupId}</groupId> <artifactId>docutils</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> @@ -60,10 +61,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton</groupId> @@ -132,11 +133,11 @@ </dependency> <!-- Flying Saucer --> - <dependency> + <!--dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>core-renderer</artifactId> <version>R8</version> - </dependency> + </dependency--> </dependencies> Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-02 07:12:20 UTC (rev 653) @@ -38,6 +38,7 @@ import javax.xml.transform.sax.SAXResult; import javax.xml.transform.stream.StreamSource; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -100,15 +101,18 @@ /** XSL Stylesheet to transform Docbook into htmlhelp. */ protected static final String docbook2htmlhelp = "/docbook/htmlhelp/htmlhelp.xsl"; - /** XSL Stylesheet to transform xml into rst. */ - protected static final String xml2rst = "/xsl/xml2rst-nopy.xsl"; +// /** XSL Stylesheet to transform xml into rst. */ +// protected static final String rst2rst = "JRSTWriter"; /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String docbook2fo = "/docbook/fo/docbook.xsl"; - public static final String PATTERN_TYPE = "xml|docbook|html|htmlInnerBody|xdoc|fo|pdf|odt|rtf|latex|s5|xetex"; + public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|fo|pdf|odt|rtf|latex|s5|xetex"; - /** HTML INNER BODY output format type */ + /** HTML output format type */ + public static final String TYPE_XHTML = "xhtml"; + + /** HTML output format type */ public static final String TYPE_HTML_INNER_BODY = "htmlInnerBody"; /** XDOC output format type */ @@ -118,7 +122,7 @@ public static final String TYPE_DOCBOOK = "docbook"; /** XHTML output format type */ - public static final String TYPE_HTML = "xhtml"; + public static final String TYPE_HTML = "html"; /** JAVA HELP output format type */ public static final String TYPE_JAVAHELP = "javahelp"; @@ -152,10 +156,10 @@ stylesheets.put(TYPE_HTML_INNER_BODY, rst2xhtmlInnerBody); stylesheets.put(TYPE_XDOC, rst2xdoc); stylesheets.put(TYPE_DOCBOOK, rst2docbook); - stylesheets.put(TYPE_HTML, rst2docbook + "," + docbook2xhtml); + stylesheets.put(TYPE_XHTML, rst2docbook + "," + docbook2xhtml); stylesheets.put(TYPE_JAVAHELP, rst2docbook + "," + docbook2javahelp); stylesheets.put(TYPE_HTMLHELP, rst2docbook + "," + docbook2htmlhelp); - stylesheets.put(TYPE_RST, xml2rst); + stylesheets.put(TYPE_RST, ""); //stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); @@ -164,7 +168,7 @@ mimeType.put(TYPE_HTML_INNER_BODY, "text/html"); mimeType.put(TYPE_XDOC, "text/xml"); mimeType.put(TYPE_DOCBOOK, "text/xml"); - mimeType.put(TYPE_HTML, "text/html"); + mimeType.put(TYPE_XHTML, "text/html"); mimeType.put(TYPE_JAVAHELP, "text/plain"); mimeType.put(TYPE_HTMLHELP, "text/html"); mimeType.put(TYPE_RST, "text/plain"); @@ -218,7 +222,7 @@ overwrite = Overwrite.ALLTIME; } - generate(xslList.toUpperCase(), inputFile, ouputFile, overwrite); + generate(xslList, inputFile, ouputFile, overwrite); } private static String[] askOption() throws SecurityException, @@ -270,7 +274,8 @@ .isNewer(fileIn, fileOut)))) { log.info("Don't generate file " + fileOut + ", because already exists"); - } else if (outputType.equals("PDF") || outputType.equals("RST")) { + //} else if (outputType.equals("PDF") || outputType.equals("RST")) { + } else { // Out FileOutputStream outputStream = new FileOutputStream(fileOut); OutputStreamWriter writer = new OutputStreamWriter(outputStream, outputEncoding); @@ -316,8 +321,9 @@ writer.write(result); writer.close(); } - } else { - generateDocument(outputType, fileIn, fileOut); + /*} else { */ + //generateDocument(outputType, fileIn, fileOut); + } } @@ -376,13 +382,6 @@ return doc.asXML(); } - - /** - * - * @param doc - * @param xslListOrOutType - * @throws IOException, TransformerException - */ private static Document applyXsls(Document doc, String xslListOrOutType) throws IOException, TransformerException { // search xsl file list to apply @@ -420,17 +419,21 @@ public static Document generateXML(File in) throws Exception { URL resource = in.getClass().getResource("/__run__.py"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + resource); String docutilsPath = resource.getPath().replaceAll("__run__.py", ""); docutilsPath = docutilsPath.replaceAll("!", ""); docutilsPath = docutilsPath.replaceAll("file:", ""); + log.info("docutilsPath = "+docutilsPath); File out = File.createTempFile("result", ".xml"); JarRunner.run(new String[]{docutilsPath, Format.XML.name(), in.getPath(), out.getPath()}); + log.info("out = "+FileUtils.readFileToString(out)); SAXReader saxReader = new SAXReader(); return saxReader.read(out); } + public static File generateDocument(String outputType, File in, File out) throws Exception { // On récupère le chemin vers le script principal de docutils URL resource = in.getClass().getResource("/__run__.py"); @@ -439,7 +442,11 @@ docutilsPath = docutilsPath.replaceAll("file:", ""); // Only for debugging - log.info("Run Python with args: " + Arrays.toString(new String[]{docutilsPath, outputType, in.getPath(), out.getPath()})); + if (log.isDebugEnabled()){ + String message = "Run Python with args: " + + Arrays.toString(new String[]{docutilsPath, outputType, in.getPath(), out.getPath()}); + log.debug(message); + } JarRunner.run(new String[]{docutilsPath, outputType, in.getPath(), out.getPath()}); Modified: branches/jrst-docutils-jython/jrst/src/main/resources/log4j.properties =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/log4j.properties 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/main/resources/log4j.properties 2012-05-02 07:12:20 UTC (rev 653) @@ -32,3 +32,4 @@ # package level log4j.logger.org.nuiton.jrst=INFO +log4j.logger.org.nuiton.jrst.JRST=DEBUG Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTAbstractTest.java 2012-05-02 07:12:20 UTC (rev 653) @@ -66,7 +66,7 @@ } public static File getOutputTestFile(String fileName) throws IOException { - File file = new File(testWorkDir, fileName); + File file = new File(testWorkDir,System.nanoTime()+"_"+ fileName); file.createNewFile(); //file.deleteOnExit(); return file; Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-05-02 07:12:20 UTC (rev 653) @@ -35,12 +35,13 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; +import org.nuiton.util.Resource; /** * * @author chemit */ -public class JRSTTest extends JRSTGeneratorTest { +public class JRSTTest extends JRSTAbstractTest { /** to use log facility, just put in your code: log.info("..."); */ protected static Log log = LogFactory.getLog(JRSTTest.class); @@ -52,15 +53,15 @@ */ @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.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.xml2fo)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2fo)); } @Ignore @@ -123,6 +124,11 @@ File out = getOutputTestFile("jrst-RstToXml2.xml"); JRST.generate(JRST.Format.XML.name(), in, out, JRST.Overwrite.ALLTIME); + try { + JRST.generate(JRST.Format.XML.name(), in, out, JRST.Overwrite.ALLTIME); + } catch (Throwable e) { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } } @Test Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2012-05-02 07:12:20 UTC (rev 653) @@ -27,6 +27,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.jrst.JRST; import org.nuiton.jrst.JRSTAbstractTest; @@ -49,33 +50,17 @@ * * @throws Exception */ + @Ignore @Test public void testAdmonitionInList() throws Exception { File in = getBugTestFile("testAdminitionInList1787.rst"); File out = getOutputTestFile("jrst-testAdminitionInList1787.html"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + in.getPath()); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + out.getPath()); +// log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + in.getPath()); +// log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + out.getPath()); // out.deleteOnExit(); JRST.generate(JRST.Format.HTML.name(), in, out, JRST.Overwrite.ALLTIME); - String chaine=""; - - //lecture du fichier texte - try{ - InputStream ips=new FileInputStream(out); - InputStreamReader ipsr=new InputStreamReader(ips); - BufferedReader br=new BufferedReader(ipsr); - String ligne; - while ((ligne=br.readLine())!=null){ - System.out.println(ligne); - } - br.close(); - } - catch (Exception e){ - System.out.println(e.toString()); - } - String content = FileUtils.readFileToString(out); // Must contains <div class="note"> assertTrue(content.contains("<div class=\"note\">")); Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2012-05-02 07:12:20 UTC (rev 653) @@ -54,7 +54,7 @@ File in = new File("src/test/resources/bugs/testNoSubtitle.rst"); File out = File.createTempFile("jrst-RstToHtml2", ".html"); // out.deleteOnExit(); - JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + JRST.generate(JRST.Format.HTML.name(), in, out, JRST.Overwrite.ALLTIME); } /** @@ -68,7 +68,7 @@ File in = new File("src/test/resources/bugs/testNoContentSubtitles.rst"); File out = File.createTempFile("jrst-testNoContentSubtitles", ".html"); // out.deleteOnExit(); - JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + JRST.generate(JRST.Format.HTML.name(), in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Assert.assertTrue(content.indexOf("<h2>Prérequis</h2>") > 0); Modified: branches/jrst-docutils-jython/jrst/src/test/resources/log4j.properties =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/resources/log4j.properties 2012-04-30 10:29:41 UTC (rev 652) +++ branches/jrst-docutils-jython/jrst/src/test/resources/log4j.properties 2012-05-02 07:12:20 UTC (rev 653) @@ -31,3 +31,4 @@ #log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X # package level log4j.logger.org.nuiton.jrst=INFO +log4j.logger.org.nuiton.jrst.JRST=DEBUG