Support for IRC control codes.

The following IRC control codes are now supported:
* Bold
* Italics
* Underline
* Normal (clears all outstanding codes)
* Color (foreground and background)
* 16 colors (00 up to and including 15)

3 files changed, 184 insertions, 14 deletions

diff --git a/test/net/java/sip/communicator/impl/protocol/irc/ColorTest.java b/test/net/java/sip/communicator/impl/protocol/irc/ColorTest.java
new file mode 100644
index 0000000..aaa2572
--- /dev/null
+++ b/test/net/java/sip/communicator/impl/protocol/irc/ColorTest.java
@@ -0,0 +1,31 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.protocol.irc;
+
+import junit.framework.*;
+
+/**
+ * @author Danny van Heumen
+ */
+public class ColorTest
+    extends TestCase
+{
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+
+    public void testHtmlRepresentation()
+    {
+        Assert.assertEquals("White", Color.WHITE.getHtml());
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+}
diff --git a/test/net/java/sip/communicator/impl/protocol/irc/ControlCharTest.java b/test/net/java/sip/communicator/impl/protocol/irc/ControlCharTest.java
new file mode 100644
index 0000000..475b705
--- /dev/null
+++ b/test/net/java/sip/communicator/impl/protocol/irc/ControlCharTest.java
@@ -0,0 +1,52 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.protocol.irc;
+
+import junit.framework.*;
+
+/**
+ * @author Danny van Heumen
+ */
+public class ControlCharTest
+    extends TestCase
+{
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    public void testFindByControlCharUnknown()
+    {
+        Assert.assertNull(ControlChar.byCode(' '));
+    }
+
+    public void testFindByControlCharBold()
+    {
+        Assert.assertSame(ControlChar.BOLD, ControlChar.byCode('\u0002'));
+    }
+
+    public void testGetHtmlStartSimple()
+    {
+        Assert.assertEquals("<b>", ControlChar.BOLD.getHtmlStart());
+    }
+
+    public void testGetHtmlStartAdvanced()
+    {
+        Assert.assertEquals("<b bla=\"foo\">",
+            ControlChar.BOLD.getHtmlStart("bla=\"foo\""));
+    }
+
+    public void testGetHtmlEnd()
+    {
+        Assert.assertEquals("</b>", ControlChar.BOLD.getHtmlEnd());
+    }
+}
diff --git a/test/net/java/sip/communicator/impl/protocol/irc/UtilsTest.java b/test/net/java/sip/communicator/impl/protocol/irc/UtilsTest.java
index 0d61313..283891e 100644
--- a/test/net/java/sip/communicator/impl/protocol/irc/UtilsTest.java
+++ b/test/net/java/sip/communicator/impl/protocol/irc/UtilsTest.java
@@ -1,7 +1,15 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
 package net.java.sip.communicator.impl.protocol.irc;
 
 import junit.framework.*;
 
+/**
+ * @author Danny van Heumen
+ */
 public class UtilsTest
     extends TestCase
 {
@@ -10,7 +18,7 @@ public class UtilsTest
     {
         super.setUp();
     }
-    
+
     protected void tearDown() throws Exception
     {
         super.tearDown();
@@ -20,50 +28,129 @@ public class UtilsTest
     {
         Assert.assertEquals(null, Utils.parse(null));
     }
-    
+
     public void testParseEmptyString()
     {
         Assert.assertEquals("", Utils.parse(""));
     }
-    
+
     public void testParseStringWithoutControlCodes()
     {
         final String message = "My normal message without any control codes.";
         Assert.assertEquals(message, Utils.parse(message));
     }
-    
+
     public void testParseStringWithBoldCode()
     {
-        final String ircMessage = "My \u0002bold\u0002 message.";
-        final String htmlMessage = "My <b>bold</b> message.";
+        final String ircMessage =
+            "My \u0002bold\u0002 message \u0002BOLD!\u0002.";
+        final String htmlMessage = "My <b>bold</b> message <b>BOLD!</b>.";
         Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
     }
-    
+
     public void testParseStringWithItalicsCode()
     {
-        final String ircMessage = "My \u001Ditalics\u001D message.";
-        final String htmlMessage = "My <i>italics</i> message.";
+        final String ircMessage =
+            "My \u001Ditalics\u001D message \u001DITALICS!\u001D.";
+        final String htmlMessage = "My <i>italics</i> message <i>ITALICS!</i>.";
         Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
     }
 
     public void testParseStringWithUnderlineCode()
     {
-        final String ircMessage = "My \u001Funderlined\u001F message.";
-        final String htmlMessage = "My <u>italics</u> message.";
+        final String ircMessage =
+            "My \u001Funderlined\u001F message \u001FUNDERLINED!!!\u001F.";
+        final String htmlMessage =
+            "My <u>underlined</u> message <u>UNDERLINED!!!</u>.";
         Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
     }
 
     public void testParseStringWithForegroundColorCode()
     {
         final String ircMessage = "My \u000304RED\u0003 message.";
-        final String htmlMessage = "My <font color=\"red\">RED</font> message.";
+        final String htmlMessage = "My <font color=\"Red\">RED</font> message.";
         Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
     }
 
     public void testParseStringWithForegroundAndBackgroundColorCode()
     {
-        final String ircMessage = "My \u000304,12RED on Light Blue\u0003 message.";
-        final String htmlMessage = "My <font color=\"red\" bgcolor=\"lightblue\">RED on Light Blue</font> message.";
+        final String ircMessage =
+            "My \u000304,12RED on Light Blue\u0003 message.";
+        final String htmlMessage =
+            "My <font color=\"Red\" bgcolor=\"RoyalBlue\">RED on Light Blue</font> message.";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseStringWithInvalidBgColorCode()
+    {
+        final String ircMessage =
+            "My \u000304,BRIGHT RED on Light Blue\u0003 message.";
+        final String htmlMessage =
+            "My <font color=\"Red\">,BRIGHT RED on Light Blue</font> message.";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseStringWithInvalidColorControlCode()
+    {
+        final String ircMessage =
+            "My \u0003BRIGHT RED on Light Blue\u0003 message.";
+        final String htmlMessage =
+            "My <font>BRIGHT RED on Light Blue</font> message.";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseStringWithInvalidSecondControlCode()
+    {
+        final String ircMessage =
+            "My \u000304,12RED on Light Blue\u000304,12 message.";
+        final String htmlMessage =
+            "My <font color=\"Red\" bgcolor=\"RoyalBlue\">RED on Light Blue</font>04,12 message.";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseStringWithIncompleteForegroundColorControlCode()
+    {
+        final String ircMessage = "My \u0003";
+        final String htmlMessage = "My <font>";
+        Assert.assertTrue(Utils.parse(ircMessage).startsWith(htmlMessage));
+    }
+
+    public void testParseStringWithIncompleteBackgroundColorControlCode()
+    {
+        final String ircMessage = "My \u000310,";
+        final String htmlMessage = "My <font color=\"Teal\">,";
+        Assert.assertTrue(Utils.parse(ircMessage).startsWith(htmlMessage));
+    }
+
+    public void testParseSringAndNeutralizeWithNormalControlCode()
+    {
+        final String ircMessage =
+            "My \u0002\u001D\u001F\u000304,12RED on Light Blue\u000F message.";
+        final String htmlMessage =
+            "My <b><i><u><font color=\"Red\" bgcolor=\"RoyalBlue\">RED on Light Blue</font></u></i></b> message.";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseStringWithUnclosedFormattingI()
+    {
+        final String ircMessage =
+            "My \u0002\u001D\u001F\u000304,12RED on Light Blue message.";
+        final String htmlMessage =
+            "My <b><i><u><font color=\"Red\" bgcolor=\"RoyalBlue\">RED on Light Blue message.</font></u></i></b>";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseUnknownForegroundColor()
+    {
+        final String ircMessage = "\u000399TEST";
+        final String htmlMessage = "<font>99TEST</font>";
+        Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
+    }
+
+    public void testParseUnknownBackgroundCOlor()
+    {
+        final String ircMessage = "\u000300,99TEST";
+        final String htmlMessage = "<font color=\"White\">,99TEST</font>";
         Assert.assertEquals(htmlMessage, Utils.parse(ircMessage));
     }
 }