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

Commit b91aa1ed authored by Weng Su's avatar Weng Su
Browse files

Fix the broken test on WifiSettingsTest 

- Use the same service name(Context.USER_SERVICE) to mock
UserManager.class

- Set the Provider Model feature flag to false

Bug: 183921235
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I7f83431c08f1e2bd61be0d4b7894116fa7d60168
parent fe042ac0

tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Bundle; 
import android.os.PowerManager;

import android.os.UserManager;

import android.provider.Settings;

import android.util.FeatureFlagUtils;

import android.view.ContextMenu;

import android.view.View;
@@ -105,6 +106,7 @@ public class WifiSettingsTest { 
        mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);

        mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker;

        mWifiSettings.mWifiManager = mWifiManager;

        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);

    }



    @Test
@@ -209,7 +211,7 @@ public class WifiSettingsTest { 
        final Resources.Theme theme = mContext.getTheme();

        when(activity.getTheme()).thenReturn(theme);

        UserManager userManager = mock(UserManager.class);

        when(activity.getSystemService(UserManager.class))

        when(activity.getSystemService(Context.USER_SERVICE))

                .thenReturn(userManager);



        when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))