summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Filip Pavlis <pavlis@google.com> 2017-04-05 10:56:38 +0100
committer Filip Pavlis <pavlis@google.com> 2017-04-05 10:56:38 +0100
commit81d53516abaf15f8443f715b96ab35c71202c28c (patch)
tree3ad597f52d77201a6ab8a42c70acd1b55f2e5e02
parent24bac614986e0fe8892c5ef36e4b6e516fd01d0b (diff)
Omit using ctor of PreferenceViewHolder in tests.
See the topic for related change in the support lib. Bug: b/33774880 Test: N/A Change-Id: I557278175db17b32ff9ce65ceaebc9a7386d2c20
-rw-r--r--packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java2
-rw-r--r--packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
index 43e238ba02db..e5ad6ab84a48 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
@@ -52,7 +52,7 @@ public class RestrictedPreferenceHelperTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mViewHolder = new PreferenceViewHolder(mock(View.class));
+ mViewHolder = PreferenceViewHolder.createInstanceForTests(mock(View.class));
mHelper = new RestrictedPreferenceHelper(mContext, mPreference, null);
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
index 59eca257443c..505d7a6c5a06 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
@@ -52,7 +52,7 @@ public class TwoTargetPreferenceTest {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
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))
.thenReturn(mDivider);
when(mViewHolder.findViewById(android.R.id.widget_frame))