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

Update viewholder tests to sdk 26

Browse Source 
Test: make RunSettingsRoboTests -j40
Change-Id: I81bfdff059255b3e7a20270dea62ffd56cc53ad5
This commit is contained in:
jeffreyhuang
2017-11-27 12:04:43 -08:00
parent eeffbf6225
commit 85aa1ea129
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.manageapplications; package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.nullable; import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@ import android.content.Intent;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import android.provider.DocumentsContract; import android.provider.DocumentsContract;
import android.text.format.Formatter;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
@@ -46,7 +48,7 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class MusicViewHolderControllerTest { public class MusicViewHolderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Fragment mFragment; private Fragment mFragment;
@@ -75,7 +77,8 @@ public class MusicViewHolderControllerTest {
public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() { public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
mController.setupView(mHolder); mController.setupView(mHolder);
assertThat(mHolder.mSummary.getText().toString()).isEqualTo("0.00 B"); assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
Formatter.formatFileSize(mContext, 0));
} }
@Test @Test
@@ -86,7 +89,8 @@ public class MusicViewHolderControllerTest {
mController.queryStats(); mController.queryStats();
mController.setupView(mHolder); mController.setupView(mHolder);
assertThat(mHolder.mSummary.getText().toString()).isEqualTo("1.00 B"); assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
Formatter.formatFileSize(mContext, 1));
} }
@Test @Test

13
tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.manageapplications; package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.nullable; import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -26,6 +27,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import android.text.format.Formatter;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
@@ -44,11 +46,12 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class PhotosViewHolderControllerTest { public class PhotosViewHolderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Fragment mFragment; private Fragment mFragment;
@Mock private StorageStatsSource mSource; @Mock
private StorageStatsSource mSource;
private Context mContext; private Context mContext;
private PhotosViewHolderController mController; private PhotosViewHolderController mController;
@@ -74,7 +77,8 @@ public class PhotosViewHolderControllerTest {
public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() { public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
mController.setupView(mHolder); mController.setupView(mHolder);
assertThat(mHolder.mSummary.getText().toString()).isEqualTo("0.00 B"); assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
Formatter.formatFileSize(mContext, 0));
} }
@Test @Test
@@ -85,7 +89,8 @@ public class PhotosViewHolderControllerTest {
mController.queryStats(); mController.queryStats();
mController.setupView(mHolder); mController.setupView(mHolder);
assertThat(mHolder.mSummary.getText().toString()).isEqualTo("11.00 B"); assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
Formatter.formatFileSize(mContext, 11));
} }
@Test @Test