Renamed job tests package
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
index 3344e7b..ee6f06a 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
@@ -39,7 +39,7 @@
suite.addTest(ConfigurationElementModelTest.suite());
suite.addTest(org.eclipse.core.tests.internal.plugins.AllTests.suite());
suite.addTest(org.eclipse.core.tests.internal.registrycache.AllTests.suite());
- suite.addTest(org.eclipse.core.tests.runtime.locks.AllTests.suite());
+ suite.addTest(org.eclipse.core.tests.runtime.jobs.AllTests.suite());
return suite;
}
}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java
similarity index 94%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/AllTests.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java
index bf8ce4a..c1d6e39 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import junit.framework.*;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/FussyProgressProvider.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java
similarity index 96%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/FussyProgressProvider.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java
index e17015e..e8fde71 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/FussyProgressProvider.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/IJobManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
similarity index 95%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/IJobManagerTest.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
index e13db63..a74f482 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/IJobManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import java.util.*;
@@ -124,12 +124,15 @@
int[] sleepTimes = new int[] {0, 10, 50, 100, 500, 1000, 2000, 2500};
for (int i = 0; i < sleepTimes.length; i++) {
long start = System.currentTimeMillis();
- new TestJob("Noop", 0, 0).schedule(sleepTimes[i]);
+ TestJob job = new TestJob("Noop", 0, 0);
+ assertEquals("1.0", 0, job.getRunCount());
+ job.schedule(sleepTimes[i]);
waitForCompletion();
+ assertEquals("1.1", 1, job.getRunCount());
long duration = System.currentTimeMillis() - start;
- assertTrue("1.0: duration: " + duration + " sleep: " + sleepTimes[i], duration >= sleepTimes[i]);
+ assertTrue("1.2: duration: " + duration + " sleep: " + sleepTimes[i], duration >= sleepTimes[i]);
//a no-op job shouldn't take any real time
- assertTrue("1.1: duration: " + duration + " sleep: " + sleepTimes[i], duration < sleepTimes[i] + 1000);
+ assertTrue("1.3: duration: " + duration + " sleep: " + sleepTimes[i], duration < sleepTimes[i] + 1000);
}
}
public void testSimple() {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/IdentityRule.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java
similarity index 95%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/IdentityRule.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java
index eeb248e..5c82417 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/IdentityRule.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/JobQueueTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java
similarity index 98%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/JobQueueTest.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java
index f29144d..fd4faf7 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/JobQueueTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import junit.framework.TestCase;
import org.eclipse.core.internal.jobs.InternalJob;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/OrderedLockTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java
similarity index 97%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/OrderedLockTest.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java
index 72fbab9..abca5dd 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/OrderedLockTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/TestJob.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestJob.java
similarity index 88%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/TestJob.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestJob.java
index 43bde74..edf0a8e 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/TestJob.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestJob.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -21,6 +21,7 @@
private String name;
private int ticks;
private int tickLength;
+ private int runCount = 0;
public TestJob(String name) {
this(name, 10, 100);
}
@@ -29,8 +30,14 @@
this.ticks = ticks;
this.tickLength = tickLength;
}
-
+ /**
+ * Returns the number of times this job instance has been run.
+ */
+ public int getRunCount() {
+ return runCount;
+ }
public IStatus run(IProgressMonitor monitor) {
+ runCount++;
//must have positive work
monitor.beginTask(name, ticks <= 0 ? 1 : ticks);
try {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/TestRunnable.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestRunnable.java
similarity index 94%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/TestRunnable.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestRunnable.java
index e95be55..40420c2 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/TestRunnable.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestRunnable.java
@@ -1,4 +1,4 @@
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import java.util.Random;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/VerboseJobListener.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java
similarity index 96%
rename from tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/VerboseJobListener.java
rename to tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java
index 104502e..99d7faa 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/locks/VerboseJobListener.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java
@@ -7,7 +7,7 @@
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
-package org.eclipse.core.tests.runtime.locks;
+package org.eclipse.core.tests.runtime.jobs;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
