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

Omit using ctor of PreferenceViewHolder in tests.

Browse Source 
See the topic for related change in the support lib.

Bug: b/33774880
Test: N/A
Change-Id: I3514821db649e26068f151bd69c687faab5ae222
This commit is contained in:
Filip Pavlis
2017-04-05 11:01:10 +01:00
parent bb994166cb
commit 4bd1e4f73b
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
View File

@@ -48,7 +48,7 @@ public class SummaryPreferenceTest {
final View view = inflater.inflate(mPreference.getLayoutResource(), final View view = inflater.inflate(mPreference.getLayoutResource(),
new LinearLayout(mContext), false); new LinearLayout(mContext), false);
mHolder = new PreferenceViewHolder(view); mHolder = PreferenceViewHolder.createInstanceForTests(view);
} }
@Test @Test

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

@@ -60,7 +60,7 @@ public class StorageItemPreferenceTest {
@Test @Test
public void testProgressBarPercentageSet() { public void testProgressBarPercentageSet() {
final PreferenceViewHolder holder = new PreferenceViewHolder( final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(R.layout.storage_item, null)); LayoutInflater.from(mContext).inflate(R.layout.storage_item, null));
final ProgressBar progressBar = final ProgressBar progressBar =
(ProgressBar) holder.itemView.findViewById(android.R.id.progress); (ProgressBar) holder.itemView.findViewById(android.R.id.progress);

2
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
View File

@@ -79,7 +79,7 @@ public class StorageSummaryDonutPreferenceControllerTest {
final View view = final View view =
inflater.inflate( inflater.inflate(
mPreference.getLayoutResource(), new LinearLayout(mContext), false); mPreference.getLayoutResource(), new LinearLayout(mContext), false);
mHolder = new PreferenceViewHolder(view); mHolder = PreferenceViewHolder.createInstanceForTests(view);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
View File

@@ -73,7 +73,7 @@ public class BatteryHistoryPreferenceTest {
mBatteryHistoryPreference = new BatteryHistoryPreference(context, null); mBatteryHistoryPreference = new BatteryHistoryPreference(context, null);
mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo; mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo;
mViewHolder = spy(new PreferenceViewHolder(itemView)); mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(itemView));
when(mViewHolder.findViewById(R.id.battery_usage)).thenReturn(mUsageView); when(mViewHolder.findViewById(R.id.battery_usage)).thenReturn(mUsageView);
when(mViewHolder.findViewById(R.id.charge)).thenReturn(mTextView); when(mViewHolder.findViewById(R.id.charge)).thenReturn(mTextView);
when(mUsageView.findViewById(anyInt())).thenReturn(mLabelView); when(mUsageView.findViewById(anyInt())).thenReturn(mLabelView);

2
tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java
View File

@@ -56,7 +56,7 @@ public class FooterPreferenceTest {
@Test @Test
public void bindPreference_shouldLinkifyContent() { public void bindPreference_shouldLinkifyContent() {
final FooterPreference preference = new FooterPreference(mContext); final FooterPreference preference = new FooterPreference(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder( final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null)); LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null));
preference.onBindViewHolder(holder); preference.onBindViewHolder(holder);

24
tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
View File

@@ -61,8 +61,9 @@ public class MasterSwitchPreferenceTest {
@Test @Test
public void setChecked_shouldUpdateButtonCheckedState() { public void setChecked_shouldUpdateButtonCheckedState() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
.inflate(R.layout.preference_widget_master_switch, null)); LayoutInflater.from(mContext).inflate(
R.layout.preference_widget_master_switch, null));
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder); preference.onBindViewHolder(holder);
@@ -76,8 +77,9 @@ public class MasterSwitchPreferenceTest {
@Test @Test
public void setSwitchEnabled_shouldUpdateButtonEnabledState() { public void setSwitchEnabled_shouldUpdateButtonEnabledState() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
.inflate(R.layout.preference_widget_master_switch, null)); LayoutInflater.from(mContext).inflate(
R.layout.preference_widget_master_switch, null));
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder); preference.onBindViewHolder(holder);
@@ -92,7 +94,7 @@ public class MasterSwitchPreferenceTest {
public void clickWidgetView_shouldToggleButton() { public void clickWidgetView_shouldToggleButton() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final LayoutInflater inflater = LayoutInflater.from(mContext); final LayoutInflater inflater = LayoutInflater.from(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder( final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null)); inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame); final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true); inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
@@ -109,7 +111,7 @@ public class MasterSwitchPreferenceTest {
@Test @Test
public void clickWidgetView_shouldNotifyPreferenceChanged() { public void clickWidgetView_shouldNotifyPreferenceChanged() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder( final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null)); LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null));
final View widgetView = holder.findViewById(android.R.id.widget_frame); final View widgetView = holder.findViewById(android.R.id.widget_frame);
final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class); final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
@@ -128,8 +130,9 @@ public class MasterSwitchPreferenceTest {
@Test @Test
public void setDisabledByAdmin_hasEnforcedAdmin_shouldDisableButton() { public void setDisabledByAdmin_hasEnforcedAdmin_shouldDisableButton() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
.inflate(R.layout.preference_widget_master_switch, null)); LayoutInflater.from(mContext)
.inflate(R.layout.preference_widget_master_switch, null));
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
toggle.setEnabled(true); toggle.setEnabled(true);
preference.onBindViewHolder(holder); preference.onBindViewHolder(holder);
@@ -141,8 +144,9 @@ public class MasterSwitchPreferenceTest {
@Test @Test
public void setDisabledByAdmin_noEnforcedAdmin_shouldEnableButton() { public void setDisabledByAdmin_noEnforcedAdmin_shouldEnableButton() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
.inflate(R.layout.preference_widget_master_switch, null)); LayoutInflater.from(mContext)
.inflate(R.layout.preference_widget_master_switch, null));
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
toggle.setEnabled(false); toggle.setEnabled(false);
preference.onBindViewHolder(holder); preference.onBindViewHolder(holder);