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

Commit 5b39ec5d authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Fix broken settings tests(Round 2)"

parents dec5aff0 6aeed0ea

src/com/android/settings/wifi/details/AddDevicePreferenceController.java

+7 −2
Original line number Diff line number Diff line
@@ -41,13 +41,18 @@ public class AddDevicePreferenceController extends BasePreferenceController { 
    private AccessPoint mAccessPoint;

    private WifiManager mWifiManager;



    public AddDevicePreferenceController(Context context, AccessPoint accessPoint) {

    public AddDevicePreferenceController(Context context) {

        super(context, KEY_ADD_DEVICE_CATEGORY);



        mAccessPoint = accessPoint;

        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

    }



    public AddDevicePreferenceController init(AccessPoint accessPoint) {

        mAccessPoint = accessPoint;



        return this;

    }



    @Override

    public int getAvailabilityStatus() {

        if (WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mAccessPoint)) {

src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment { 
                mMetricsFeatureProvider);



        controllers.add(mWifiDetailPreferenceController);

        controllers.add(new AddDevicePreferenceController(context, mAccessPoint));

        controllers.add(new AddDevicePreferenceController(context).init(mAccessPoint));

        controllers.add(new WifiMeteredPreferenceController(context, mAccessPoint.getConfig()));

        WifiPrivacyPreferenceController privacyController = new WifiPrivacyPreferenceController(

                context);

tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor

+3 −0
Original line number Diff line number Diff line
@@ -10,5 +10,8 @@ com.android.settings.datausage.WifiDataUsageSummaryPreferenceController 
com.android.settings.fuelgauge.RestrictAppPreferenceController

com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController

com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController

com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController

com.android.settings.gestures.SystemNavigationLegacyPreferenceController

com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController

com.android.settings.security.VisiblePatternProfilePreferenceController

com.android.settings.wifi.details.WifiMeteredPreferenceController
 
 No newline at end of file

tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java

+0 −23
Original line number Diff line number Diff line
@@ -18,17 +18,9 @@ package com.android.settings.applications.managedomainurls; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.util.IconDrawableFactory;

import android.view.View;

import android.widget.ProgressBar;



import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;

import com.android.settingslib.applications.ApplicationsState;
@@ -64,21 +56,6 @@ public class DomainAppPreferenceControllerTest { 
        assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app);

    }



    @Test

    public void onBindViewHolder_shouldSetAppendixViewToGone() {

        final DomainAppPreference pref = new DomainAppPreference(

                mContext, mIconDrawableFactory, mAppEntry);

        final View holderView = mock(View.class);

        final View appendixView = mock(View.class);

        when(holderView.findViewById(R.id.summary_container)).thenReturn(mock(View.class));

        when(holderView.findViewById(android.R.id.progress)).thenReturn(mock(ProgressBar.class));

        when(holderView.findViewById(R.id.appendix)).thenReturn(appendixView);



        pref.onBindViewHolder(PreferenceViewHolder.createInstanceForTests(holderView));



        verify(appendixView).setVisibility(View.GONE);

    }



    private ApplicationInfo createApplicationInfo(String packageName) {

        ApplicationInfo appInfo = new ApplicationInfo();

        appInfo.sourceDir = "foo";

tests/robotests/src/com/android/settings/core/HideNonSystemOverlayMixinTest.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ public class HideNonSystemOverlayMixinTest { 


    @Before

    public void setUp() {

        RuntimeEnvironment.application.setTheme(R.style.Theme_AppCompat);

        mActivityController = Robolectric.buildActivity(TestActivity.class);

    }
@@ -72,6 +71,7 @@ public class HideNonSystemOverlayMixinTest { 
        @Override

        protected void onCreate(@Nullable Bundle savedInstanceState) {

            super.onCreate(savedInstanceState);

            setTheme(R.style.Theme_AppCompat);

            getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));

        }

    }