Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite some code using VersionedPackage#equals (1/n)

Browse Source 
Bug: 147068562
Test: atest RollbackStoreTest
Change-Id: Ib5aa776397f4b90fe85b172c6f6b647907a6087f
This commit is contained in:
JW Wang
2020-01-02 09:16:58 +08:00
parent 41c017e09c
commit f73f94a876
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java
View File

@@ -53,8 +53,7 @@ public class RollbackStoreTest {
if (a == null || b == null) {
return a == b;
}
return a.getLongVersionCode() == b.getLongVersionCode()
&& Objects.equals(a.getPackageName(), b.getPackageName());
return a.equals(b);
}
@Override
@@ -298,15 +297,8 @@ public class RollbackStoreTest {
private void assertPackageRollbacksAreEquivalent(PackageRollbackInfo b, PackageRollbackInfo a) {
assertThat(b.getPackageName()).isEqualTo(a.getPackageName());
assertThat(b.getVersionRolledBackFrom().getLongVersionCode())
.isEqualTo(a.getVersionRolledBackFrom().getLongVersionCode());
assertThat(b.getVersionRolledBackFrom().getPackageName())
.isEqualTo(a.getVersionRolledBackFrom().getPackageName());
assertThat(b.getVersionRolledBackTo().getLongVersionCode())
.isEqualTo(a.getVersionRolledBackTo().getLongVersionCode());
assertThat(b.getVersionRolledBackTo().getPackageName())
.isEqualTo(a.getVersionRolledBackTo().getPackageName());
assertThat(b.getVersionRolledBackFrom()).isEqualTo(a.getVersionRolledBackFrom());
assertThat(b.getVersionRolledBackTo()).isEqualTo(a.getVersionRolledBackTo());
assertThat(b.getPendingBackups().toArray()).isEqualTo(a.getPendingBackups().toArray());