Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev

Browse Source
This commit is contained in:
Filip Pavlis
2017-04-07 10:31:39 +00:00
committed by Android (Google) Code Review
parent 327c0b9f88 81d53516ab
commit 59dd2ebfc1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
View File

@@ -52,7 +52,7 @@ public class RestrictedPreferenceHelperTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mViewHolder = new PreferenceViewHolder(mock(View.class)); mViewHolder = PreferenceViewHolder.createInstanceForTests(mock(View.class));
mHelper = new RestrictedPreferenceHelper(mContext, mPreference, null); mHelper = new RestrictedPreferenceHelper(mContext, mPreference, null);
} }

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
View File

@@ -52,7 +52,7 @@ public class TwoTargetPreferenceTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mPreference = spy(new TwoTargetPreference(mContext)); mPreference = spy(new TwoTargetPreference(mContext));
mViewHolder = new PreferenceViewHolder(mock(View.class)); mViewHolder = PreferenceViewHolder.createInstanceForTests(mock(View.class));
when(mViewHolder.findViewById(R.id.two_target_divider)) when(mViewHolder.findViewById(R.id.two_target_divider))
.thenReturn(mDivider); .thenReturn(mDivider);
when(mViewHolder.findViewById(android.R.id.widget_frame)) when(mViewHolder.findViewById(android.R.id.widget_frame))