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

Commit 5a2590df 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: f023f507 

am: 7ae53e7d

Change-Id: I9f075fbb5abe2767db1cd743a8c828d6f77fb9de
parents 19ebace6 7ae53e7d

tests/robotests/src/com/android/settings/SummaryPreferenceTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ public class SummaryPreferenceTest { 
        final View view = inflater.inflate(mPreference.getLayoutResource(),

        final View view = inflater.inflate(mPreference.getLayoutResource(),

                new LinearLayout(mContext), false);

                new LinearLayout(mContext), false);





        mHolder = new PreferenceViewHolder(view);

        mHolder = PreferenceViewHolder.createInstanceForTests(view);

    }

    }





    @Test

    @Test

tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ public class StorageItemPreferenceTest { 




    @Test

    @Test

    public void testProgressBarPercentageSet() {

    public void testProgressBarPercentageSet() {

        final PreferenceViewHolder holder = new PreferenceViewHolder(

        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(

                LayoutInflater.from(mContext).inflate(R.layout.storage_item, null));

                LayoutInflater.from(mContext).inflate(R.layout.storage_item, null));

        final ProgressBar progressBar =

        final ProgressBar progressBar =

                (ProgressBar) holder.itemView.findViewById(android.R.id.progress);

                (ProgressBar) holder.itemView.findViewById(android.R.id.progress);

tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ public class StorageSummaryDonutPreferenceControllerTest { 
        final View view =

        final View view =

                inflater.inflate(

                inflater.inflate(

                        mPreference.getLayoutResource(), new LinearLayout(mContext), false);

                        mPreference.getLayoutResource(), new LinearLayout(mContext), false);

        mHolder = new PreferenceViewHolder(view);

        mHolder = PreferenceViewHolder.createInstanceForTests(view);

    }

    }





    @Test

    @Test

tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ public class BatteryHistoryPreferenceTest { 




        mBatteryHistoryPreference = new BatteryHistoryPreference(context, null);

        mBatteryHistoryPreference = new BatteryHistoryPreference(context, null);

        mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo;

        mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo;

        mViewHolder = spy(new PreferenceViewHolder(itemView));

        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(itemView));

        when(mViewHolder.findViewById(R.id.battery_usage)).thenReturn(mUsageView);

        when(mViewHolder.findViewById(R.id.battery_usage)).thenReturn(mUsageView);

        when(mViewHolder.findViewById(R.id.charge)).thenReturn(mTextView);

        when(mViewHolder.findViewById(R.id.charge)).thenReturn(mTextView);

        when(mUsageView.findViewById(anyInt())).thenReturn(mLabelView);

        when(mUsageView.findViewById(anyInt())).thenReturn(mLabelView);

tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ public class FooterPreferenceTest { 
    @Test

    @Test

    public void bindPreference_shouldLinkifyContent() {

    public void bindPreference_shouldLinkifyContent() {

        final FooterPreference preference = new FooterPreference(mContext);

        final FooterPreference preference = new FooterPreference(mContext);

        final PreferenceViewHolder holder = new PreferenceViewHolder(

        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(

                LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null));

                LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null));





        preference.onBindViewHolder(holder);

        preference.onBindViewHolder(holder);