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

Merge "Hide potentially invisible DO Disclosures by default"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-24 15:26:45 +00:00
committed by Android (Google) Code Review
parent 169ab400a4 9290184ebf
commit 38931ed7c1
13 changed files with 145 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
View File

@@ -21,11 +21,14 @@ import android.content.Context;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static com.google.common.truth.Truth.assertThat;
/**
* Tests for {@link AdminActionPreferenceControllerBase}.
*/
@@ -47,6 +50,11 @@ public final class AdminActionPreferenceControllerBaseTest extends
mDate = date;
}
@Test
public void testIsAvailable() {
assertThat(mController.isAvailable()).isTrue();
}
@Override
public String getPreferenceKey() {
return null;

7
tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
View File

@@ -20,11 +20,13 @@ import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
/**
@@ -47,6 +49,11 @@ public final class BugReportsPreferenceControllerTest extends
.thenReturn(date);
}
@Test
public void testIsAvailable() {
assertThat(mController.isAvailable()).isTrue();
}
@Override
public String getPreferenceKey() {
return "bug_reports";

18
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -176,6 +176,24 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(TIMESTAMP);
}
@Test
public void testIsSecurityLoggingEnabled() {
when(mDevicePolicyManager.isSecurityLoggingEnabled(null)).thenReturn(false);
assertThat(mProvider.isSecurityLoggingEnabled()).isFalse();
when(mDevicePolicyManager.isSecurityLoggingEnabled(null)).thenReturn(true);
assertThat(mProvider.isSecurityLoggingEnabled()).isTrue();
}
@Test
public void testIsNetworkLoggingEnabled() {
when(mDevicePolicyManager.isNetworkLoggingEnabled(null)).thenReturn(false);
assertThat(mProvider.isNetworkLoggingEnabled()).isFalse();
when(mDevicePolicyManager.isNetworkLoggingEnabled(null)).thenReturn(true);
assertThat(mProvider.isNetworkLoggingEnabled()).isTrue();
}
@Test
public void testIsAlwaysOnVpnSetInPrimaryUser() {
when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID)).thenReturn(null);

18
tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
View File

@@ -20,11 +20,13 @@ import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
/**
@@ -47,6 +49,22 @@ public final class NetworkLogsPreferenceControllerTest extends
.thenReturn(date);
}
@Test
public void testIsAvailable() {
setDate(null);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isNetworkLoggingEnabled())
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
setDate(new Date());
assertThat(mController.isAvailable()).isTrue();
setDate(null);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isNetworkLoggingEnabled())
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Override
public String getPreferenceKey() {
return "network_logs";

18
tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
View File

@@ -20,11 +20,13 @@ import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import java.util.Date;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
/**
@@ -47,6 +49,22 @@ public final class SecurityLogsPreferenceControllerTest extends
.thenReturn(date);
}
@Test
public void testIsAvailable() {
setDate(null);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isSecurityLoggingEnabled())
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
setDate(new Date());
assertThat(mController.isAvailable()).isTrue();
setDate(null);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isSecurityLoggingEnabled())
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Override
public String getPreferenceKey() {
return "security_logs";