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

Commit 09bd5399 authored by Tony Mantler's avatar Tony Mantler Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'AdbEnableController' 

* changes:
  Add ADB enable/disable PreferenceController
  Move to newer mockito/robolectric
parents bfa02faa ec4bae9d

packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java

0 → 100644
+116 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.development;



import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.os.UserManager;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v4.content.LocalBroadcastManager;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.TwoStatePreference;

import android.text.TextUtils;



import com.android.settingslib.core.AbstractPreferenceController;



public abstract class AbstractEnableAdbPreferenceController extends AbstractPreferenceController {

    private static final String KEY_ENABLE_ADB = "enable_adb";

    public static final String ACTION_ENABLE_ADB_STATE_CHANGED =

            "com.android.settingslib.development.AbstractEnableAdbController."

                    + "ENABLE_ADB_STATE_CHANGED";



    private SwitchPreference mPreference;



    public AbstractEnableAdbPreferenceController(Context context) {

        super(context);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (isAvailable()) {

            mPreference = (SwitchPreference) screen.findPreference(KEY_ENABLE_ADB);

        }

    }



    @Override

    public boolean isAvailable() {

        return mContext.getSystemService(UserManager.class).isAdminUser();

    }



    @Override

    public String getPreferenceKey() {

        return KEY_ENABLE_ADB;

    }



    private boolean isAdbEnabled() {

        final ContentResolver cr = mContext.getContentResolver();

        return Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) != 0;

    }



    @Override

    public void updateState(Preference preference) {

        ((TwoStatePreference)preference).setChecked(isAdbEnabled());

    }



    public void enablePreference(boolean enabled) {

        if (isAvailable()) {

            mPreference.setEnabled(enabled);

        }

    }



    public void resetPreference() {

        if (mPreference.isChecked()) {

            mPreference.setChecked(false);

            handlePreferenceTreeClick(mPreference);

        }

    }



    public boolean haveDebugSettings() {

        return isAdbEnabled();

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (TextUtils.equals(KEY_ENABLE_ADB, preference.getKey())) {

            if (!isAdbEnabled()) {

                showConfirmationDialog((SwitchPreference) preference);

            } else {

                writeAdbSetting(false);

            }

            return true;

        } else {

            return false;

        }

    }



    protected void writeAdbSetting(boolean enabled) {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ADB_ENABLED, enabled ? 1 : 0);

        notifyStateChanged();

    }



    protected void notifyStateChanged() {

        LocalBroadcastManager.getInstance(mContext)

                .sendBroadcast(new Intent(ACTION_ENABLE_ADB_STATE_CHANGED));

    }



    public abstract void showConfirmationDialog(SwitchPreference preference);

}

packages/SettingsLib/tests/robotests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 


# Include the testing libraries (JUnit4 + Robolectric libs).

LOCAL_STATIC_JAVA_LIBRARIES := \

    platform-system-robolectric \

    mockito-robolectric-prebuilt \

    truth-prebuilt



LOCAL_JAVA_LIBRARIES := \

packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java

0 → 100644
+158 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.development;



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



import static org.mockito.Answers.RETURNS_DEEP_STUBS;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.pm.PackageManager;

import android.os.UserManager;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settingslib.SettingLibRobolectricTestRunner;

import com.android.settingslib.TestConfig;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowApplication;



