Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Stocker2012-12-07 23:14:55 +0000
committerGerrit Code Review @ Eclipse.org2012-12-22 14:08:19 +0000
commit7ef13fcb1b1cccdbbbd4f9b3f953c52320b97817 (patch)
tree0440f93e445583eac1e9783fee4ae7bc78213f1d /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history
parentb061cc62cc07d474508cc3b00fd8ee5998fe2a51 (diff)
downloadegit-7ef13fcb1b1cccdbbbd4f9b3f953c52320b97817.tar.gz
egit-7ef13fcb1b1cccdbbbd4f9b3f953c52320b97817.tar.xz
egit-7ef13fcb1b1cccdbbbd4f9b3f953c52320b97817.zip
Run "click context menu" synchronously where possible in tests
This could further stabilize some tests, as running the context menu action synchronously makes sure that the action is complete before returning to the caller. The asynchronous variant is still necessary for when more UI interaction is required to complete the action. Change-Id: Id28b4cdc8b7e6ca6e993f736dcf70bb621cd8f0e
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.java6
1 files changed, 3 insertions, 3 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 f38342bbe..326d368d7 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 SAP AG.
+ * Copyright (c) 2010, 2012 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -256,7 +256,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
explorerItem = testUtil.getChildNode(childItem.expand(), path[2]);
}
explorerItem.select();
- ContextMenuHelper.clickContextMenu(projectExplorerTree, "Show In",
+ ContextMenuHelper.clickContextMenuSync(projectExplorerTree, "Show In",
"History");
// join GenerateHistoryJob
Job.getJobManager().join(JobFamilies.GENERATE_HISTORY, null);
@@ -399,7 +399,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
}
});
- ContextMenuHelper.clickContextMenu(table,
+ ContextMenuHelper.clickContextMenuSync(table,
UIText.GitHistoryPage_CheckoutMenuLabel);
TestUtil.joinJobs(JobFamilies.CHECKOUT);
return commit;

Back to the top