Continue Testing

Author: RHenigan

android/sdl_android/src/androidTest/AndroidManifest.xml

@@ -6,13 +6,15 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Required to check if WiFi is enabled -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    
+
     <instrumentation
     android:name="android.test.InstrumentationTestRunner"
     android:targetPackage="com.smartdevicelink.test" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    
-    <application android:debuggable="true">
+
+    <application
+        android:debuggable="true"
+        android:usesCleartextTraffic="true">
         <uses-library android:name="android.test.runner" />
     </application>
 

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java

@@ -2,16 +2,23 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 
 import com.smartdevicelink.AndroidTestCase2;
+import com.smartdevicelink.util.AndroidTools;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mockito.Mockito;
 
+import java.io.IOException;
+
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class LockScreenDeviceIconManagerTests extends AndroidTestCase2 {
 
@@ -29,7 +36,7 @@ public void tearDown() throws Exception {
         super.tearDown();
     }
 
-    public void testShouldReturnTrueWhenSharedPreferencesDoesNotExist() {
+    public void testUpdateCacheImageShouldReturnTrueWhenSharedPreferencesDoesNotExist() {
         final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
         final Context context = Mockito.mock(Context.class);
         Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
@@ -40,7 +47,7 @@ public void testShouldReturnTrueWhenSharedPreferencesDoesNotExist() {
         assertTrue(shouldUpdate);
     }
 
-    public void testShouldReturnTrueWhenUnableToReadSharedPreference() {
+    public void testUpdateCacheImageShouldReturnTrueWhenUnableToReadSharedPreference() {
         final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
         final Context context = Mockito.mock(Context.class);
         Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
@@ -52,7 +59,7 @@ public void testShouldReturnTrueWhenUnableToReadSharedPreference() {
         assertTrue(shouldUpdate);
     }
 
-    public void testShouldReturnTrueSharedPreferenceReturnsAnOutdatedIcon() {
+    public void testUpdateCacheImageShouldReturnTrueSharedPreferenceReturnsAnOutdatedIcon() {
         final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
         final Context context = Mockito.mock(Context.class);
         Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
@@ -63,7 +70,7 @@ public void testShouldReturnTrueSharedPreferenceReturnsAnOutdatedIcon() {
         assertTrue(shouldUpdate);
     }
 
-    public void testShouldReturnFalseWhenSharedPreferenceReturnsAnUpdatedIcon() {
+    public void testUpdateCacheImageShouldReturnFalseWhenSharedPreferenceReturnsAnUpdatedIcon() {
         final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
         final Context context = Mockito.mock(Context.class);
         Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
@@ -74,6 +81,58 @@ public void testShouldReturnFalseWhenSharedPreferenceReturnsAnUpdatedIcon() {
         assertFalse(shouldUpdate);
     }
 
+    public void testSaveFileToCacheShouldReturnBeforeWritingSharedPrefsIfSavingToCacheFails() {
+        final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
+        final SharedPreferences.Editor sharedPrefsEditor = Mockito.mock(SharedPreferences.Editor.class);
+        final Context context = Mockito.mock(Context.class);
+        Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
+        Mockito.when(sharedPrefs.edit()).thenReturn(sharedPrefsEditor);
+
+        Bitmap deviceLogo = null;
+        try {
+            deviceLogo = AndroidTools.downloadImage(ICON_URL);
+            lockScreenDeviceIconManager = new LockScreenDeviceIconManager(context);
+            lockScreenDeviceIconManager.saveFileToCache(deviceLogo, ICON_URL);
+            verify(sharedPrefs, times(0)).edit();
+            verify(sharedPrefsEditor, times(0)).putString(anyString(), anyString());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //TODO Add Test For Passing saveFileToCache
+
+    public void testGetFileFromCacheShouldReturnNullIfFailedToGetSystemPref() {
+        final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
+        final Context context = Mockito.mock(Context.class);
+        Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
+        Mockito.when(sharedPrefs.getString(anyString(), (String) isNull())).thenReturn(null);
+
+        lockScreenDeviceIconManager = new LockScreenDeviceIconManager(context);
+        Bitmap cachedIcon = lockScreenDeviceIconManager.getFileFromCache(ICON_URL);
+        assertNull(cachedIcon);
+    }
+
+    public void testGetFileFromCacheShouldReturnNullIfInvalidDataFromSharedPref() {
+        final SharedPreferences sharedPrefs = Mockito.mock(SharedPreferences.class);
+        final SharedPreferences.Editor sharedPrefsEditor = Mockito.mock(SharedPreferences.Editor.class);
+        final Context context = Mockito.mock(Context.class);
+        Mockito.when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(sharedPrefs);
+        Mockito.when(sharedPrefs.edit()).thenReturn(sharedPrefsEditor);
+        Mockito.when(sharedPrefsEditor.remove(anyString())).thenReturn(sharedPrefsEditor);
+        Mockito.when(sharedPrefsEditor.commit()).thenReturn(true);
+        Mockito.when(sharedPrefs.getString(anyString(), (String) isNull())).thenReturn(INVALID_JSON_STRING);
+
+
+        lockScreenDeviceIconManager = new LockScreenDeviceIconManager(context);
+        Bitmap cachedIcon = lockScreenDeviceIconManager.getFileFromCache(ICON_URL);
+        assertNull(cachedIcon);
+    }
+
+    //TODO Add test for passing getFileFromCache
+
+    //TODO Add test for failing to read file from cache
+
     private String buildJSONAsString(long DaysOld) {
         JSONObject jsonObject = new JSONObject();
         try {

android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java

@@ -79,6 +79,7 @@ void saveFileToCache(Bitmap icon, String iconUrl) {
         } catch (Exception e) {
             Log.d(TAG, "Failed to save to Icon to Cache");
             e.printStackTrace();
+            return;
         }
 
         JSONObject iconParams;