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

Merge "Clean up FileSizeFormatter" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-09-04 04:44:22 +00:00
committed by Android (Google) Code Review
parent d74026cfc4 b2c6bf49c4
commit 8e28dbbee7
5 changed files with 8 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
View File

@@ -15,8 +15,6 @@
*/
package com.android.settings.deviceinfo;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -36,6 +34,7 @@ import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class StorageItemPreferenceTest {
private static final long MEGABYTE_IN_BYTES = 1000_000;
private Context mContext;
private StorageItemPreference mPreference;

3
tests/robotests/src/com/android/settings/deviceinfo/storage/NonCurrentUserControllerTest.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.deviceinfo.storage;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
@@ -61,6 +59,7 @@ public class NonCurrentUserControllerTest {
private static final String TEST_NAME = "Fred";
private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
private static final long MEGABYTE_IN_BYTES = 1000_000;
@Mock
private UserManager mUserManager;
@Mock

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

@@ -16,9 +16,6 @@
package com.android.settings.deviceinfo.storage;
import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ID;
import static com.android.settings.utils.FileSizeFormatter.GIGABYTE_IN_BYTES;
import static com.android.settings.utils.FileSizeFormatter.KILOBYTE_IN_BYTES;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
import static com.google.common.truth.Truth.assertThat;
@@ -74,6 +71,10 @@ import org.robolectric.annotation.Config;
})
public class StorageItemPreferenceControllerTest {
private static final long KILOBYTE_IN_BYTES = 1000;
private static final long MEGABYTE_IN_BYTES = KILOBYTE_IN_BYTES * 1000;
private static final long GIGABYTE_IN_BYTES = MEGABYTE_IN_BYTES * 1000;
private Context mContext;
private VolumeInfo mVolume;
@Mock