Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/StageUnstageActionTest.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/StageUnstageActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/StageUnstageActionTest.java
index 5f28c01d31..0b5ced7b71 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/StageUnstageActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/StageUnstageActionTest.java
@@ -7,6 +7,8 @@
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
+import static org.eclipse.egit.ui.JobFamilies.ADD_TO_INDEX;
+import static org.eclipse.egit.ui.JobFamilies.REMOVE_FROM_INDEX;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -100,6 +102,7 @@ public class StageUnstageActionTest extends LocalRepositoryTestCase {
util.getProjectItems(projectExplorerTree, PROJ_A)[0].select();
ContextMenuHelper.clickContextMenuSync(projectExplorerTree, "Team",
addToIndexLabel);
+ TestUtil.joinJobs(ADD_TO_INDEX);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
// Verify file got staged
verifyStaging(PROJ_A, filePath, true);
@@ -110,6 +113,7 @@ public class StageUnstageActionTest extends LocalRepositoryTestCase {
"Team", addToIndexLabel));
ContextMenuHelper.clickContextMenuSync(projectExplorerTree, "Team",
removeFromIndexLabel);
+ TestUtil.joinJobs(REMOVE_FROM_INDEX);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
// Verify file is unstaged again
verifyStaging(PROJ_A, filePath, false);
@@ -130,6 +134,7 @@ public class StageUnstageActionTest extends LocalRepositoryTestCase {
// Add to index
ContextMenuHelper.clickContextMenuSync(projectExplorerTree, "Team",
addToIndexLabel);
+ TestUtil.joinJobs(ADD_TO_INDEX);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
// Verify both files got staged
verifyStaging(PROJ_A, filePath, true);
@@ -139,6 +144,7 @@ public class StageUnstageActionTest extends LocalRepositoryTestCase {
// Remove from index
ContextMenuHelper.clickContextMenuSync(projectExplorerTree, "Team",
removeFromIndexLabel);
+ TestUtil.joinJobs(REMOVE_FROM_INDEX);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
// Verify both files got unstaged
verifyStaging(PROJ_A, filePath, false);

Back to the top