import eu.etaxonomy.cdm.api.application.CdmApplicationState;
import eu.etaxonomy.cdm.api.service.IProgressMonitorService;
import eu.etaxonomy.cdm.api.service.ITestService;
+import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
import eu.etaxonomy.cdm.common.monitor.RemotingProgressMonitor;
import eu.etaxonomy.taxeditor.httpinvoker.RemotingSessionAwareTest;
new MockPostMoniteredOperationEnabled(expectedMonitor, uuid),
(IFeedbackGenerator)null,
new NullProgressMonitor());
- Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ if (expectedMonitor.getResult() instanceof UpdateResult){
+ UpdateResult result = (UpdateResult)expectedMonitor.getResult();
+ if (!result.getExceptions().contains(ise)){
+ Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ }
+ }
+// Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
} catch(IllegalStateException e) {
}
null,
(IFeedbackGenerator)null,
new NullProgressMonitor());
- Assert.fail("InterruptedException wrapped in an IllegalStateException should be thrown");
+ if (expectedMonitor.getResult() instanceof UpdateResult){
+ UpdateResult result = (UpdateResult)expectedMonitor.getResult();
+ if (!result.getExceptions().contains(ise)){
+ Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ }
+ }
+// Assert.fail("InterruptedException wrapped in an IllegalStateException should be thrown");
} catch (InterruptedException e) {
} catch (IllegalStateException e) {
new MockPostMoniteredOperationEnabled(expectedMonitor, newUuid),
feebackGenerators,
new NullProgressMonitor());
- Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ if (expectedMonitor.getResult() instanceof UpdateResult){
+ UpdateResult result = (UpdateResult)expectedMonitor.getResult();
+ if (result.getExceptions().isEmpty()){
+ Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ }
+ }
+// Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
} catch(IllegalStateException ise) {
}
new MockPostMoniteredOperationEnabled(expectedMonitor, uuid),
feebackGenerators,
new NullProgressMonitor());
- Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ if (expectedMonitor.getResult() instanceof UpdateResult){
+ UpdateResult result = (UpdateResult)expectedMonitor.getResult();
+ if (result.getExceptions().isEmpty()){
+ Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
+ }
+ }
+// Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
} catch(IllegalStateException ise) {
}