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

Revert "[DataUsage] Adjusting the control of display sequence"

Browse Source 
This reverts commit b8491032d7.

Bug: 277162513
Test: Manual
Test: Unit test
Change-Id: I5a84a9b1a99b1da4c18d786a6dff062b53cd46c6
This commit is contained in:
Chaohui Wang
2023-04-22 08:35:55 +08:00
parent 52b723beef
commit f46b33bbc4
4 changed files with 57 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
View File

@@ -17,10 +17,7 @@ package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -166,32 +163,23 @@ public class ChartDataUsagePreferenceTest {
@Test
public void notifyChange_nonEmptyDataUsage_shouldHaveSingleContentDescription() {
final ArgumentCaptor<CharSequence> contentCaptor =
ArgumentCaptor.forClass(CharSequence.class);
final UsageView chart = mock(UsageView.class);
doReturn(chart).when(mHolder).findViewById(R.id.data_usage);
final TextView labelTop = mock(TextView.class);
doReturn(labelTop).when(mHolder).findViewById(R.id.label_top);
final TextView labelMiddle = mock(TextView.class);
doReturn(labelMiddle).when(mHolder).findViewById(R.id.label_middle);
final TextView labelBottom = mock(TextView.class);
doReturn(labelBottom).when(mHolder).findViewById(R.id.label_bottom);
final TextView labelStart = mock(TextView.class);
doReturn(labelStart).when(mHolder).findViewById(R.id.label_start);
final TextView labelEnd = mock(TextView.class);
doReturn(labelEnd).when(mHolder).findViewById(R.id.label_end);
final UsageView chart = (UsageView) mHolder.findViewById(R.id.data_usage);
final TextView labelTop = (TextView) mHolder.findViewById(R.id.label_top);
final TextView labelMiddle = (TextView) mHolder.findViewById(R.id.label_middle);
final TextView labelBottom = (TextView) mHolder.findViewById(R.id.label_bottom);
final TextView labelStart = (TextView) mHolder.findViewById(R.id.label_start);
final TextView labelEnd = (TextView) mHolder.findViewById(R.id.label_end);
createTestNetworkData();
mPreference.onBindViewHolder(mHolder);
mPreference.setNetworkCycleData(mNetworkCycleChartData);
verify(chart).setContentDescription(contentCaptor.capture());
assertThat(contentCaptor.getValue()).isNotNull();
verify(labelTop, never()).setContentDescription(any());
verify(labelMiddle, never()).setContentDescription(any());
verify(labelBottom, never()).setContentDescription(any());
verify(labelStart, never()).setContentDescription(any());
verify(labelEnd, never()).setContentDescription(any());
mPreference.onBindViewHolder(mHolder);
assertThat(chart.getContentDescription()).isNotNull();
assertThat(labelTop.getContentDescription()).isNull();
assertThat(labelMiddle.getContentDescription()).isNull();
assertThat(labelBottom.getContentDescription()).isNull();
assertThat(labelStart.getContentDescription()).isNull();
assertThat(labelEnd.getContentDescription()).isNull();
}
@Test