Index: trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java	(revision 14689)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java	(revision 14689)
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.KeyStroke;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link Shortcut} class.
+ */
+public class ShortcutTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Test method for {@code Shortcut#makeTooltip}
+     */
+    @Test
+    public void testMakeTooltip() {
+        assertEquals("<html>Foo Bar <font size='-2'>(Shift+J)</font>&nbsp;</html>",
+                Shortcut.makeTooltip("Foo Bar", KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.SHIFT_DOWN_MASK)));
+    }
+
+}
