Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b3bf871 authored by Filip Pavlis's avatar Filip Pavlis Committed by android-build-merger
Browse files

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

am: 59dd2ebf

Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb
parents 93cba9ee 59dd2ebf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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);
    }

+1 −1
Original line number Diff line number Diff line
@@ -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))