[jboss-svn-commits] JBL Code SVN: r26805 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src: test/java/org/jboss/labs/clearspace/plugin/nfm/converter and 1 other directory.

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

Author: lkrzyzanek
Date: 2009-06-02 09:07:11 -0400 (Tue, 02 Jun 2009)
New Revision: 26805

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java
Log:
Corrected quote parsing with value (no need to add " letter).

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java	2009-06-02 12:47:03 UTC (rev 26804)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java	2009-06-02 13:07:11 UTC (rev 26805)
@@ -77,7 +77,7 @@
       case BBCodeParser.EVENT_QUOTE:
         write("<pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">");
         if (string != null && string.length() > 0) {
-          write("\"" + StringEscapeUtils.escapeHtml(string) + "\" wrote:</br>");
+          write(StringEscapeUtils.escapeHtml(string) + " wrote:</br>");
         }
         isInPre++;
         break;

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java	2009-06-02 12:47:03 UTC (rev 26804)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java	2009-06-02 13:07:11 UTC (rev 26805)
@@ -34,7 +34,7 @@
     assertEquals("<p><span style=\"color: red\">color</span></p>", converter.convert("[color=red]color[/color]"));
     assertEquals("<p><span style=\"font-size: 7px; line-height: normal\">size7</span></p>", converter.convert("[size=7]size7[/size]"));
     assertEquals("<p><pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">quote</pre></p>", converter.convert("[quote]quote[/quote]"));
-    assertEquals("<p><pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">\"username at somedomain.com\" wrote:</br>quote</pre></p>", converter.convert("[quote=username at somedomain.com]quote[/quote]"));
+    assertEquals("<p><pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">&quot;username at somedomain.com&quot; wrote:</br>quote</pre></p>", converter.convert("[quote=\"username at somedomain.com\"]quote[/quote]"));
     assertEquals("<p><pre __default_attr=\"java\" __jive_macro_name=\"code\" class=\"jive_text_macro jive_macro_code\">code</pre></p>", converter.convert("[code]code[/code]"));
     assertEquals("<p><a href=\"www.jboss.org\">www.jboss.org</a></p>", converter.convert("[url]www.jboss.org[/url]"));