test: Add ConvertToHashTest fall through case

Nothing can be resolved at all.

core/java/test/junit/net/i2p/TestContext.java

@@ -1,17 +0,0 @@
-package net.i2p;
-
-public class TestContext extends I2PAppContext {
-
-    public TestContext() {
-        TestContext.setGlobalContext(this);
-    }
-
-    /**
-     * Allows overriding the existing I2PAppContext with a test context who's fields we may mock as we like
-     *
-     * @param ctx Our test context to replace the global context with
-     */
-    public static void setGlobalContext(TestContext ctx){
-        _globalAppContext = ctx;
-    }
-}

core/java/test/junit/net/i2p/util/ConvertToHashMockTest.java

@@ -1,51 +0,0 @@
-package net.i2p.util;
-
-import net.i2p.TestContext;
-import net.i2p.client.naming.NamingService;
-import net.i2p.data.Destination;
-import net.i2p.data.Hash;
-import org.junit.AfterClass;
-import org.junit.Before;
-
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import static org.mockito.Mockito.*;
-import static org.junit.Assert.*;
-
-public class ConvertToHashMockTest{
-
-    @Mock private NamingService namingService;
-    @Mock private Destination destination;
-    @Mock private Hash hash;
-
-    @InjectMocks TestContext testContext;
-
-    @Before
-    public void before() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    /**
-     * Reset the global context after all tests in the class are done.
-     *
-     * We would otherwise pollute the other tests that depend on I2PAppContext
-     */
-    @AfterClass
-    public static void afterClass(){
-        TestContext.setGlobalContext(null);
-    }
-
-    @Test
-    public void testMockedDestination() {
-        when(namingService.lookup("zzz.i2p")).thenReturn(destination);
-        when(destination.calculateHash()).thenReturn(hash);
-
-        assertSame(hash, ConvertToHash.getHash("zzz.i2p"));
-
-        verify(namingService).lookup("zzz.i2p");
-        verify(destination).calculateHash();
-    }
-}

core/java/test/junit/net/i2p/util/ConvertToHashTest.java

