Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite JobTest#testSetProgressGroup #1026 #1040

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Rewrite JobTest#testSetProgressGroup #1026 #1040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 65 additions & 18 deletions ...tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,13 +1591,70 @@ public void testSetPriority() {
}
}

/**
* Tests the API methods Job.setProgressGroup
*/
@Test
public void testSetProgressGroup() {
public void testSetProgressGroup_withNullGroup() {
assertThrows(RuntimeException.class,
() -> new TestJob("testSetProgressGroup_withNullGroup").setProgressGroup(null, 5));
}

@Test
public void testSetProgressGroup_withProperGroup() throws InterruptedException {
Job job = new TestJob("testSetProgressGroup_withProperGroup") {
@Override
public IStatus run(IProgressMonitor monitor) {
monitor.setCanceled(true);
return super.run(monitor);
}
};
IProgressMonitor group = Job.getJobManager().createProgressGroup();
group.beginTask("Group task name", 10);
job.setProgressGroup(group, 0);
job.schedule();
job.join();
assertThat("job progress has not been reported to group monitor", group.isCanceled());
group.done();
}

@Test
public void testSetProgressGroup_ignoreWhileWaiting() throws InterruptedException {
Job job = new TestJob("testSetProgressGroup_ignoreWhileWaiting") {
@Override
public IStatus run(IProgressMonitor monitor) {
monitor.setCanceled(true);
return super.run(monitor);
}
};
IProgressMonitor group = Job.getJobManager().createProgressGroup();
job.schedule(10000); // put job to waiting state
job.setProgressGroup(group, 0);
job.wakeUp();
job.join();
assertThat("job progress has unexpectedly been reported to group monitor", !group.isCanceled());
}

@Test
public void testSetProgressGroup_ignoreWhileRunning() throws InterruptedException {
TestBarrier2 barrier = new TestBarrier2();
Job job = new TestJob("testSetProgressGroup_ignoreWhileRunning") {
@Override
public IStatus run(IProgressMonitor monitor) {
barrier.upgradeTo(TestBarrier2.STATUS_RUNNING);
monitor.setCanceled(true);
return super.run(monitor);
}
};
IProgressMonitor group = Job.getJobManager().createProgressGroup();
job.schedule();
barrier.waitForStatus(TestBarrier2.STATUS_RUNNING);
job.setProgressGroup(group, 0);
job.join();
assertThat("job progress has unexpectedly been reported to group monitor", !group.isCanceled());
}

@Test
public void testSetProgressGroup_cancellationPropagatedToMonitor() {
final TestBarrier2 barrier = new TestBarrier2();
Job job = new Job("testSetProgressGroup") {
Job job = new Job("testSetProgressGroup_cancellationStillWorks") {
@Override
protected IStatus run(IProgressMonitor monitor) {
barrier.setStatus(TestBarrier2.STATUS_RUNNING);
Expand All @@ -1608,25 +1665,15 @@ protected IStatus run(IProgressMonitor monitor) {
return Status.OK_STATUS;
}
};
//null group
assertThrows(RuntimeException.class, () -> job.setProgressGroup(null, 5));
IProgressMonitor group = Job.getJobManager().createProgressGroup();
group.beginTask("Group task name", 10);
job.setProgressGroup(group, 5);

//ignore changes to group while waiting or running
job.schedule(100);
job.setProgressGroup(group, 0);
//wait until job starts and try to set the progress group
job.schedule();
barrier.waitForStatus(TestBarrier2.STATUS_RUNNING);
job.setProgressGroup(group, 0);

//ensure cancelation still works
job.cancel();
barrier.setStatus(TestBarrier2.STATUS_WAIT_FOR_DONE);
waitForState(job, Job.NONE);
assertEquals("1.0", IStatus.CANCEL, job.getResult().getSeverity());
group.done();
assertThat("job progress has not been reported to group monitor", group.isCanceled());
assertEquals("job was unexpectedly not canceled", IStatus.CANCEL, job.getResult().getSeverity());
}

@Test
Expand Down
Loading