diff --git a/plugins/org.eclipse.dd.tests.dsf/src/org/eclipse/dd/tests/dsf/concurrent/DsfSequenceProgressTests.java b/plugins/org.eclipse.dd.tests.dsf/src/org/eclipse/dd/tests/dsf/concurrent/DsfSequenceProgressTests.java index 2d1d1ece7e5..4a2f6937158 100644 --- a/plugins/org.eclipse.dd.tests.dsf/src/org/eclipse/dd/tests/dsf/concurrent/DsfSequenceProgressTests.java +++ b/plugins/org.eclipse.dd.tests.dsf/src/org/eclipse/dd/tests/dsf/concurrent/DsfSequenceProgressTests.java @@ -64,13 +64,13 @@ public class DsfSequenceProgressTests { @Override public int getTicks() { - return 3; + return 4; } @Override public void execute(RequestMonitor requestMonitor) { stepCounter.fInteger++; - sleep(getTicks(), null, null); + sleep(getTicks(), requestMonitor, null); requestMonitor.done(); } @@ -89,7 +89,7 @@ public class DsfSequenceProgressTests { @Override public int getTicks() { - return 12; + return 4; } @Override @@ -97,8 +97,8 @@ public class DsfSequenceProgressTests { stepCounter.fInteger++; // step has its own sub-progress ticks. - pm.beginTask(getTaskName() + ": ", 6); - sleep(6, rm, pm); + pm.beginTask(getTaskName() + ": ", getTicks()); + sleep(getTicks(), rm, pm); rm.done(); pm.done(); @@ -234,6 +234,10 @@ public class DsfSequenceProgressTests { return; } } + + if (rm != null && rm.isCanceled()) { + return; + } } } catch (InterruptedException e) {