[richfaces-svn-commits] JBoss Rich Faces SVN: r14583 - in branches/community/3.3.X/ui/editor/src: test/java/org/richfaces/seamparser and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: Alex.Kolonitsky
Date: 2009-06-10 10:39:03 -0400 (Wed, 10 Jun 2009)
New Revision: 14583

Modified:
   branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/seamtext/HtmlToSeamTransformer.java
   branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
Log:
Rich editor fails to convert "_" character to seam text
https://jira.jboss.org/jira/browse/RF-7347

Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/seamtext/HtmlToSeamTransformer.java
===================================================================
--- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/seamtext/HtmlToSeamTransformer.java	2009-06-10 14:30:51 UTC (rev 14582)
+++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/seamtext/HtmlToSeamTransformer.java	2009-06-10 14:39:03 UTC (rev 14583)
@@ -136,7 +136,7 @@
             switch (text[start]) {
                 case '*': case '|': case '^' : case '+':
                 case '=': case '#': case '\\': case '~':
-                case '[': case ']': case '`' :
+                case '[': case ']': case '`' : case '_':
                 case '<': case '>': case '&':
                     if (localStart != -1) {
                         out(text, localStart, start - localStart);

Modified: branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
===================================================================
--- branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java	2009-06-10 14:30:51 UTC (rev 14582)
+++ branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java	2009-06-10 14:39:03 UTC (rev 14583)
@@ -7,6 +7,8 @@
 import org.jboss.seam.text.SeamTextParser;
 import org.richfaces.convert.seamtext.HtmlToSeamSAXParser;
 
+import com.gargoylesoftware.htmlunit.Assert;
+
 import java.io.StringReader;
 
 /**
@@ -245,7 +247,7 @@
     }
     
     public void testSkipComment() throws Exception {
-        assertHtml2SeamConverting("<!-- Hello Cfif -->");
+        assertHtml2SeamConverting("<!-- Hello Alex -->");
     }
     
     public void testEmptyList() throws Exception {
@@ -350,6 +352,20 @@
         assertHtml2SeamConverting(content);
     }
     
+    public void testRF7347() throws Exception {
+        final String content = "case '*': case '|': case '^' : case '+': " +
+                      		   "case '=': case '#': case '\\': case '~': " +
+                        	   "case '[': case ']': case '`' : case '_': ";        
+        final String result = assertHtml2SeamConverting(content);
+        assertTrue(result.contains(content));
+    }
+    
+    public void testRF7347_2() throws Exception {
+        final String content = "_*Hello ^World^*_ ";        
+        final String result = assertHtml2SeamConverting(content);
+        assertTrue(result.contains(content));
+    }
+    
     public void testUglyTextFromWord() throws Exception {
         final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>"
                 + "<!--[if gte mso 9]><xml>\n"