@RunWith(SettingLibRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class EnableAdbPreferenceControllerTest {

    @Mock(answer = RETURNS_DEEP_STUBS)

    private PreferenceScreen mScreen;

    @Mock

    private UserManager mUserManager;

    @Mock

    private PackageManager mPackageManager;



    private Context mContext;

    private SwitchPreference mPreference;

    private ConcreteEnableAdbPreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        ShadowApplication shadowContext = ShadowApplication.getInstance();

        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);

        mContext = spy(shadowContext.getApplicationContext());

        when(mContext.getPackageManager()).thenReturn(mPackageManager);

        mPreference = new SwitchPreference(mContext);

        when(mScreen.findPreference(anyString())).thenReturn(mPreference);

        mController = new ConcreteEnableAdbPreferenceController(mContext);

        mPreference.setKey(mController.getPreferenceKey());

    }



    @Test

    public void displayPreference_isNotAdmin_shouldRemovePreference() {

        when(mUserManager.isAdminUser()).thenReturn(false);

        when(mScreen.getPreferenceCount()).thenReturn(1);

        when(mScreen.getPreference(0)).thenReturn(mPreference);



        mController.displayPreference(mScreen);



        verify(mScreen).removePreference(any(Preference.class));

    }



    @Test

    public void displayPreference_isAdmin_shouldNotRemovePreference() {

        when(mUserManager.isAdminUser()).thenReturn(true);



        mController.displayPreference(mScreen);



        verify(mScreen, never()).removePreference(any(Preference.class));

    }





    @Test

    public void resetPreference_shouldUncheck() {

        when(mUserManager.isAdminUser()).thenReturn(true);

        mController.displayPreference(mScreen);

        mPreference.setChecked(true);



        mController.resetPreference();



        assertThat(mPreference.isChecked()).isFalse();

    }



    @Test

    public void handlePreferenceTreeClick_shouldUpdateSettings() {

        when(mUserManager.isAdminUser()).thenReturn(true);

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Global.ADB_ENABLED, 1);

        mPreference.setChecked(true);

        mController.displayPreference(mScreen);



        mController.handlePreferenceTreeClick(mPreference);



        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Global.ADB_ENABLED, 0)).isEqualTo(0);

    }



    @Test

    public void updateState_settingsOn_shouldCheck() {

        when(mUserManager.isAdminUser()).thenReturn(true);

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Global.ADB_ENABLED, 1);

        mPreference.setChecked(false);

        mController.displayPreference(mScreen);



        mController.updateState(mPreference);



        assertThat(mPreference.isChecked()).isTrue();

    }



    @Test

    public void updateState_settingsOff_shouldUncheck() {

        when(mUserManager.isAdminUser()).thenReturn(true);

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Global.ADB_ENABLED, 0);

        mPreference.setChecked(true);

        mController.displayPreference(mScreen);



        mController.updateState(mPreference);



        assertThat(mPreference.isChecked()).isFalse();

    }



    class ConcreteEnableAdbPreferenceController extends AbstractEnableAdbPreferenceController {

        public ConcreteEnableAdbPreferenceController(Context context) {

            super(context);

        }



        @Override

        public void showConfirmationDialog(SwitchPreference preference) {

            // Don't show a dialog, just set setting.

            writeAdbSetting(true);

        }

    }

}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java

+10 −13
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ package com.android.settingslib.drawer; 


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



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.argThat;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -59,7 +60,6 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.ArgumentMatcher;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;
@@ -100,6 +100,7 @@ public class TileUtilsTest { 
        MockitoAnnotations.initMocks(this);

        when(mContext.getPackageManager()).thenReturn(mPackageManager);

        when(mPackageManager.getResourcesForApplication(anyString())).thenReturn(mResources);

        when(mPackageManager.getResourcesForApplication((String) isNull())).thenReturn(mResources);

        when(mPackageManager.getApplicationInfo(eq("abc"), anyInt()))

                .thenReturn(application.getApplicationInfo());

        mContentResolver = spy(application.getContentResolver());
@@ -115,7 +116,6 @@ public class TileUtilsTest { 
        List<Tile> outTiles = new ArrayList<>();

        List<ResolveInfo> info = new ArrayList<>();

        info.add(newInfo(true, testCategory));

        Map<Pair<String, String>, Tile> cache = new ArrayMap<>();

        when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))

                .thenReturn(info);
@@ -169,7 +169,6 @@ public class TileUtilsTest { 


    @Test

    public void getTilesForIntent_shouldSkipFilteredApps() {

        final String testCategory = "category1";

        Intent intent = new Intent();

        Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();

        List<Tile> outTiles = new ArrayList<>();
@@ -210,11 +209,9 @@ public class TileUtilsTest { 
        userHandleList.add(UserHandle.CURRENT);

        when(mUserManager.getUserProfiles()).thenReturn(userHandleList);



        when(mPackageManager.queryIntentActivitiesAsUser(argThat(new ArgumentMatcher<Intent>() {

            public boolean matches(Object event) {

                return testAction.equals(((Intent) event).getAction());

            }

        }), anyInt(), anyInt())).thenReturn(info);

        when(mPackageManager.queryIntentActivitiesAsUser(argThat(

                event -> testAction.equals(event.getAction())), anyInt(), anyInt()))

                .thenReturn(info);



        List<DashboardCategory> categoryList = TileUtils.getCategories(

                mContext, cache, false /* categoryDefinedInManifest */, testAction,