Skip to content
Snippets Groups Projects
Unverified Commit 5a7d5aaf authored by mueller-ma's avatar mueller-ma Committed by GitHub
Browse files
parent f81c90fd
No related branches found
No related tags found
No related merge requests found
......@@ -425,8 +425,8 @@ public class OpenHABPreferencesActivity extends AppCompatActivity {
pref.setSummary(summary);
}
private static String beautifyUrl(String url) {
return url.contains("myopenhab.org") ? "myopenHAB" : url;
public static @Nullable String beautifyUrl(@Nullable String url) {
return url != null && url.contains("myopenhab.org") ? "myopenHAB" : url;
}
}
......
......@@ -10,8 +10,10 @@ package org.openhab.habdroid.ui;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.openhab.habdroid.ui.OpenHABPreferencesActivity.AbstractSettingsFragment.isWeakPassword;
import static org.openhab.habdroid.ui.OpenHABPreferencesActivity.MainSettingsFragment.beautifyUrl;
public class OpenHABPreferencesActivityTest {
@Test
......@@ -25,4 +27,14 @@ public class OpenHABPreferencesActivityTest {
assertTrue(!isWeakPassword("Mb2.r5oHf-0t"));
assertTrue(!isWeakPassword("abcdefg1+"));
}
@Test
public void testBeautifyUrl() {
assertEquals("abc", beautifyUrl("abc"));
assertEquals("", beautifyUrl(""));
assertEquals("myopenHAB", beautifyUrl("myopenhab.org"));
assertEquals("myopenHAB", beautifyUrl("home.myopenhab.org"));
assertEquals("myopenhab.WRONG_TLD", beautifyUrl("myopenhab.WRONG_TLD"));
assertEquals(null, beautifyUrl(null));
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment