Use migrated severity levels

Bug: 225388845
Test: atest SettingsUnitTests
Change-Id: I8e7f06dc8fa7c96c14de738e19dee11ec967bb0c
This commit is contained in:
Giulio Fiscella
2022-03-24 16:52:29 +00:00
parent 6141b22325
commit 2a775c69fc
4 changed files with 20 additions and 23 deletions

View File

@@ -40,7 +40,6 @@ import android.hardware.fingerprint.FingerprintManager;
import android.os.UserHandle;
import android.safetycenter.SafetyEvent;
import android.safetycenter.SafetySourceData;
import android.safetycenter.SafetySourceSeverity;
import android.safetycenter.SafetySourceStatus;
import androidx.test.core.app.ApplicationProvider;
@@ -442,7 +441,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_INFORMATION);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_INFORMATION);
}
@Test
@@ -460,7 +459,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_INFORMATION);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_INFORMATION);
}
@Test
@@ -478,7 +477,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_UNSPECIFIED);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED);
}
@Test
@@ -495,7 +494,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_INFORMATION);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_INFORMATION);
}
@Test
@@ -512,7 +511,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_UNSPECIFIED);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED);
}
@Test
@@ -529,7 +528,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_INFORMATION);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_INFORMATION);
}
@Test
@@ -546,7 +545,7 @@ public class BiometricsSafetySourceTest {
any(), eq(BiometricsSafetySource.SAFETY_SOURCE_ID), captor.capture(), any());
SafetySourceStatus safetySourceStatus = captor.getValue().getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_UNSPECIFIED);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED);
}
private void assertSafetySourceDisabledDataSetWithSingularSummary(String expectedTitleResName,
@@ -606,7 +605,7 @@ public class BiometricsSafetySourceTest {
assertThat(safetySourceStatus.getSummary().toString()).isEqualTo(expectedSummary);
assertThat(safetySourceStatus.isEnabled()).isFalse();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_UNSPECIFIED);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED);
final Intent clickIntent = safetySourceStatus.getPendingIntent().getIntent();
assertThat(clickIntent).isNotNull();

View File

@@ -32,7 +32,6 @@ import android.content.Intent;
import android.safetycenter.SafetyEvent;
import android.safetycenter.SafetySourceData;
import android.safetycenter.SafetySourceIssue;
import android.safetycenter.SafetySourceSeverity;
import android.safetycenter.SafetySourceStatus;
import android.safetycenter.SafetySourceStatus.IconAction;
@@ -179,7 +178,7 @@ public class LockScreenSafetySourceTest {
SafetySourceStatus safetySourceStatus = safetySourceData.getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_INFORMATION);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_INFORMATION);
}
@Test
@@ -200,7 +199,7 @@ public class LockScreenSafetySourceTest {
SafetySourceStatus safetySourceStatus = safetySourceData.getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_RECOMMENDATION);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_RECOMMENDATION);
}
@Test
@@ -221,7 +220,7 @@ public class LockScreenSafetySourceTest {
SafetySourceStatus safetySourceStatus = safetySourceData.getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_UNSPECIFIED);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED);
}
@Test
@@ -242,7 +241,7 @@ public class LockScreenSafetySourceTest {
SafetySourceStatus safetySourceStatus = safetySourceData.getStatus();
assertThat(safetySourceStatus.getSeverityLevel())
.isEqualTo(SafetySourceSeverity.LEVEL_UNSPECIFIED);
.isEqualTo(SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED);
}
@Test
@@ -289,7 +288,8 @@ public class LockScreenSafetySourceTest {
assertThat(issue.getSummary().toString()).isEqualTo(
ResourcesUtils.getResourcesString(mApplicationContext,
"no_screen_lock_issue_summary"));
assertThat(issue.getSeverityLevel()).isEqualTo(SafetySourceSeverity.LEVEL_RECOMMENDATION);
assertThat(issue.getSeverityLevel()).isEqualTo(
SafetySourceData.SEVERITY_LEVEL_RECOMMENDATION);
assertThat(issue.getIssueTypeId()).isEqualTo(
LockScreenSafetySource.NO_SCREEN_LOCK_ISSUE_TYPE_ID);
assertThat(issue.getIssueCategory()).isEqualTo(SafetySourceIssue.ISSUE_CATEGORY_DEVICE);