From 38a2a5f425d31916427550ec038dcff569d339e4 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Mon, 3 Apr 2017 11:42:17 -0700 Subject: [PATCH] Fix a unit test regression. This fixes a StorageSettingsTest regression where the percentage was no longer being formatted correctly for the test. Change-Id: I71e03926ad8b3691cebc26aea11e8557c2ba0fea Fixes: 36858638 Test: Settings Robotest --- .../settings/deviceinfo/StorageSettingsTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java index 84d3b98e2bd..95f9fbe28fe 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import android.app.Activity; +import android.app.usage.StorageStatsManager; import android.icu.text.NumberFormat; import android.os.storage.VolumeInfo; import android.text.format.Formatter; @@ -40,6 +41,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -73,9 +75,14 @@ public class StorageSettingsTest { final SummaryLoader.SummaryProvider provider = StorageSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader); final VolumeInfo volumeInfo = mVolumes.get(0); + when(volumeInfo.isMountedReadable()).thenReturn(true); when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE); - when(volumeInfo.getPath().getTotalSpace()).thenReturn(500L); - when(volumeInfo.getPath().getFreeSpace()).thenReturn(0L); + when(mStorageManagerVolumeProvider.getTotalBytes( + any(StorageStatsManager.class), any(VolumeInfo.class))) + .thenReturn(500L); + when(mStorageManagerVolumeProvider.getFreeBytes( + any(StorageStatsManager.class), any(VolumeInfo.class))) + .thenReturn(0L); ReflectionHelpers.setField( provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);