Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java	(revision 10337)
+++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java	(revision 10337)
@@ -0,0 +1,145 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+
+/**
+ * Unit tests of {@link PlatformHookOsx} class.
+ */
+public class PlatformHookOsxTest {
+
+    static PlatformHookOsx hook;
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+        hook = new PlatformHookOsx();
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#startupHook}
+     */
+    @Test
+    public void testStartupHook()  {
+        hook.startupHook();
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#setupHttpsCertificate}
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testSetupHttpsCertificate() throws Exception {
+        assertFalse(hook.setupHttpsCertificate(null, null));
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#afterPrefStartupHook}
+     */
+    @Test
+    public void testAfterPrefStartupHook() {
+        hook.afterPrefStartupHook();
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#openUrl}
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testOpenUrl() throws IOException {
+        if (Main.isPlatformOsx()) {
+            hook.openUrl(Main.getJOSMWebsite());
+        } else {
+            try {
+                hook.openUrl(Main.getJOSMWebsite());
+                fail("Expected IOException");
+            } catch (IOException e) {
+                Main.info(e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#getAdditionalFonts}
+     */
+    @Test(expected = UnsupportedOperationException.class)
+    public void testGetAdditionalFonts() {
+        hook.getAdditionalFonts();
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#getDefaultCacheDirectory}
+     */
+    @Test
+    public void testGetDefaultCacheDirectory() {
+        File cache = hook.getDefaultCacheDirectory();
+        assertNotNull(cache);
+        if (Main.isPlatformOsx()) {
+            assertTrue(cache.toString().contains("/Library/"));
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#getDefaultPrefDirectory}
+     */
+    @Test
+    public void testGetDefaultPrefDirectory() {
+        File cache = hook.getDefaultPrefDirectory();
+        assertNotNull(cache);
+        if (Main.isPlatformOsx()) {
+            assertTrue(cache.toString().contains("/Library/"));
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#getDefaultStyle}
+     */
+    @Test
+    public void testGetDefaultStyle() {
+        assertEquals("com.apple.laf.AquaLookAndFeel", hook.getDefaultStyle());
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#getInstalledFonts}
+     */
+    @Test(expected = UnsupportedOperationException.class)
+    public void testGetInstalledFonts() {
+        hook.getInstalledFonts();
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#getOSDescription}
+     */
+    @Test
+    public void testGetOSDescription() {
+        String os = hook.getOSDescription();
+        if (Main.isPlatformOsx()) {
+            assertTrue(os.contains("Mac"));
+        } else {
+            assertFalse(os.contains("Mac"));
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookOsx#initSystemShortcuts}
+     */
+    @Test
+    public void testInitSystemShortcuts() {
+        hook.initSystemShortcuts();
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java	(revision 10337)
+++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java	(revision 10337)
@@ -0,0 +1,203 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStore.TrustedCertificateEntry;
+import java.security.KeyStoreException;
+import java.util.Collection;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.remotecontrol.RemoteControlHttpsServer;
+
+/**
+ * Unit tests of {@link PlatformHookWindows} class.
+ */
+public class PlatformHookWindowsTest {
+
+    static PlatformHookWindows hook;
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+        hook = new PlatformHookWindows();
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#startupHook}
+     */
+    @Test
+    public void testStartupHook()  {
+        hook.startupHook();
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getRootKeystore}
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testGetRootKeystore() throws Exception {
+        if (Main.isPlatformWindows()) {
+            assertNotNull(PlatformHookWindows.getRootKeystore());
+        } else {
+            try {
+                PlatformHookWindows.getRootKeystore();
+                fail("Expected KeyStoreException");
+            } catch (KeyStoreException e) {
+                Main.info(e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#removeInsecureCertificates}
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testRemoveInsecureCertificates() throws Exception {
+        if (Main.isPlatformWindows()) {
+            PlatformHookWindows.removeInsecureCertificates();
+        } else {
+            try {
+                PlatformHookWindows.removeInsecureCertificates();
+                fail("Expected KeyStoreException");
+            } catch (KeyStoreException e) {
+                Main.info(e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#setupHttpsCertificate}
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testSetupHttpsCertificate() throws Exception {
+        KeyStore ks = RemoteControlHttpsServer.loadJosmKeystore();
+        TrustedCertificateEntry trustedCert = new KeyStore.TrustedCertificateEntry(ks.getCertificate(ks.aliases().nextElement()));
+        if (Main.isPlatformWindows()) {
+            hook.setupHttpsCertificate(RemoteControlHttpsServer.ENTRY_ALIAS, trustedCert);
+        } else {
+            try {
+                hook.setupHttpsCertificate(RemoteControlHttpsServer.ENTRY_ALIAS, trustedCert);
+                fail("Expected KeyStoreException");
+            } catch (KeyStoreException e) {
+                Main.info(e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#afterPrefStartupHook}
+     */
+    @Test
+    public void testAfterPrefStartupHook() {
+        hook.afterPrefStartupHook();
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#openUrl}
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testOpenUrl() throws IOException {
+        if (Main.isPlatformWindows()) {
+            hook.openUrl(Main.getJOSMWebsite());
+        } else {
+            try {
+                hook.openUrl(Main.getJOSMWebsite());
+                fail("Expected IOException");
+            } catch (IOException e) {
+                Main.info(e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getAdditionalFonts}
+     */
+    @Test
+    public void testGetAdditionalFonts() {
+        assertFalse(hook.getAdditionalFonts().isEmpty());
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getDefaultCacheDirectory}
+     */
+    @Test
+    public void testGetDefaultCacheDirectory() {
+        File cache = hook.getDefaultCacheDirectory();
+        assertNotNull(cache);
+        if (Main.isPlatformWindows()) {
+            assertTrue(cache.toString().contains(":"));
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getDefaultPrefDirectory}
+     */
+    @Test
+    public void testGetDefaultPrefDirectory() {
+        File cache = hook.getDefaultPrefDirectory();
+        assertNotNull(cache);
+        if (Main.isPlatformWindows()) {
+            assertTrue(cache.toString().contains(":"));
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getDefaultStyle}
+     */
+    @Test
+    public void testGetDefaultStyle() {
+        assertEquals("com.sun.java.swing.plaf.windows.WindowsLookAndFeel", hook.getDefaultStyle());
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getInstalledFonts}
+     */
+    @Test
+    public void testGetInstalledFonts() {
+        Collection<String> fonts = hook.getInstalledFonts();
+        if (Main.isPlatformWindows()) {
+            assertFalse(fonts.isEmpty());
+        } else {
+            assertNull(fonts);
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#getOSDescription}
+     */
+    @Test
+    public void testGetOSDescription() {
+        String os = hook.getOSDescription();
+        if (Main.isPlatformWindows()) {
+            assertTrue(os.contains("Windows"));
+        } else {
+            assertFalse(os.contains("Windows"));
+        }
+    }
+
+    /**
+     * Test method for {@code PlatformHookWindows#initSystemShortcuts}
+     */
+    @Test
+    public void testInitSystemShortcuts() {
+        hook.initSystemShortcuts();
+    }
+}