Fix unit test.

Fix hand written YAML being rubbish.
Fix bad reading caused by bad YAML.
Generify asList casting.

src/com/dmdirc/config/profiles/YamlProfileStore.java

@@ -50,6 +50,7 @@ import static com.dmdirc.util.YamlReaderUtils.asList;
 import static com.dmdirc.util.YamlReaderUtils.asMap;
 import static com.dmdirc.util.YamlReaderUtils.optionalString;
 import static com.dmdirc.util.YamlReaderUtils.requiredString;
+import static com.dmdirc.util.YamlReaderUtils.uncheckedCast;
 
 /**
  * Store that reads and writes profiles from a YAML file on disk.
@@ -118,8 +119,7 @@ public class YamlProfileStore implements ProfileStore {
                 final String name = requiredString(map, "name");
                 final String realname = requiredString(map, "realname");
                 final Optional<String> ident = Optional.ofNullable(optionalString(map, "ident"));
-                final List<String> nicknames = Splitter.on('\n')
-                        .splitToList(requiredString(map, "nicknames"));
+                final List<String> nicknames = uncheckedCast(asList(map.get("nicknames")));
                 res.add(new Profile(name, realname, ident, nicknames));
             } catch (IllegalArgumentException ex) {
                 LOG.info("Unable to read alias", ex);
@@ -144,7 +144,7 @@ public class YamlProfileStore implements ProfileStore {
             if (profile.getIdent().isPresent()) {
                 map.put("ident", profile.getIdent().get());
             }
-            map.put("nicknames", profile.getNicknames());
+            map.put("nicknames", profile.getNicknames().toArray());
             res.add(map);
         }
         return res;

src/com/dmdirc/util/YamlReaderUtils.java

@@ -63,8 +63,8 @@ public final class YamlReaderUtils {
      * @return A usable object list.
      */
     @SuppressWarnings("unchecked")
-    public static List<Object> uncheckedCast(final List<?> list) {
-        return (List<Object>) list;
+    public static <T> List<T> uncheckedCast(final List<?> list) {
+        return (List<T>) list;
     }
 
     /**

test-res/com/dmdirc/config/profiles/profiles.yml

@@ -1,10 +1,15 @@
 - name: profile1
   realname: realname1
-  nicknames: nickname1, nickname2
+  nicknames:
+    - nickname1
+    - nickname2
 - name: profile2
   realname: realname2
-  nicknames: nickname1, nickname3
+  nicknames:
+    - nickname1
+    - nickname3
   ident: ident2
 - name: profile3
-  realname: profile3
-  nicknames: nickname3
+  realname: realname3
+  nicknames:
+    - nickname3

test/com/dmdirc/config/profiles/YamlProfileStoreTest.java

@@ -27,6 +27,8 @@ import com.google.common.collect.Sets;
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -61,7 +63,7 @@ public class YamlProfileStoreTest {
     }
 
     @Test
-    public void testReadProfiles() throws Exception {
+    public void testReadProfiles() throws URISyntaxException {
         final ProfileStore store = new YamlProfileStore(Paths.get(getClass()
                 .getResource("profiles.yml").toURI()));
         final Collection<Profile> profiles = store.readProfiles();
@@ -73,12 +75,14 @@ public class YamlProfileStoreTest {
     }
 
     @Test
-    public void testWriteProfiles() throws Exception {
+    public void testWriteProfiles() throws IOException {
         try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) {
             final ProfileStore store = new YamlProfileStore(fs.getPath("/")
                     .resolve("profiles.yml"));
             final List<Profile> profiles = Lists.newArrayList(profile1, profile2, profile3);
             store.writeProfiles(profiles);
+            System.out.println(Files.readAllLines(fs.getPath("/")
+                    .resolve("profiles.yml")));
             final Collection<Profile> readProfiles = store.readProfiles();
             assertEquals(3, readProfiles.size());
             assertTrue(readProfiles.contains(profile1));