PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QS dev tiles to active tiles area when enabling it from dev options

Browse Source 
Bug: 73496681
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DevelopmentTilePreferenceControllerTest
Test: flash device and manually test by enabling dev options

Change-Id: Ib7f53128c79de9550d4f68274312e731c01ebd4f
This commit is contained in:
Vishnu Nair
2018-02-21 12:57:56 -08:00
parent 44935e8602
commit fb71550128
2 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
View File

@@ -17,19 +17,25 @@
package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.os.RemoteException;
import android.service.quicksettings.TileService;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,22 +43,28 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DevelopmentTilePreferenceControllerTest {
private static final String SERVICE_INFO_NAME = "TestName";
@Mock
private PreferenceScreen mScreen;
@Mock
private IStatusBarService mStatusBarService;
private Context mContext;
private DevelopmentTilePreferenceController mController;
private ShadowPackageManager mShadowPackageManager;
private DevelopmentTilePreferenceController.OnChangeHandler mOnChangeHandler;
@Before
public void setUp() {
@@ -63,6 +75,9 @@ public class DevelopmentTilePreferenceControllerTest {
mController = new DevelopmentTilePreferenceController(mContext);
assertThat(mController.getPreferenceKey()).isNull();
mOnChangeHandler = spy(new DevelopmentTilePreferenceController.OnChangeHandler(mContext));
ReflectionHelpers.setField(mOnChangeHandler, "mStatusBarService", mStatusBarService);
}
@Test
@@ -86,6 +101,38 @@ public class DevelopmentTilePreferenceControllerTest {
verify(mScreen).addPreference(any(Preference.class));
}
@Test
public void preferenceChecked_shouldAddTile() throws RemoteException {
SwitchPreference preference = createPreference(/* defaultCheckedState = */ false);
preference.performClick();
ArgumentCaptor<ComponentName> argument = ArgumentCaptor.forClass(ComponentName.class);
verify(mStatusBarService).addTile(argument.capture());
assertThat(argument.getValue().getClassName()).isEqualTo(SERVICE_INFO_NAME);
assertThat(argument.getValue().getPackageName()).isEqualTo(mContext.getPackageName());
}
@Test
public void preferenceUnchecked_shouldRemoveTile() throws RemoteException {
SwitchPreference preference = createPreference(/* defaultCheckedState = */ true);
preference.performClick();
ArgumentCaptor<ComponentName> argument = ArgumentCaptor.forClass(ComponentName.class);
verify(mStatusBarService).remTile(argument.capture());
assertThat(argument.getValue().getClassName()).isEqualTo(SERVICE_INFO_NAME);
assertThat(argument.getValue().getPackageName()).isEqualTo(mContext.getPackageName());
}
private SwitchPreference createPreference(boolean defaultCheckedState) {
SwitchPreference preference = new SwitchPreference(mContext);
preference.setTitle("Test Pref");
preference.setIcon(R.drawable.ic_settings_24dp);
preference.setKey(SERVICE_INFO_NAME);
preference.setChecked(defaultCheckedState);
preference.setOnPreferenceChangeListener(mOnChangeHandler);
return preference;
}
public static class FakeServiceInfo extends ServiceInfo {
public String loadLabel(PackageManager mgr) {