[xwiki-notifications] r7496 - in xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src: main/java/com/xpn/xwiki test/java/com/xpn/xwiki

[SVN]

Author: jvdrean
Date: 2008-02-11 15:57:41 +0100 (Mon, 11 Feb 2008)
New Revision: 7496

Modified:
   
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
   
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/test/java/com/xpn/xwiki/XWikiTest.java
Log:
XWIKI-2101 : XWiki.clearName strips dots when using ascii option even if 
stripDots option is set to false

Modified: 
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- 
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
       2008-02-11 13:06:42 UTC (rev 7495)
+++ 
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
       2008-02-11 14:57:41 UTC (rev 7496)
@@ -5429,7 +5429,7 @@
         }
 
         if (ascii) {
-            name = name.replaceAll("[^a-zA-Z0-9\\-_]", "");
+            name = name.replaceAll("[^a-zA-Z0-9\\-_\\.]", "");
         }
 
         if (name.length() > 250)

Modified: 
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/test/java/com/xpn/xwiki/XWikiTest.java
===================================================================
--- 
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/test/java/com/xpn/xwiki/XWikiTest.java
   2008-02-11 13:06:42 UTC (rev 7495)
+++ 
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/test/java/com/xpn/xwiki/XWikiTest.java
   2008-02-11 14:57:41 UTC (rev 7496)
@@ -142,4 +142,28 @@
 
         assertTrue(copy.getCreationDate().equals(sourceCreationDate));
     }
+
+    public void testClearNameWithoutStripDotsWithoutAscii() {
+        String name = "O�&&{{.txt";
+        name = this.xwiki.clearName(name, false, false, context);
+        assertTrue(name.equals("Oe&&{{.txt"));
+    }
+
+    public void testClearNameWithoutStripDotsWithAscii() {
+        String name = "O�&&{{.txt";
+        name = this.xwiki.clearName(name, false, true, context);
+        assertTrue(name.equals("Oe.txt"));
+    }
+
+    public void testClearNameWithStripDotsWithoutAscii() {
+        String name = "O�&&{{.txt";
+        name = this.xwiki.clearName(name, true, false, context);
+        assertTrue(name.equals("Oe&&{{txt"));
+    }
+
+    public void testClearNameWithStripDotsWithAscii() {
+        String name = "O�&&{{.txt";
+        name = this.xwiki.clearName(name, true, true, context);
+        assertTrue(name.equals("Oetxt"));
+    }
 }


_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications