ConfigFile now escapes #

git-svn-id: http://svn.dmdirc.com/trunk@3789 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/util/ConfigFile.java

@@ -293,14 +293,15 @@ public class ConfigFile {
     
     /**
      * Escapes the specified input string by prefixing all occurances of
-     * \, \n, \r, = and : with backslashes.
+     * \, \n, \r, =, # and : with backslashes.
      * 
      * @param input The string to be escaped
      * @return A backslash-armoured version of the string
      */
     protected static String escape(final String input) {
         return input.replaceAll("\\\\", "\\\\\\\\").replaceAll("\n", "\\\\n")
-                .replaceAll("\r", "\\\\r").replaceAll("=", "\\\\=").replaceAll(":", "\\\\:");
+                .replaceAll("\r", "\\\\r").replaceAll("=", "\\\\=")
+                .replaceAll(":", "\\\\:").replaceAll("#", "\\\\#");
     }
     
     /**

test/com/dmdirc/util/ConfigFileTest.java

@@ -190,6 +190,27 @@ public class ConfigFileTest extends junit.framework.TestCase {
         assertEquals("hello", data.get("test3\\"));
     }
     
+    @Test
+    public void testHash() throws IOException, InvalidConfigFileException {
+        final File file = File.createTempFile("DMDirc.unittest", null);
+        ConfigFile config = new ConfigFile(file.toURI());
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("test1#", "hello");
+        data.put("#test2", "hello");
+        data.put("test3", "#hello");
+        config.addDomain("test", data);
+        config.write();
+        
+        config = new ConfigFile(file.toURI());
+        config.read();
+        
+        assertTrue(config.isKeyDomain("test"));
+        data = config.getKeyDomain("test");
+        assertEquals("hello", data.get("test1#"));
+        assertEquals("hello", data.get("#test2"));
+        assertEquals("#hello", data.get("test3"));
+    }    
+    
     @Test
     public void testEscape() {
         final String input = "blah blah\\foo\r\nbar=:";