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

Merge "Remove reference to R.id.summary_container."

Browse Source
This commit is contained in:
Fan Zhang
2019-03-21 23:41:58 +00:00
committed by Android (Google) Code Review
parent 3f7cbc7c54 d3b848713d
commit e3cee29472
10 changed files with 22 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ public class ApplicationViewHolderTest {
public void seUp() {
mContext = RuntimeEnvironment.application;
mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
mHolder = new ApplicationViewHolder(mView);
}
@Test
@@ -67,10 +67,6 @@ public class ApplicationViewHolderTest {
mHolder.setSummary(R.string.disabled);
assertThat(mHolder.mSummary.getText()).isEqualTo(mContext.getText(R.string.disabled));
assertThat(mHolder.mSummaryContainer.getVisibility()).isEqualTo(View.VISIBLE);
mHolder.setSummary(null);
assertThat(mHolder.mSummaryContainer.getVisibility()).isEqualTo(View.GONE);
}
@Test
@@ -104,7 +100,7 @@ public class ApplicationViewHolderTest {
@Test
public void twoTouchTarget() {
mView = ApplicationViewHolder.newView(new FrameLayout(mContext), true);
mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
mHolder = new ApplicationViewHolder(mView);
assertThat(mHolder.mSwitch).isNotNull();
assertThat(mHolder.mWidgetContainer.getChildCount()).isEqualTo(1);
}
@@ -112,8 +108,9 @@ public class ApplicationViewHolderTest {
@Test
public void updateSwitch() {
mView = ApplicationViewHolder.newView(new FrameLayout(mContext), true);
mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
mHolder.updateSwitch(v -> {}, true, true);
mHolder = new ApplicationViewHolder(mView);
mHolder.updateSwitch(v -> {
} /* listener */, true, true);
assertThat(mHolder.mSwitch.isChecked()).isTrue();
assertThat(mHolder.mSwitch.isEnabled()).isTrue();

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

@@ -234,16 +234,6 @@ public class ManageApplicationsTest {
verify(loadingViewController).showLoadingViewDelayed();
}
@Test
public void shouldUseStableItemHeight() {
assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
LIST_TYPE_MAIN))
.isTrue();
assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
LIST_TYPE_NOTIFICATION))
.isTrue();
}
@Test
public void onRebuildComplete_shouldHideLoadingView() {
final Context context = RuntimeEnvironment.application;

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

@@ -64,7 +64,7 @@ public class MusicViewHolderControllerTest {
mController = new MusicViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
mHolder = new ApplicationViewHolder(view, false /* useStableHeight */);
mHolder = new ApplicationViewHolder(view);
}
@Test

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

@@ -63,7 +63,7 @@ public class PhotosViewHolderControllerTest {
mController = new PhotosViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
final View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
mHolder = new ApplicationViewHolder(view, false /* useStableHeight */);
mHolder = new ApplicationViewHolder(view);
}
@Test
@@ -71,19 +71,19 @@ public class PhotosViewHolderControllerTest {
mController.setupView(mHolder);
assertThat(mHolder.mSummary.getText().toString())
.isEqualTo(Formatter.formatFileSize(mContext, 0));
.isEqualTo(Formatter.formatFileSize(mContext, 0));
}
@Test
public void storageShouldRepresentStorageStatsQuery() throws Exception {
when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
.thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
.thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
mController.queryStats();
mController.setupView(mHolder);
assertThat(mHolder.mSummary.getText().toString())
.isEqualTo(Formatter.formatFileSize(mContext, 11));
.isEqualTo(Formatter.formatFileSize(mContext, 11));
}
@Test