Fixed various problems with test
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
index 2ea218b..55319c2 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
@@ -64,11 +64,7 @@
return new TestSuite(YieldTest.class);
// TestSuite suite = new TestSuite();
// for (int i = 0; i < 100; i++) {
- // suite.addTestSuite(YieldTest.class);
- // suite.addTest(new YieldTest("transferRuleToYieldingJobException"));
// suite.addTest(new YieldTest("testYieldJobToJobsInterleaved"));
- // suite.addTest(new YieldTest("testYieldPingPongBetweenMultipleJobs"));
- // suite.addTest(new YieldTest("testParallelYieldPingPongBetweenMultipleJobs"));
// }
// return suite;
}
@@ -122,6 +118,9 @@
barrier2.waitForStatus(TestBarrier.STATUS_START);
try {
yielding.yieldRule(null);
+ } catch (IllegalArgumentException e) {
+ //expected
+ return new Status(IStatus.ERROR, "org.eclipse.core.tests.runtime", "Expected failure");
} finally {
barrier1.setStatus(TestBarrier.STATUS_START);
}
@@ -639,7 +638,6 @@
}
public void testYieldPingPongBetweenMultipleJobs() throws Throwable {
- System.out.println("---");
final TestBarrier barrier = new TestBarrier();
final PathRule rule = new PathRule(getName());
final Object SYNC = new Object();
@@ -882,7 +880,10 @@
} catch (InterruptedException e) {
fail("4.99", e);
}
- waitForJobsCompletion(jobs.toArray(new Job[jobs.size()]), 5000);
+ // long time = -System.currentTimeMillis();
+ waitForJobsCompletion(jobs.toArray(new Job[jobs.size()]), 10000);
+ // time += System.currentTimeMillis();
+ // System.out.println("Waited: " + time);
for (Iterator<Job> job = jobs.iterator(); job.hasNext();) {
Job conflict = job.next();
assertTrue(conflict.getResult().isOK());
