Styliser unit tests

Change-Id: Ia66894a79e8b213a0a078a2eadbe11ad8eb7bd5c
Reviewed-on: http://gerrit.dmdirc.com/795
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -22,7 +22,6 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.harness.TestConfigManagerOptionToggle;
-import com.dmdirc.config.ConfigManager;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/ui/messages/StyliserIndicesTest.java

@@ -62,6 +62,8 @@ public class StyliserIndicesTest {
                      0, 4, "Blah"},
             {"Blah" + Styliser.CODE_COLOUR + "4,0RED blah blah",
                      4, 7, Styliser.CODE_COLOUR + "4,0RED"},
+            {"Blah" + Styliser.CODE_COLOUR + "4,0RED blah blah",
+                     5, 7, "ED"},
         };
 
         return Arrays.asList(tests);

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -156,12 +156,14 @@ public class StyliserStylesTest {
             {"Blahblah", "<>B<underline>lah<bold,underline>b<underline>lah"},
             {"Blahblah", "<>B<underline>lahb<bold>lah"},
             {"Blahblah", "<>B<underline>lahb<bold>l<>ah"},
+            {"Blahblah", "<>B<underline>l<>ahb<bold,underline>l<>ah"},
             // IRC colours
             {"4moo", "<color=255,0,0>moo"},
             {"4moo", "<color=255,0,0>m<>oo"},
             {"4moo", "<color=255,0,0>m<>oo"},
             {"20moo", "<color=255,0,0>m<>oo"}, // Colours wrap around
             {"4,4moo", "<color=255,0,0,background=255,0,0>m<>oo"},
+            {"4,4m4,4oo", "<color=255,0,0,background=255,0,0>moo"},
             // Persistant irc colours
             {"4m0oo", "<color=255,0,0>m<color=255,255,255>o<color=255,0,0>o"},
             {"4moo", "<color=255,0,0>moo"},
@@ -189,6 +191,9 @@ public class StyliserStylesTest {
             // Negation
             {"\u0012Blah4FF0000moo", "<>Blahmoo"},
             {"\u0012Blah4FF0000moo\u0012foo", "<>Blahmoo<bold>foo"},
+            {"Blah 4\u0012BlahBlah", "<>Blah <color=255,0,0>BlahBlah"}, // Stop
+            {"Blah 4\u0012BlahBlah", "<>Blah <color=255,0,0>BlahBlah"}, // Empty colour
+            {"Blah 4\u0012BlahBlah", "<>Blah <color=255,0,0>BlahBlah"}, // Empty hex colour
         };
 
         return Arrays.asList(tests);