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

Commit a121bbba 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 

am: 3b3bf871

Change-Id: I314d9bfa7d29eb506fa4bb7faedd7f8d506098b4
parents d80264b4 3b3bf871

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

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

    }

    }

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

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