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

Merge "Add test for PendingJobQueue."

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-26 09:38:23 +00:00
committed by Android (Google) Code Review
parent 826fe6ada6 63730ba33c
commit 0345d61b42
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/job/PendingJobQueue.java
View File

@@ -219,6 +219,8 @@ class PendingJobQueue {
ajq.clear();
mAppJobQueuePool.release(ajq);
} else if (prevTimestamp != ajq.peekNextTimestamp()) {
// Removing the job changed the "next timestamp" in the queue, so we need to reinsert
// it to fix the ordering.
mOrderedQueues.remove(ajq);
mOrderedQueues.offer(ajq);
}

26
services/tests/servicestests/src/com/android/server/job/PendingJobQueueTest.java
View File

@@ -201,6 +201,32 @@ public class PendingJobQueueTest {
}
}
assertNull(jobQueue.next());
assertEquals(0, jobQueue.size());
}
@Test
public void testRemove_duringIteration() {
List<JobStatus> jobs = new ArrayList<>();
jobs.add(createJobStatus("testRemove", createJobInfo(1), 1));
jobs.add(createJobStatus("testRemove", createJobInfo(2), 2));
jobs.add(createJobStatus("testRemove", createJobInfo(3).setExpedited(true), 3));
jobs.add(createJobStatus("testRemove", createJobInfo(4), 4));
jobs.add(createJobStatus("testRemove", createJobInfo(5).setExpedited(true), 5));
PendingJobQueue jobQueue = new PendingJobQueue();
jobQueue.addAll(jobs);
ArraySet<JobStatus> removed = new ArraySet<>();
JobStatus job;
jobQueue.resetIterator();
while ((job = jobQueue.next()) != null) {
jobQueue.remove(job);
removed.add(job);
assertFalse("Queue retained a removed job " + testJobToString(job),
jobQueue.contains(job));
}
assertNull(jobQueue.next());
assertEquals(0, jobQueue.size());
}
@Test