Populate Enterprise Privacy Settings page - batch 2

This CL adds the second batch of items to the Privacy Settings page.

These are all the remaining items that fall into the "What types of
information can your organization see?" category.

Test: make RunSettingsRoboTests
Bug: 32692748
Change-Id: I08569646ed6bb6f5d9d6d65ed2718be8456f50ae
This commit is contained in:
Bartosz Fabianowski
2016-11-28 21:13:30 +01:00
parent 51ecc5eced
commit 2e0b608495
20 changed files with 650 additions and 16 deletions

View File

@@ -0,0 +1,69 @@
/*
* Copyright (C) 2016 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.enterprise;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
/**
* Tests for {@link AdminActionPreferenceControllerBase}.
*/
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AdminActionPreferenceControllerBaseTest extends
AdminActionPreferenceControllerTestBase {
private Date mDate;
@Override
public void setUp() {
super.setUp();
mController = new AdminActionPreferenceControllerBaseTestable();
}
@Override
public void setDate(Date date) {
mDate = date;
}
@Override
public String getPreferenceKey() {
return null;
}
private class AdminActionPreferenceControllerBaseTestable extends
AdminActionPreferenceControllerBase {
AdminActionPreferenceControllerBaseTestable() {
super(mContext);
}
@Override
protected Date getAdminActionTimestamp() {
return mDate;
}
@Override
public String getPreferenceKey() {
return null;
}
}
}

View File

@@ -0,0 +1,94 @@
/*
* Copyright (C) 2016 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.enterprise;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.text.format.DateUtils;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.util.Date;
import java.util.GregorianCalendar;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
/**
* Common base for testing subclasses of {@link AdminActionPreferenceControllerBase}.
*/
public abstract class AdminActionPreferenceControllerTestBase {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
protected Context mContext;
protected FakeFeatureFactory mFeatureFactory;
protected AdminActionPreferenceControllerBase mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
}
protected abstract void setDate(Date date);
@Test
public void testUpdateState() {
final Preference preference = new Preference(mContext, null, 0, 0);
when(mContext.getString(R.string.enterprise_privacy_never)).thenReturn("Never");
Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24, "24");
setDate(null);
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("Never");
final Date date = new GregorianCalendar(2011 /* year */, 10 /* month */, 9 /* dayOfMonth */,
8 /* hourOfDay */, 7 /* minute */, 6 /* second */).getTime();
setDate(date);
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo(DateUtils.formatDateTime(
mContext, date.getTime(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE));
}
@Test
public void testIsAvailable() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void testHandlePreferenceTreeClick() {
assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
.isFalse();
}
public abstract String getPreferenceKey();
@Test
public void testGetPreferenceKey() {
assertThat(mController.getPreferenceKey()).isEqualTo(getPreferenceKey());
}
}

View File

@@ -0,0 +1,54 @@
/*
* Copyright (C) 2016 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.enterprise;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static org.mockito.Mockito.when;
/**
* Tests for {@link BugReportsPreferenceController}.
*/
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class BugReportsPreferenceControllerTest extends
AdminActionPreferenceControllerTestBase {
@Override
public void setUp() {
super.setUp();
mController = new BugReportsPreferenceController(mContext);
}
@Override
public void setDate(Date date) {
when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastBugReportRequestTime())
.thenReturn(date);
}
@Override
public String getPreferenceKey() {
return "bug_reports";
}
}

View File

@@ -23,6 +23,7 @@ import android.content.pm.PackageManager;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,6 +31,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import java.util.Date;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
@@ -41,6 +44,7 @@ import static org.mockito.Mockito.when;
public final class EnterprisePrivacyFeatureProviderImplTest {
private final ComponentName DEVICE_OWNER = new ComponentName("dummy", "component");
private final Date TIMESTAMP = new Date(2011, 11, 11);
private @Mock DevicePolicyManagerWrapper mDevicePolicyManager;
private @Mock PackageManagerWrapper mPackageManager;
@@ -65,4 +69,32 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(DEVICE_OWNER);
assertThat(mProvider.hasDeviceOwner()).isTrue();
}
@Test
public void testGetLastSecurityLogRetrievalTime() {
when(mDevicePolicyManager.getLastSecurityLogRetrievalTime()).thenReturn(-1L);
assertThat(mProvider.getLastSecurityLogRetrievalTime()).isNull();
when(mDevicePolicyManager.getLastSecurityLogRetrievalTime())
.thenReturn(TIMESTAMP.getTime());
assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(TIMESTAMP);
}
@Test
public void testGetLastBugReportRequestTime() {
when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(-1L);
assertThat(mProvider.getLastBugReportRequestTime()).isNull();
when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(TIMESTAMP.getTime());
assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(TIMESTAMP);
}
@Test
public void testGetLastNetworkLogRetrievalTime() {
when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(-1L);
assertThat(mProvider.getLastNetworkLogRetrievalTime()).isNull();
when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(TIMESTAMP.getTime());
assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(TIMESTAMP);
}
}

View File

@@ -73,7 +73,10 @@ public final class EnterprisePrivacySettingsTest {
final List<PreferenceController> controllers = mSettings.getPreferenceControllers(
ShadowApplication.getInstance().getApplicationContext());
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1);
assertThat(controllers.size()).isEqualTo(4);
assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class);
assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class);
assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class);
assertThat(controllers.get(3)).isInstanceOf(SecurityLogsPreferenceController.class);
}
}

View File

@@ -73,7 +73,8 @@ public final class InstalledPackagesPreferenceControllerTest {
return null;
}}).when(mFeatureFactory.applicationFeatureProvider)
.calculateNumberOfInstalledApps(anyObject());
when(mContext.getResources().getQuantityString(R.plurals.number_installed_packages, 20, 20))
when(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_installed_packages, 20, 20))
.thenReturn("20 packages");
mController.updateState(preference);
assertThat(preference.getTitle()).isEqualTo("20 packages");

View File

@@ -0,0 +1,54 @@
/*
* Copyright (C) 2016 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.enterprise;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static org.mockito.Mockito.when;
/**
* Tests for {@link NetworkLogsPreferenceController}.
*/
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class NetworkLogsPreferenceControllerTest extends
AdminActionPreferenceControllerTestBase {
@Override
public void setUp() {
super.setUp();
mController = new NetworkLogsPreferenceController(mContext);
}
@Override
public void setDate(Date date) {
when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastNetworkLogRetrievalTime())
.thenReturn(date);
}
@Override
public String getPreferenceKey() {
return "network_logs";
}
}

View File

@@ -0,0 +1,54 @@
/*
* Copyright (C) 2016 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.enterprise;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static org.mockito.Mockito.when;
/**
* Tests for {@link SecurityLogsPreferenceController}.
*/
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class SecurityLogsPreferenceControllerTest extends
AdminActionPreferenceControllerTestBase {
@Override
public void setUp() {
super.setUp();
mController = new SecurityLogsPreferenceController(mContext);
}
@Override
public void setDate(Date date) {
when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastSecurityLogRetrievalTime())
.thenReturn(date);
}
@Override
public String getPreferenceKey() {
return "security_logs";
}
}