Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2016-01-07 15:54:45 +0000
committerAndrey Loskutov2016-01-07 15:56:21 +0000
commitc48fcea1d56d36b92ffdb95e6adcf7ee071bb137 (patch)
tree06091f1f4bc7d6859f000db8be4518780ead479c /org.eclipse.egit.core.test
parent133e716fbdf28b199d78e4016748a541aed28434 (diff)
downloadegit-c48fcea1d56d36b92ffdb95e6adcf7ee071bb137.tar.gz
egit-c48fcea1d56d36b92ffdb95e6adcf7ee071bb137.tar.xz
egit-c48fcea1d56d36b92ffdb95e6adcf7ee071bb137.zip
TestUtils.waitForJobs() arguments from core should match those from ui
Change-Id: I9cde928cfd84cd599d72729f89caf471d83e9522 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/GitMoveDeleteHookTest.java4
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/GitMoveDeleteHookTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/GitMoveDeleteHookTest.java
index 389d0476f0..a3e16f37c3 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/GitMoveDeleteHookTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/GitMoveDeleteHookTest.java
@@ -160,11 +160,11 @@ public class GitMoveDeleteHookTest {
assertNotNull(dirCache.getEntry("file2.txt"));
// Modify the content before the move
testUtils.changeContentOfFile(project.getProject(), file, "other text");
- testUtils.waitForJobs(10000, 1000, JobFamilies.INDEX_DIFF_CACHE_UPDATE);
+ testUtils.waitForJobs(1000, 10000, JobFamilies.INDEX_DIFF_CACHE_UPDATE);
file.delete(true, null);
- testUtils.waitForJobs(10000, 1000, JobFamilies.INDEX_DIFF_CACHE_UPDATE);
+ testUtils.waitForJobs(1000, 10000, JobFamilies.INDEX_DIFF_CACHE_UPDATE);
// Check index for the deleted file
dirCache.read();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java
index 20654bb470..bd3af8306c 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java
@@ -315,7 +315,7 @@ public class TestUtils {
*/
public void waitForJobs(long maxWaitTime, Object family)
throws InterruptedException {
- waitForJobs(maxWaitTime, 50, family);
+ waitForJobs(50, maxWaitTime, family);
}
/**
@@ -325,9 +325,10 @@ public class TestUtils {
* @param maxWaitTime
* @param minWaitTime
* @param family
+ * can be null which means all job families
* @throws InterruptedException
*/
- public void waitForJobs(long maxWaitTime, long minWaitTime, Object family)
+ public void waitForJobs(long minWaitTime, long maxWaitTime, Object family)
throws InterruptedException {
Thread.sleep(minWaitTime);
long start = System.currentTimeMillis();

Back to the top