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

Commit 59dd2ebf authored by Filip Pavlis's avatar Filip Pavlis Committed by Android (Google) Code Review
Browse files

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

parents 327c0b9f 81d53516

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

+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);

    }

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

+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))