Group some Security settings to a separate "Advanced settings" screen
Test: adb shell am start -a android.settings.SECURITY_SETTINGS opens Advanced Security Settings screen Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest Test: atest SettingsUnitTests:SecurityAdvancedSettingsControllerTest Bug: 204416998 Change-Id: If9c6da812ffb7c046b3b00a084007950801e1d4f
This commit is contained in:
@@ -0,0 +1,86 @@
|
||||
/*
|
||||
* Copyright (C) 2021 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.settings.security;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.CrossProfileApps;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.testutils.ResourcesUtils;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class SecurityAdvancedSettingsControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "security_advanced_settings";
|
||||
private static final String NO_WORK_PROFILE_SUMMARY_RESOURCE_NAME =
|
||||
"security_advanced_settings_no_work_profile_settings_summary";
|
||||
private static final String WORK_PROFILE_SUMMARY_RESOURCE_NAME =
|
||||
"security_advanced_settings_work_profile_settings_summary";
|
||||
|
||||
@Mock
|
||||
private CrossProfileApps mCrossProfileApps;
|
||||
private Context mContext;
|
||||
|
||||
private SecurityAdvancedSettingsController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
when(mContext.getSystemService(CrossProfileApps.class)).thenReturn(mCrossProfileApps);
|
||||
|
||||
mController = new SecurityAdvancedSettingsController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_withoutWorkProfile() {
|
||||
when(mCrossProfileApps.getTargetUserProfiles()).thenReturn(Collections.emptyList());
|
||||
|
||||
assertThat(mController.getSummary())
|
||||
.isEqualTo(getResourcesString(NO_WORK_PROFILE_SUMMARY_RESOURCE_NAME));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_withWorkProfile() {
|
||||
when(mCrossProfileApps.getTargetUserProfiles()).thenReturn(
|
||||
Collections.singletonList(new UserHandle(0))
|
||||
);
|
||||
|
||||
assertThat(mController.getSummary())
|
||||
.isEqualTo(getResourcesString(WORK_PROFILE_SUMMARY_RESOURCE_NAME));
|
||||
}
|
||||
|
||||
private String getResourcesString(String resName) {
|
||||
return ResourcesUtils.getResourcesString(mContext, resName);
|
||||
}
|
||||
}
|
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* Copyright (C) 2021 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.settings.security;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Looper;
|
||||
|
||||
import androidx.test.annotation.UiThreadTest;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.testutils.ResourcesUtils;
|
||||
import com.android.settingslib.drawer.CategoryKey;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class SecurityAdvancedSettingsTest {
|
||||
private static final String SCREEN_XML_RESOURCE_NAME = "security_advanced_settings";
|
||||
|
||||
private Context mContext;
|
||||
private SecurityAdvancedSettings mSecurityAdvancedSettings;
|
||||
|
||||
@Before
|
||||
@UiThreadTest
|
||||
public void setUp() {
|
||||
if (Looper.myLooper() == null) {
|
||||
Looper.prepare();
|
||||
}
|
||||
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
|
||||
mSecurityAdvancedSettings = new SecurityAdvancedSettings();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getPreferenceXml_returnsAdvancedSettings() {
|
||||
assertThat(mSecurityAdvancedSettings.getPreferenceScreenResId())
|
||||
.isEqualTo(getXmlResId(SCREEN_XML_RESOURCE_NAME));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getCategoryKey_whenCalled_returnsSecurity() {
|
||||
assertThat(mSecurityAdvancedSettings.getCategoryKey())
|
||||
.isEqualTo(CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS);
|
||||
}
|
||||
|
||||
private int getXmlResId(String resName) {
|
||||
return ResourcesUtils.getResourcesId(mContext, "xml", resName);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user