Merge pull request google#737 from hayesjordan/unit-tests

Unit tests for Utils
aaronkim · Sep 23, 2016 · 1c174c7 · 1c174c7
2 parents d51cbde + 19afdea
commit 1c174c7
Show file tree

Hide file tree

Showing 4 changed files with 545 additions and 2 deletions.
diff --git a/android/PhysicalWeb/app/build.gradle b/android/PhysicalWeb/app/build.gradle
@@ -76,6 +76,8 @@ dependencies {
     compile 'com.android.support:appcompat-v7:24.0.0'
     compile 'com.youview:tinydnssd:1.2.7'
     compile 'org.nanohttpd:nanohttpd:2.3.0'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
 
     checkstyleRules files('config/checkstyle/checkstyle.xml')
     findbugsRules files('config/findbugs/exclude-filter.xml')

diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/Utils.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/Utils.java
@@ -205,15 +205,15 @@ public static void hideAllMenuItems(Menu menu) {
 
   /**
    * Check if URL has been favorited.
-   * @param siteUrl.
+   * @param siteUrl
    */
   public static boolean isFavorite(String siteUrl) {
     return mFavoriteUrls.contains(siteUrl);
   }
 
   /**
    * Toggles favorite status.
-   * @param siteUrl.
+   * @param siteUrl
    */
   public static void toggleFavorite(String siteUrl) {
     if (isFavorite(siteUrl)) {
@@ -506,6 +506,8 @@ public void connect(Context context) {
    */
   public static String formatEndpointForSharedPrefernces(String pwsUrl, int pwsVersion,
                                                        String apiKey) {
+    pwsUrl = pwsUrl == null ? "" : pwsUrl;
+    apiKey = apiKey == null ? "" : apiKey;
     return pwsUrl + SEPARATOR + pwsVersion + SEPARATOR + apiKey;
   }