svn commit: r681280 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/util/string/Strings.java test/java/org/apache/wicket/util/string/StringsTest.java

[ivaynberg]

Author: ivaynberg
Date: Wed Jul 30 23:32:04 2008
New Revision: 681280

URL: http://svn.apache.org/viewvc?rev=681280&view=rev
Log:
WICKET-1311, make strings.escapemarkup dumber but more consistent. this change 
is only going into 1.4 because i do not know the full extent of this change and 
do not want to pull a rug from under running applications

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?rev=681280&r1=681279&r2=681280&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java 
(original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java 
Wed Jul 30 23:32:04 2008
@@ -334,17 +334,7 @@
 
                                        case '&' :
 
-                                               // if this is an entity (&#), 
then do not convert
-                                               if ((i < len - 1) && 
(s.charAt(i + 1) == '#'))
-                                               {
-                                                       buffer.append(c);
-
-                                               }
-                                               else
-                                               {
-                                                       // it is not an entity, 
so convert it to &amp;
-                                                       buffer.append("&amp;");
-                                               }
+                                               buffer.append("&amp;");
                                                break;
 
                                        case '"' :

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java?rev=681280&r1=681279&r2=681280&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
 Wed Jul 30 23:32:04 2008
@@ -52,7 +52,7 @@
                Assert.assertEquals("", Strings.afterLast("bar", '.'));
                Assert.assertEquals("foo", Strings.replaceAll("afaooaaa", "a", 
"").toString());
                Assert.assertEquals("fuzzyffuzzyoofuzzyfuzzyfuzzy", 
Strings.replaceAll("afaooaaa", "a",
-                               "fuzzy").toString());
+                       "fuzzy").toString());
        }
 
        /**
@@ -137,14 +137,12 @@
                assertEquals("", Strings.escapeMarkup("").toString());
 
                assertEquals("&amp;", Strings.escapeMarkup("&").toString());
-               assertEquals("&#", Strings.escapeMarkup("&#").toString());
-               assertEquals("&#0000;", 
Strings.escapeMarkup("&#0000;").toString());
 
                assertEquals("&amp;amp;", 
Strings.escapeMarkup("&amp;").toString());
                assertEquals("&lt; &gt;&amp;&quot;&#039;?:;{}[]-_+=()[EMAIL 
PROTECTED]", Strings.escapeMarkup(
-                               "< >&\"'?:;{}[]-_+=()[EMAIL 
PROTECTED]").toString());
+                       "< >&\"'?:;{}[]-_+=()[EMAIL PROTECTED]").toString());
                
assertEquals("&lt;&nbsp;&gt;&amp;&quot;&#039;?:;{}[]-_+=()[EMAIL PROTECTED]", 
Strings.escapeMarkup(
-                               "< >&\"'?:;{}[]-_+=()[EMAIL PROTECTED]", 
true).toString());
+                       "< >&\"'?:;{}[]-_+=()[EMAIL PROTECTED]", 
true).toString());
        }
 
        /**
@@ -157,7 +155,7 @@
 
                assertEquals("\n \t", Strings.escapeMarkup("\n \t", 
false).toString());
                assertEquals("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", 
Strings.escapeMarkup("\n \t", true)
-                               .toString());
+                       .toString());
                assertEquals("  ", Strings.escapeMarkup("  ", 
false).toString());
                assertEquals("&nbsp;&nbsp;", Strings.escapeMarkup("  ", 
true).toString());
        }
@@ -173,14 +171,10 @@
                assertEquals("", Strings.escapeMarkup("", true, 
true).toString());
 
                // The escaped unicode is ����������"
-               
assertEquals("&#199;&#252;&#233;&#226;&#228;&#224;&#229;&#231;&#234;&#235;", 
Strings
-                               
.escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
-                                               false, true).toString());
-
-               assertEquals("\n \t&#233;", 
Strings.escapeMarkup(convertNonASCIIString("\n \t&#233;"),
+               
assertEquals("&#199;&#252;&#233;&#226;&#228;&#224;&#229;&#231;&#234;&#235;",
+                       
Strings.escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
                                false, true).toString());
-               assertEquals(convertNonASCIIString("\n \t&#233;"), 
Strings.escapeMarkup(
-                               convertNonASCIIString("\n \t&#233;"), false, 
false).toString());
+
        }
 
        /**
@@ -195,9 +189,8 @@
                assertEquals("abcdefghijklm�", 
Strings.replaceHtmlEscapeNumber("abcdefghijklm�"));
                assertEquals("a &#", Strings.replaceHtmlEscapeNumber("a &#"));
                assertEquals(
-                               
"\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
-                               Strings
-                                               
.replaceHtmlEscapeNumber("&#199;&#252;&#233;&#226;&#228;&#224;&#229;&#231;&#234;&#235;"));
+                       
"\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
+                       
Strings.replaceHtmlEscapeNumber("&#199;&#252;&#233;&#226;&#228;&#224;&#229;&#231;&#234;&#235;"));
        }
 
        private String convertNonASCIIString(String str) throws 
UnsupportedEncodingException
@@ -410,14 +403,14 @@
                assertEquals("<p>abc<br/>def</p>", 
Strings.toMultilineMarkup("abc\ndef").toString());
                assertEquals("<p>abc<br/>def</p>", 
Strings.toMultilineMarkup("abc\r\ndef").toString());
                assertEquals("<p>abc<br/>def<br/>ghi</p>", 
Strings.toMultilineMarkup("abc\ndef\nghi")
-                               .toString());
+                       .toString());
 
                assertEquals("<p>abc</p><p>def</p><p>ghi</p>", 
Strings.toMultilineMarkup(
-                               "abc\n\ndef\n\nghi").toString());
+                       "abc\n\ndef\n\nghi").toString());
                assertEquals("<p>abc</p><p>def</p><p>ghi</p>", 
Strings.toMultilineMarkup(
-                               "abc\r\n\r\ndef\r\n\r\nghi").toString());
+                       "abc\r\n\r\ndef\r\n\r\nghi").toString());
                assertEquals("<p>abc</p><p>def</p><p>ghi</p><p></p>", 
Strings.toMultilineMarkup(
-                               "abc\r\n\r\ndef\r\n\r\nghi\n\n").toString());
+                       "abc\r\n\r\ndef\r\n\r\nghi\n\n").toString());
 
                assertEquals("<p>\\n</p>", 
Strings.toMultilineMarkup("\\n").toString());
                assertEquals("<p>a\\nbc</p>", 
Strings.toMultilineMarkup("a\\nbc").toString());