Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Baumgart2010-10-26 14:04:48 +0000
committerMatthias Sohn2010-10-26 14:04:48 +0000
commita2fbe60dc043db7ac929f6f7b304a589dca369f3 (patch)
tree516ea66f1f3326fea125d9a495f8d74a07af404f /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history
parentd254add85d6c0c1614523a2f5fb567a5ffb3dec9 (diff)
downloadegit-a2fbe60dc043db7ac929f6f7b304a589dca369f3.tar.gz
egit-a2fbe60dc043db7ac929f6f7b304a589dca369f3.tar.xz
egit-a2fbe60dc043db7ac929f6f7b304a589dca369f3.zip
Remove waitInUI from HistoryViewTest
waitInUI() was removed from HistoryViewTest by joining execution jobs. This improves test performance and stability. Change-Id: I441c12d4ed480e4ae7650314cc4e460c95fc906c Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
index d2328c1c8..0b564e72e 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
@@ -27,6 +27,7 @@ import org.eclipse.egit.ui.JobFamilies;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.test.ContextMenuHelper;
+import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
@@ -81,7 +82,6 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
addAndCommit(addedFile, ADDEDMESSAGE);
// TODO count the commits
commitCount = 3;
- waitInUI();
}
@AfterClass
@@ -228,7 +228,6 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
String commitMessage = "The special commit";
int countBefore = getHistoryViewTable(PROJ1).rowCount();
touchAndSubmit(commitMessage);
- waitInUI();
int countAfter = getHistoryViewTable(PROJ1).rowCount();
assertEquals("Wrong number of entries", countBefore + 1, countAfter);
assertEquals("Wrong comit message", commitMessage,
@@ -284,7 +283,6 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
// for some reason, checkboxwithlabel doesn't seem to work
dialog.bot().checkBox().deselect();
dialog.bot().button(IDialogConstants.FINISH_LABEL).click();
- waitInUI();
assertNotNull(repo.resolve(Constants.R_HEADS + "NewBranch"));
}
@@ -313,7 +311,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
dialog.bot().textWithLabel(UIText.CreateTagDialog_tagMessage)
.setText("New Tag message");
dialog.bot().button(IDialogConstants.OK_LABEL).click();
- waitInUI();
+ TestUtil.joinJobs(JobFamilies.TAG);
assertNotNull(repo.resolve(Constants.R_TAGS + "NewTag"));
}
@@ -338,8 +336,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
ContextMenuHelper.clickContextMenu(table,
UIText.GitHistoryPage_CheckoutMenuLabel);
-
- waitInUI();
+ TestUtil.joinJobs(JobFamilies.CHECKOUT);
assertEquals(commit[0].getId().name(), repo.getBranch());
}

Back to the top