Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0345d61b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add test for PendingJobQueue."

parents 826fe6ad 63730ba3

apex/jobscheduler/service/java/com/android/server/job/PendingJobQueue.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

        }

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

+26 −0
Original line number Diff line number Diff line
@@ -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