Style fixes

Change-Id: Ifbff0f1a0d193403613a0d444443dd1c45d1acc2
Reviewed-on: http://gerrit.dmdirc.com/1334
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

test/com/dmdirc/util/ConfigFileTest.java

@@ -33,13 +33,13 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class ConfigFileTest {
-    
+
     private ConfigFile cf;
-    
+
     @Before
     public void setUp() throws Exception {
         cf = new ConfigFile(getClass().getResourceAsStream("test2.txt"));
-    }    
+    }
 
     @Test
     public void testRead() throws IOException, InvalidConfigFileException {
@@ -50,7 +50,7 @@ public class ConfigFileTest {
     public void testWrite() throws IOException {
         cf.write();
     }
-    
+
     @Test
     public void testDomains() throws IOException, InvalidConfigFileException {
         cf.read();
@@ -60,7 +60,7 @@ public class ConfigFileTest {
         assertTrue(cf.hasDomain("section one"));
         assertFalse(cf.hasDomain("random domain"));
     }
-    
+
     @Test
     public void testKeyDomains() throws IOException, InvalidConfigFileException {
         cf.read();
@@ -68,7 +68,7 @@ public class ConfigFileTest {
         assertFalse(cf.isKeyDomain("section one point one"));
         assertFalse(cf.isKeyDomain("section two"));
     }
-    
+
     @Test
     public void testFlatDomains() throws IOException, InvalidConfigFileException {
         cf.read();
@@ -76,9 +76,9 @@ public class ConfigFileTest {
         assertTrue(cf.isFlatDomain("section alpha"));
         assertTrue(cf.isFlatDomain("section one point one"));
         assertFalse(cf.isFlatDomain("section one"));
-        assertFalse(cf.hasDomain("random domain"));        
+        assertFalse(cf.hasDomain("random domain"));
     }
-    
+
     @Test
     public void testFlatDomainContents() throws IOException, InvalidConfigFileException {
         cf.read();
@@ -86,7 +86,7 @@ public class ConfigFileTest {
         assertEquals("line 1", cf.getFlatDomain("section alpha").get(0));
         assertEquals("line 2", cf.getFlatDomain("section alpha").get(1));
     }
-    
+
     @Test
     public void testKeyDomainContents() throws IOException, InvalidConfigFileException {
         cf.read();
@@ -95,7 +95,7 @@ public class ConfigFileTest {
         assertEquals("two", cf.getKeyDomain("section one").get("2"));
         assertEquals("three", cf.getKeyDomain("section one").get("3"));
     }
-    
+
     @Test
     public void testColons() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
@@ -106,17 +106,17 @@ public class ConfigFileTest {
         data.put("test3", "hello:");
         config.addDomain("test", data);
         config.write();
-        
+
         config = new ConfigFile(file);
         config.read();
-        
+
         assertTrue(config.isKeyDomain("test"));
         data = config.getKeyDomain("test");
         assertEquals("hello", data.get("test1"));
         assertEquals("hello", data.get("test:2"));
         assertEquals("hello:", data.get("test3"));
     }
-    
+
     @Test
     public void testEquals() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
@@ -127,17 +127,17 @@ public class ConfigFileTest {
         data.put("test3", "hello=");
         config.addDomain("test", data);
         config.write();
-        
+
         config = new ConfigFile(file);
         config.read();
-        
+
         assertTrue(config.isKeyDomain("test"));
         data = config.getKeyDomain("test");
         assertEquals("hello", data.get("test1"));
         assertEquals("hello", data.get("test=2"));
         assertEquals("hello=", data.get("test3"));
     }
-    
+
     @Test
     public void testNewlines() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
@@ -149,10 +149,10 @@ public class ConfigFileTest {
         data.put("test4", "hello\r\ngoodbye");
         config.addDomain("test", data);
         config.write();
-        
+
         config = new ConfigFile(file);
         config.read();
-        
+
         assertTrue(config.isKeyDomain("test"));
         data = config.getKeyDomain("test");
         assertEquals("hello", data.get("test1"));
@@ -160,7 +160,7 @@ public class ConfigFileTest {
         assertEquals("hello\n", data.get("test3"));
         assertEquals("hello\r\ngoodbye", data.get("test4"));
     }
-    
+
     @Test
     public void testBackslash() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
@@ -171,17 +171,17 @@ public class ConfigFileTest {
         data.put("test3\\", "hello");
         config.addDomain("test", data);
         config.write();
-        
+
         config = new ConfigFile(file);
         config.read();
-        
+
         assertTrue(config.isKeyDomain("test"));
         data = config.getKeyDomain("test");
         assertEquals("hello\\", data.get("test1"));
         assertEquals("\\nhello", data.get("test2"));
         assertEquals("hello", data.get("test3\\"));
     }
-    
+
     @Test
     public void testHash() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
@@ -192,30 +192,30 @@ public class ConfigFileTest {
         data.put("test3", "#hello");
         config.addDomain("test", data);
         config.write();
-        
+
         config = new ConfigFile(file);
         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=:";
         final String output = "blah blah\\\\foo\\r\\nbar\\=\\:";
         assertEquals(output, ConfigFile.escape(input));
     }
-    
+
     @Test
     public void testUnescape() {
         final String input = "blah blah\\foo\r\nbar=:";
         assertEquals(input, ConfigFile.unescape(ConfigFile.escape(input)));
     }
-    
+
     @Test
     public void testDelete() throws IOException {
         final File file = File.createTempFile("DMDirc_unittest", null);
@@ -225,12 +225,12 @@ public class ConfigFileTest {
         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/MapListTest.java

@@ -39,7 +39,7 @@ public class MapListTest {
         test.removeFromAll("b");
         assertTrue(test.isEmpty());
     }
-    
+
     @Test
     public void testAddCollection() {
         final MapList<String, String> test = new MapList<String, String>();
@@ -47,12 +47,12 @@ public class MapListTest {
         testList.add("d");
         testList.add("e");
         test.add("key", testList);
-        
+
         assertTrue(test.containsKey("key"));
         assertTrue(test.containsValue("key", "d"));
         assertTrue(test.containsValue("key", "e"));
     }
-    
+
     @Test
     public void testClear() {
         final MapList<String, String> test = new MapList<String, String>();
@@ -61,7 +61,7 @@ public class MapListTest {
         test.clear();
         assertTrue(test.isEmpty());
     }
-    
+
     @Test
     public void testClearKey() {
         final MapList<String, String> test = new MapList<String, String>();
@@ -71,24 +71,24 @@ public class MapListTest {
         assertTrue(test.values("a").isEmpty());
         assertFalse(test.isEmpty());
     }
-    
+
     @Test
     public void testRemove() {
         final MapList<String, String> test = new MapList<String, String>();
         test.add("a", "b");
         test.add("d", "e");
         test.remove("z", "b");
-        
+
         assertEquals(2, test.keySet().size());
         assertEquals(1, test.values("a").size());
         assertEquals(1, test.values("d").size());
-        
+
         test.remove("a", "b");
         assertEquals(2, test.keySet().size());
         assertEquals(0, test.values("a").size());
-        assertEquals(1, test.values("d").size());        
-    }    
-    
+        assertEquals(1, test.values("d").size());
+    }
+
     @Test
     public void testKeySet() {
         final MapList<String, String> test = new MapList<String, String>();
@@ -97,7 +97,7 @@ public class MapListTest {
         assertEquals(2, test.keySet().size());
         assertTrue(test.keySet().contains("a"));
         assertTrue(test.keySet().contains("d"));
-    }    
+    }
 
     @Test
     public void testContainsKey() {
@@ -121,26 +121,26 @@ public class MapListTest {
         assertEquals("b", test.get("a").get(0));
         assertEquals("b", test.get("a", 0));
     }
-    
+
     @Test
     public void testInherit() {
         final MapList<String, String> test1 = new MapList<String, String>();
         test1.add("a", "b");
-        
+
         final MapList<String, String> test2 = new MapList<String, String>(test1);
         assertEquals(1, test2.get("a").size());
         assertEquals("b", test2.get("a").get(0));
-        assertEquals("b", test2.get("a", 0));        
+        assertEquals("b", test2.get("a", 0));
     }
-    
+
     @Test
     public void testGetMap() {
         final MapList<String, String> test1 = new MapList<String, String>();
         test1.add("a", "b");
         assertNotSame(test1.getMap(), test1.getMap());
-        
+
         final MapList<String, String> test2 = new MapList<String, String>(test1);
         assertEquals(test1.getMap(), test2.getMap());
-    }    
+    }
 
 }