Formatter unit tests

Fix NPE when formatting unused null references

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

src/com/dmdirc/ui/messages/Formatter.java

@@ -111,11 +111,11 @@ public final class Formatter {
             switch (chr) {
             case 'b': case 'B': case 'h': case 'H': case 's': case 'S':
                 // General (strings)
-                res[i] = args[i].toString();
+                res[i] = String.valueOf(args[i]);
                 break;
             case 'c': case 'C':
                 // Character
-                res[i] = ((String) args[i]).charAt(0);
+                res[i] = String.valueOf(args[i]).charAt(0);
                 break;
             case 'd': case 'o': case 'x': case 'X':
                 // Integers
@@ -136,7 +136,7 @@ public final class Formatter {
                 break;
             case 'u':
                 // Duration hacks
-                res[i] = formatDuration(Integer.valueOf(args[i].toString()));
+                res[i] = formatDuration(Integer.valueOf(String.valueOf(args[i].toString())));
                 break;
             default:
                 res[i] = args[i];

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

@@ -47,7 +47,51 @@ public class FormatterTest extends junit.framework.TestCase {
         assertEquals("10", Formatter.formatMessage(mcm, "1%1$d", "10"));
         assertEquals("111999", Formatter.formatMessage(mcm, "1%1$s", "111999"));
     }
-
+    
+    @Test
+    public void testCaching() {
+        try {
+            assertEquals("H", Formatter.formatMessage(mcm, "1%1$C", "Hello!"));
+            assertEquals("H", Formatter.formatMessage(mcm, "1%1$C", "Hello!", 123, null));
+            assertEquals("HELLO!", Formatter.formatMessage(mcm, "1%1$S", "Hello!", 123, null));
+            assertEquals("HELLO!", Formatter.formatMessage(mcm, "1%1$S", "Hello!"));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testFormatDuration() {
+        assertEquals("1 minute, 1 second", Formatter.formatMessage(mcm, "1%1$u", "61"));
+    }
+    
+    @Test
+    public void testFormatDurationSeconds() {
+        assertEquals("1 second", Formatter.formatDuration(1));
+        assertEquals("2 seconds", Formatter.formatDuration(2));
+    }
+    
+    @Test
+    public void testFormatDurationMinutes() {
+        assertEquals("1 minute", Formatter.formatDuration(60));
+        assertEquals("1 minute, 1 second", Formatter.formatDuration(61));
+        assertEquals("1 minute, 2 seconds", Formatter.formatDuration(62));
+        assertEquals("2 minutes, 2 seconds", Formatter.formatDuration(122));
+    }
+    
+    @Test
+    public void testFormatDurationHours() {
+        assertEquals("1 hour", Formatter.formatDuration(3600));
+        assertEquals("1 hour, 1 second", Formatter.formatDuration(3601));
+        assertEquals("2 hours, 1 minute, 5 seconds", Formatter.formatDuration(7265));
+    }
+    
+    @Test
+    public void testFormatDurationDays() {
+        assertEquals("1 day", Formatter.formatDuration(86400));
+        assertEquals("1 day, 10 minutes, 1 second", Formatter.formatDuration(87001));
+    }
 
     private class MyConfigManager extends ConfigManager {