@@ -0,0 +1,69 @@
+package net.i2p.util;
+
+import net.i2p.data.Hash;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ConvertToHashTest {
+    private static final String zzzDotI2pBase32Hash = "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua";
+    private static final String zzzDotI2pBase64Hash = "WcI~uSICHFCVVPoufn4J7v5u~1lhxi45C60Nm43jMeg=";
+    private static final String zzzDotI2pBase64Dest = "GKapJ8koUcBj~jmQzHsTYxDg2tpfWj0xjQTzd8BhfC9c3OS5fwPBNajgF-eOD6eCjFTqTlorlh7Hnd8kXj1qblUGXT-tDoR9~YV8dmXl51cJn9MVTRrEqRWSJVXbUUz9t5Po6Xa247Vr0sJn27R4KoKP8QVj1GuH6dB3b6wTPbOamC3dkO18vkQkfZWUdRMDXk0d8AdjB0E0864nOT~J9Fpnd2pQE5uoFT6P0DqtQR2jsFvf9ME61aqLvKPPWpkgdn4z6Zkm-NJOcDz2Nv8Si7hli94E9SghMYRsdjU-knObKvxiagn84FIwcOpepxuG~kFXdD5NfsH0v6Uri3usE3XWD7Pw6P8qVYF39jUIq4OiNMwPnNYzy2N4mDMQdsdHO3LUVh~DEppOy9AAmEoHDjjJxt2BFBbGxfdpZCpENkwvmZeYUyNCCzASqTOOlNzdpne8cuesn3NDXIpNnqEE6Oe5Qm5YOJykrX~Vx~cFFT3QzDGkIjjxlFBsjUJyYkFjBQAEAAcAAA==";
+
+
+    @Test
+    public void getHashNullPeer() {
+        assertNull(ConvertToHash.getHash(null));
+    }
+
+    @Test
+    public void getHashB64() {
+        Hash hash = ConvertToHash.getHash(zzzDotI2pBase64Hash);
+        assertNotNull(hash);
+        assertEquals(hash.toBase64(), zzzDotI2pBase64Hash);
+    }
+
+    @Test
+    public void getHashB64DotI2P() {
+        Hash hash = ConvertToHash.getHash(zzzDotI2pBase64Hash + ".i2p");
+        assertNotNull(hash);
+        assertEquals(hash.toBase64(), zzzDotI2pBase64Hash);
+    }
+
+    @Test
+    public void getHashDestinationB64() {
+        Hash hash = ConvertToHash.getHash(zzzDotI2pBase64Dest);
+        assertNotNull(hash);
+        assertEquals(hash.toBase64(), zzzDotI2pBase64Hash);
+    }
+
+    @Test
+    public void getHashDestinationB64DotI2P() {
+        Hash hash = ConvertToHash.getHash(zzzDotI2pBase64Dest + ".i2p");
+        assertNotNull(hash);
+        assertEquals(hash.toBase64(), zzzDotI2pBase64Hash);
+    }
+
+    @Test
+    public void getHashB32() {
+        Hash hash = ConvertToHash.getHash(zzzDotI2pBase32Hash);
+        assertNotNull(hash);
+        assertEquals(hash.toBase32(), zzzDotI2pBase32Hash + ".b32.i2p");
+    }
+
+    @Test
+    public void getHashB32DotI2P() {
+        String zzzB32I2P = zzzDotI2pBase32Hash + ".b32.i2p";
+        Hash hash = ConvertToHash.getHash(zzzB32I2P);
+        assertNotNull(hash);
+        assertEquals(hash.toBase32(), zzzB32I2P);
+    }
+
+    /**
+     * The case where a destination cannot be resolved at all
+     */
+    @Test
+    public void getHashResolveDestinationFail() {
+        assertNull(ConvertToHash.getHash("unknown.i2p"));
+    }
+}

router/java/src/net/i2p/router/startup/WorkingDir.java

@@ -81,33 +81,22 @@ public class WorkingDir {
             String home = System.getProperty("user.home");
             if (isWindows) {
                 String appdata = System.getenv("LOCALAPPDATA");
-                if (appdata != null) {
+                if (appdata != null)
                     home = appdata;
-                }
                 // Don't mess with existing Roaming Application Data installs,
                 // in case somebody is using roaming appdata for a reason
                 // already. In new installs, use local appdata by default. -idk
                 appdata = System.getenv("APPDATA");
                 if (appdata != null) {
                     File checkOld = new File(appdata, WORKING_DIR_DEFAULT_WINDOWS);
-                    if (checkOld.exists() && checkOld.isDirectory()){
-                        File routerConfig = new File(checkOld.getAbsolutePath(), "router.config");
-                        // The Firefox profile installer was mistakenly using the Roaming application data
-                        // which is synced between devices on some Windows machines using MS cloud services,
-                        // instead of the local application data which is used by default.
-                        // It would create the router.config file in an empty directory, which the router would
-                        // then attempt to use, resulting in a router with no client applications. Checking
-                        // for clients.config.d determines if the directory is "Real" or not.
-                        File clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config.d");
-                        if (routerConfig.exists() && clientAppsConfig.exists() && clientAppsConfig.isDirectory())
-                            home = appdata;
-                    }
+                    if (checkOld.exists() && checkOld.isDirectory())
+                        home = appdata;
                 }
                 dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);
             } else if (SystemVersion.isMac()) {
                 String appdata = "/Library/Application Support/";
-                File old = new File(home,WORKING_DIR_DEFAULT);
-                if (old.exists() && old.isDirectory())
+		File old = new File(home,WORKING_DIR_DEFAULT);
+		if (old.exists() && old.isDirectory())
                     dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT);
                 else {
                     home = home+appdata;