Revision 02bb1714
Added by Katja Luther almost 6 years ago
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ProgressMonitorServiceTest.java | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
import org.apache.log4j.Logger; |
| 17 | 17 |
import org.eclipse.core.runtime.NullProgressMonitor; |
| 18 |
import org.eclipse.core.runtime.SubMonitor; |
|
| 18 | 19 |
import org.junit.After; |
| 19 | 20 |
import org.junit.Assert; |
| 20 | 21 |
import org.junit.Test; |
| ... | ... | |
| 63 | 64 |
pollInterval, |
| 64 | 65 |
new MockPostMoniteredOperationEnabled(expectedMonitor, uuid), |
| 65 | 66 |
(IFeedbackGenerator)null, |
| 66 |
new NullProgressMonitor());
|
|
| 67 |
SubMonitor.convert(new NullProgressMonitor()));
|
|
| 67 | 68 |
} |
| 68 | 69 |
|
| 69 | 70 |
@Test |
| ... | ... | |
| 92 | 93 |
pollInterval, |
| 93 | 94 |
new MockPostMoniteredOperationEnabled(expectedMonitor, uuid), |
| 94 | 95 |
(IFeedbackGenerator)null, |
| 95 |
new NullProgressMonitor());
|
|
| 96 |
SubMonitor.convert(new NullProgressMonitor()));
|
|
| 96 | 97 |
if (expectedMonitor.getResult() instanceof UpdateResult){
|
| 97 | 98 |
UpdateResult result = (UpdateResult)expectedMonitor.getResult(); |
| 98 | 99 |
if (!result.getExceptions().contains(ise)){
|
| ... | ... | |
| 125 | 126 |
pollInterval, |
| 126 | 127 |
null, |
| 127 | 128 |
(IFeedbackGenerator)null, |
| 128 |
new NullProgressMonitor());
|
|
| 129 |
SubMonitor.convert(new NullProgressMonitor()));
|
|
| 129 | 130 |
if (expectedMonitor.getResult() instanceof UpdateResult){
|
| 130 | 131 |
UpdateResult result = (UpdateResult)expectedMonitor.getResult(); |
| 131 | 132 |
if (!result.getExceptions().contains(ise)){
|
| ... | ... | |
| 161 | 162 |
expectedMonitor.setResult("Cancelled");
|
| 162 | 163 |
expectedMonitor.setCanceled(true); |
| 163 | 164 |
expectedMonitor.done(); |
| 165 |
SubMonitor subMonitor = SubMonitor.convert(new NullProgressMonitor()); |
|
| 164 | 166 |
|
| 165 | 167 |
Thread thread = new Thread() {
|
| 166 | 168 |
@Override |
| ... | ... | |
| 171 | 173 |
pollInterval, |
| 172 | 174 |
null, |
| 173 | 175 |
(IFeedbackGenerator)null, |
| 174 |
new NullProgressMonitor());
|
|
| 176 |
subMonitor);
|
|
| 175 | 177 |
} catch (InterruptedException e) {
|
| 176 | 178 |
|
| 177 | 179 |
} |
| ... | ... | |
| 203 | 205 |
|
| 204 | 206 |
final UUID uuid = testService.monitLongRunningMethod(null, feedbacks, 0); |
| 205 | 207 |
final int pollInterval = 1000; |
| 206 |
|
|
| 208 |
SubMonitor subMonitor = SubMonitor.convert(new NullProgressMonitor()); |
|
| 207 | 209 |
CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
|
| 208 | 210 |
uuid, |
| 209 | 211 |
pollInterval, |
| 210 | 212 |
new MockPostMoniteredOperationEnabled(expectedMonitor, uuid), |
| 211 | 213 |
feebackGenerators, |
| 212 |
new NullProgressMonitor());
|
|
| 214 |
subMonitor);
|
|
| 213 | 215 |
|
| 214 | 216 |
} |
| 215 | 217 |
|
| ... | ... | |
| 233 | 235 |
feebackGenerators.remove(1); |
| 234 | 236 |
|
| 235 | 237 |
final UUID newUuid = testService.monitLongRunningMethod(null, feedbacks, 0); |
| 236 |
|
|
| 238 |
SubMonitor subMonitor = SubMonitor.convert(new NullProgressMonitor()); |
|
| 237 | 239 |
try {
|
| 238 | 240 |
CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
|
| 239 | 241 |
newUuid, |
| 240 | 242 |
pollInterval, |
| 241 | 243 |
new MockPostMoniteredOperationEnabled(expectedMonitor, newUuid), |
| 242 | 244 |
feebackGenerators, |
| 243 |
new NullProgressMonitor());
|
|
| 245 |
subMonitor);
|
|
| 244 | 246 |
if (expectedMonitor.getResult() instanceof UpdateResult){
|
| 245 | 247 |
UpdateResult result = (UpdateResult)expectedMonitor.getResult(); |
| 246 | 248 |
if (result.getExceptions().isEmpty()){
|
| ... | ... | |
| 273 | 275 |
final UUID uuid = testService.monitLongRunningMethod(null, feedbacks, 1000 * 5); |
| 274 | 276 |
final int pollInterval = 1000; |
| 275 | 277 |
|
| 276 |
|
|
| 278 |
SubMonitor subMonitor = SubMonitor.convert(new NullProgressMonitor()); |
|
| 277 | 279 |
try {
|
| 278 | 280 |
CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
|
| 279 | 281 |
uuid, |
| 280 | 282 |
pollInterval, |
| 281 | 283 |
new MockPostMoniteredOperationEnabled(expectedMonitor, uuid), |
| 282 | 284 |
feebackGenerators, |
| 283 |
new NullProgressMonitor());
|
|
| 285 |
subMonitor);
|
|
| 284 | 286 |
if (expectedMonitor.getResult() instanceof UpdateResult){
|
| 285 | 287 |
UpdateResult result = (UpdateResult)expectedMonitor.getResult(); |
| 286 | 288 |
if (result.getExceptions().isEmpty()){
|
Also available in: Unified diff
fix progressmonitor tests