r663 - in branches/jrst-docutils-jython/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs - Jrst-commits

16 May 2012

Author: jpages
Date: 2012-05-16 11:05:50 +0200 (Wed, 16 May 2012)
New Revision: 663

Url: http://nuiton.org/repositories/revision/jrst/663

Log:
Utilisation d'une constante pour l'encodage


Modified:
   branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.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/DirectiveTest.java
   branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java
   branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java
   branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java

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-05-16 08:52:25 UTC (rev 662)
+++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java	2012-05-16 09:05:50 UTC (rev 663)
@@ -428,7 +428,7 @@
         out = generateDocument(TYPE_XML, in, out);
 
         SAXReader saxReader = new SAXReader();
-        saxReader.setEncoding("UTF-8");
+        saxReader.setEncoding(UTF_8);
         return saxReader.read(out);
     }
 

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-05-16 08:52:25 UTC (rev 662)
+++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java	2012-05-16 09:05:50 UTC (rev 663)
@@ -61,7 +61,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
 
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
 //      Must contains <div class="note">
         assertTrue(content.contains("<div class=\"note\">"));
     }

Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java
===================================================================
--- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java	2012-05-16 08:52:25 UTC (rev 662)
+++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java	2012-05-16 09:05:50 UTC (rev 663)
@@ -56,7 +56,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("alt=\"alternate text\"") > 0);
         assertTrue(content.indexOf("width=\"200px\"") > 0);
         assertTrue(content.indexOf("align=\"center\"") > 0);
@@ -78,7 +78,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("Table des matières") > 0);
     }
     
@@ -94,7 +94,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("<b>") > 0);
         assertTrue(content.indexOf("<em>") > 0);
     }

Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java
===================================================================
--- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java	2012-05-16 08:52:25 UTC (rev 662)
+++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java	2012-05-16 09:05:50 UTC (rev 663)
@@ -56,7 +56,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("Annee|Trait|Espece") > 0);
         assertTrue(content.indexOf("<p>Fatal</p>") > 0);
     }
@@ -73,7 +73,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("<em>légérs</em>") > 0);
     }
 }

Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java
===================================================================
--- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java	2012-05-16 08:52:25 UTC (rev 662)
+++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java	2012-05-16 09:05:50 UTC (rev 663)
@@ -58,7 +58,7 @@
 
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("href=\"http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=browse\"") > 0);
         assertTrue(content.indexOf("href=\"http://www.docbook.org/\"") > 0);
         assertTrue(content.indexOf("href=\"http://www.docbook2.org/\"") > 0);
@@ -77,7 +77,7 @@
 
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("nuiton's forge") > 0);
         assertTrue(content.indexOf("build.xml") > 0);
     }
@@ -95,7 +95,7 @@
 
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         Pattern pattern = Pattern.compile(".*<blockquote>.*du bla bla \u00E9l\u00E9mentaire.*</blockquote>.*", Pattern.DOTALL);
         Matcher matcher = pattern.matcher(content);
         assertTrue(matcher.find());
@@ -112,7 +112,7 @@
 
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("<span class=\"option\">-a</span>") > 0);
         assertTrue(content.indexOf("<p>options can have arguments\nand long descriptions</p>") > 0);
         assertTrue(content.indexOf("<v3region.zip|v2region.xml|v2region.xml.gz>") > 0);
@@ -135,7 +135,7 @@
 
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         assertTrue(content.indexOf("echapement de lien1_") > 0);
         assertTrue(content.indexOf("echapement de *.txt") > 0);
     }
@@ -150,7 +150,7 @@
 
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
         
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         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\""));

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-05-16 08:52:25 UTC (rev 662)
+++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java	2012-05-16 09:05:50 UTC (rev 663)
@@ -70,7 +70,7 @@
 //        out.deleteOnExit();
         JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);
 
-        String content = FileUtils.readFileToString(out, "UTF-8");
+        String content = FileUtils.readFileToString(out, JRST.UTF_8);
         Assert.assertTrue(content.indexOf("<h2>Prérequis</h2>") > 0);
     }
 }

    

r663 - in branches/jrst-docutils-jython/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs

jpages＠users.nuiton.org

tags

participants (1)