Extra ConfigFile test cases. Removed some superfluous conditionals in ConfigFile.

issue 1106

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

src/com/dmdirc/util/ConfigFile.java

@@ -185,7 +185,7 @@ public class ConfigFile {
                 for (String entry : flatdomains.get(domain)) {
                     lines.add("  " + escape(entry));
                 }
-            } else if (keydomains.containsKey(domain)) {
+            } else {
                 for (Map.Entry<String, String> entry : keydomains.get(domain).entrySet()) {
                     lines.add("  " + escape(entry.getKey()) + "="
                             + escape(entry.getValue()));

test/com/dmdirc/util/ConfigFileTest.java

@@ -233,5 +233,15 @@ public class ConfigFileTest extends junit.framework.TestCase {
         config.delete();
         assertFalse(file.exists());
     }
+    
+    @Test
+    public void testDuplicateKeys() throws IOException, InvalidConfigFileException {
+        final ConfigFile file = new ConfigFile(getClass().getResourceAsStream("test2.txt"));
+        file.read();
+        
+        assertTrue(file.isKeyDomain("section one"));
+        assertEquals(3, file.getKeyDomain("section one").size());
+        assertTrue(file.isFlatDomain("section one point one"));
+    }
 
 }

test/com/dmdirc/util/test3.txt

@@ -0,0 +1,25 @@
+# This is a DMDirc configuration file.
+# Written on: Mon Dec 17 23:32:19 GMT 2007
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+
+keysections:
+  section one
+
+section alpha:
+  line 1
+  line 2
+
+section one point one:
+  line 1
+
+section one:
+  1=one
+  2=two
+  3=three
+
+section one:
+
+section one point one: