diff options
| author | Robin Stocker | 2013-01-05 12:41:16 +0000 |
|---|---|---|
| committer | Robin Stocker | 2013-01-05 12:41:16 +0000 |
| commit | e99af700b9a0874d41fca8807fab1f2888e60b5d (patch) | |
| tree | c6b92e2c550c4517d7a2aa08da391017ead8d3bc /org.eclipse.egit.ui.test/src | |
| parent | 7ffb222124380f8205df316ac145ca6e05d1cd1c (diff) | |
| download | egit-e99af700b9a0874d41fca8807fab1f2888e60b5d.tar.gz egit-e99af700b9a0874d41fca8807fab1f2888e60b5d.tar.xz egit-e99af700b9a0874d41fca8807fab1f2888e60b5d.zip | |
Wait for index diff cache before calling merge tool in UI test
In I9e14c491254ea1927c4b57989e8282d657945685, MergeToolActionHandler was
changed to use the IndexDiffCache for enablement. So wait for that
before trying to use the action.
Change-Id: Ia122184c482e37bb8486221fbbd12814b336581b
Diffstat (limited to 'org.eclipse.egit.ui.test/src')
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/MergeToolTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/MergeToolTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/MergeToolTest.java index 5543b3bd18..5aa20b2fca 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/MergeToolTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/MergeToolTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2012, Robin Stocker <robin@nibor.org> + * Copyright (C) 2012, 2013 Robin Stocker <robin@nibor.org> * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -16,10 +16,12 @@ import java.io.File; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.egit.core.JobFamilies; import org.eclipse.egit.core.op.MergeOperation; 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.api.MergeResult; import org.eclipse.jgit.api.MergeResult.MergeStatus; @@ -70,6 +72,8 @@ public class MergeToolTest extends LocalRepositoryTestCase { assertThat(mergeResult.getConflicts().keySet(), hasItem(path.toString())); + TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE); + SWTBotTree packageExplorer = bot .viewById("org.eclipse.jdt.ui.PackageExplorer").bot().tree(); SWTBotTreeItem project1 = getProjectItem(packageExplorer, PROJ1) |