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

Commit d7a8b0eb authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Fix NPE in UserSettingsTest 

Also, introduce a check for ACTION_USER_GUEST_ADD being logged correctly

Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Bug: 183920589
Change-Id: Ie4fdf4b3429a9abec64120a38a13f2d8a3fa121a
parent 11eabdf3

tests/robotests/src/com/android/settings/users/UserSettingsTest.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.robolectric.Shadows.shadowOf;

import static org.robolectric.Shadows.shadowOf;





import android.app.settings.SettingsEnums;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;
@@ -61,6 +62,7 @@ import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; 
import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;
@@ -111,6 +113,8 @@ public class UserSettingsTest { 
    private RestrictedPreference mAddGuestPreference;

    private RestrictedPreference mAddGuestPreference;

    @Mock

    @Mock

    private UserManager mUserManager;

    private UserManager mUserManager;

    @Mock

    private MetricsFeatureProvider mMetricsFeatureProvider;





    private FragmentActivity mActivity;

    private FragmentActivity mActivity;

    private Context mContext;

    private Context mContext;
@@ -134,6 +138,7 @@ public class UserSettingsTest { 
        ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);

        ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);

        ReflectionHelpers.setField(mFragment, "mDefaultIconDrawable", mDefaultIconDrawable);

        ReflectionHelpers.setField(mFragment, "mDefaultIconDrawable", mDefaultIconDrawable);

        ReflectionHelpers.setField(mFragment, "mAddingUser", false);

        ReflectionHelpers.setField(mFragment, "mAddingUser", false);

        ReflectionHelpers.setField(mFragment, "mMetricsFeatureProvider", mMetricsFeatureProvider);





        doReturn(mUserManager).when(mActivity).getSystemService(UserManager.class);

        doReturn(mUserManager).when(mActivity).getSystemService(UserManager.class);
@@ -616,6 +621,7 @@ public class UserSettingsTest { 
                .isEqualTo(createdGuest.id);

                .isEqualTo(createdGuest.id);

        assertThat(arguments.getBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, false))

        assertThat(arguments.getBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, false))

                .isEqualTo(true);

                .isEqualTo(true);

        verify(mMetricsFeatureProvider).action(any(), eq(SettingsEnums.ACTION_USER_GUEST_ADD));

    }

    }





    @Test

    @Test