From b4e7f6f7d4f87b4845e0e6948fad2bed886bc9fe Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Mon, 23 May 2022 12:32:51 -0700 Subject: Fix JobStoreTest after adding defensive copy to NetworkRequest.Builder JobStatus.createFromJobInfo() uses the NetworkRequest.Builder(NetworkRequest) API, which previously failed to create a copy of the passed NetworkRequest. This means, that up until now, SOME_UID was not only set on the second job status, but also on the first, as the NetworkRequest used came from first.getRequiredNetwork(). Since JobStatus changes the JobInfo object, the second JobInfo object should be compared a a JobInfo object that has also been changed by JobStatus in the same way. Test: atest JobStoreTest Bug: 233580437 Change-Id: Ic4584575e2bc092c49b7b9ecb9b115da189bdfed --- .../servicestests/src/com/android/server/job/JobStoreTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java b/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java index 8eb3cf3ca418..388c29c82106 100644 --- a/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java @@ -475,15 +475,16 @@ public class JobStoreTest { * Helper function to kick a {@link JobInfo} through a persistence cycle and * assert that it's unchanged. */ - private void assertPersistedEquals(JobInfo first) throws Exception { + private void assertPersistedEquals(JobInfo firstInfo) throws Exception { mTaskStoreUnderTest.clear(); - mTaskStoreUnderTest.add(JobStatus.createFromJobInfo(first, SOME_UID, null, -1, null)); + JobStatus first = JobStatus.createFromJobInfo(firstInfo, SOME_UID, null, -1, null); + mTaskStoreUnderTest.add(first); waitForPendingIo(); final JobSet jobStatusSet = new JobSet(); mTaskStoreUnderTest.readJobMapFromDisk(jobStatusSet, true); final JobStatus second = jobStatusSet.getAllJobs().iterator().next(); - assertTasksEqual(first, second.getJob()); + assertTasksEqual(first.getJob(), second.getJob()); } /** -- cgit v1.2.3-59-g8ed1b