PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hook up the storage item preferences to actual data.

Browse Source 
This uses the same storage query implementation as the previous
iteration of the Storage Settings. In b/32206268, a new API for
querying this information will be added for querying this info.

Once the new API has landed, a future patch will swap out the
impl, but this should work for today.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: I58763e8ee38aabbea533bc614268288e854ff8d4
This commit is contained in:
Daniel Nishi
2017-01-09 14:49:04 -08:00
parent 8cc6f9f718
commit 884809199f
3 changed files with 203 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
View File

@@ -18,16 +18,20 @@ package com.android.settings.deviceinfo.storage;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Environment;
import android.os.UserHandle;
import android.os.storage.VolumeInfo;
import android.provider.DocumentsContract;
import android.support.v7.preference.PreferenceScreen;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import com.android.settings.R;
@@ -36,6 +40,7 @@ import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.SubSettings;
import com.android.settings.TestConfig;
import com.android.settings.applications.ManageApplications;
import com.android.settingslib.deviceinfo.StorageMeasurement;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import org.junit.Before;
@@ -44,13 +49,22 @@ import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.HashMap;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageItemPreferenceControllerTest {
/**
* In O, this will change to 1000 instead of 1024 due to the formatter properly defining a
* kilobyte.
*/
private static long KILOBYTE = 1024L;
private Context mContext;
private VolumeInfo mVolume;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -65,12 +79,15 @@ public class StorageItemPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mVolume = new VolumeInfo("id", 0, null, "id");
mContext = RuntimeEnvironment.application;
mController = new StorageItemPreferenceController(mContext, mFragment, mVolume, mSvp);
// Note: null is passed as the Lifecycle because we are handling it outside of the normal
// Settings fragment lifecycle for test purposes.
mController = new StorageItemPreferenceController(mContext, null, mFragment, mVolume, mSvp);
mPreference = new StorageItemPreferenceAlternate(mContext);
// Inflate the preference and the widget.
LayoutInflater inflater = LayoutInflater.from(mContext);
inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
final View view = inflater.inflate(
mPreference.getLayoutResource(), new LinearLayout(mContext), false);
}
@Test
@@ -142,4 +159,46 @@ public class StorageItemPreferenceControllerTest {
assertThat(intent.getAction()).isEqualTo(browseIntent.getAction());
assertThat(intent.getData()).isEqualTo(browseIntent.getData());
}
@Test
public void testMeasurementCompletedUpdatesPreferences() {
StorageItemPreferenceAlternate audio = new StorageItemPreferenceAlternate(mContext);
StorageItemPreferenceAlternate image = new StorageItemPreferenceAlternate(mContext);
StorageItemPreferenceAlternate games = new StorageItemPreferenceAlternate(mContext);
StorageItemPreferenceAlternate apps = new StorageItemPreferenceAlternate(mContext);
StorageItemPreferenceAlternate system = new StorageItemPreferenceAlternate(mContext);
StorageItemPreferenceAlternate files = new StorageItemPreferenceAlternate(mContext);
PreferenceScreen screen = mock(PreferenceScreen.class);
when(screen.findPreference(
Mockito.eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
when(screen.findPreference(
Mockito.eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);
when(screen.findPreference(
Mockito.eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
when(screen.findPreference(
Mockito.eq(StorageItemPreferenceController.OTHER_APPS_KEY))).thenReturn(apps);
when(screen.findPreference(
Mockito.eq(StorageItemPreferenceController.SYSTEM_KEY))).thenReturn(system);
when(screen.findPreference(
Mockito.eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
mController.displayPreference(screen);
StorageMeasurement.MeasurementDetails details = new StorageMeasurement.MeasurementDetails();
details.appsSize.put(0, KILOBYTE);
HashMap<String, Long> mediaSizes = new HashMap<>();
mediaSizes.put(Environment.DIRECTORY_PICTURES, KILOBYTE * 2);
mediaSizes.put(Environment.DIRECTORY_MOVIES, KILOBYTE * 3);
mediaSizes.put(Environment.DIRECTORY_MUSIC, KILOBYTE * 4);
mediaSizes.put(Environment.DIRECTORY_DOWNLOADS, KILOBYTE * 5);
details.mediaSize.put(0, mediaSizes);
mController.setSystemSize(KILOBYTE * 6);
mController.onDetailsChanged(details);
assertThat(audio.getSummary().toString()).isEqualTo("4.00KB");
assertThat(image.getSummary().toString()).isEqualTo("5.00KB");
assertThat(games.getSummary().toString()).isEqualTo("0");
assertThat(apps.getSummary().toString()).isEqualTo("1.00KB");
assertThat(system.getSummary().toString()).isEqualTo("6.00KB");
assertThat(files.getSummary().toString()).isEqualTo("5.00KB");
}
}