Stabilize GitRepositoriesViewTagHandlingTest

Remove waitInUI by joining execution jobs.

Change-Id: I39dafaa0e5016507ab511645f739926e3dc0d348
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

2 files changed, 8 insertions, 7 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java
index b973cad214..cd1d12a1d7 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java
@@ -23,6 +23,7 @@ import org.eclipse.egit.ui.Activator;
 import org.eclipse.egit.ui.JobFamilies;
 import org.eclipse.egit.ui.UIText;
 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.ObjectId;
@@ -88,8 +89,9 @@ public class GitRepositoriesViewTagHandlingTest extends
 		String newObject = getObjectIdOfCommit();
 		createTag("SecondTag", "The second tag");
 		refreshAndWait();
-		SWTBotTreeItem[] items = myRepoViewUtil.getTagsItem(tree,
-				repositoryFile).expand().getItems();
+		SWTBotTreeItem tagsItem = myRepoViewUtil.getTagsItem(tree,
+				repositoryFile).expand();
+		SWTBotTreeItem[] items = tagsItem.getItems();
 		assertEquals("Wrong number of tags", initialCount + 2, items.length);
 
 		assertTrue("Wrong commit id", initialObjid
@@ -118,9 +120,8 @@ public class GitRepositoriesViewTagHandlingTest extends
 		SWTBotShell resetDialog = bot.shell(UIText.ResetCommand_WizardTitle);
 		resetDialog.bot().radio(
 				UIText.ResetTargetSelectionDialog_ResetTypeHardButton).click();
-		waitInUI();
 		resetDialog.bot().button(IDialogConstants.FINISH_LABEL).click();
-		waitInUI();
+		TestUtil.joinJobs(JobFamilies.RESET);
 
 		bot.shell(UIText.ResetTargetSelectionDialog_ResetQuestion).bot()
 				.button(IDialogConstants.YES_LABEL).click();
@@ -144,18 +145,17 @@ public class GitRepositoriesViewTagHandlingTest extends
 				.getPluginLocalizedValue("CreateTagCommand"));
 		String shellTitle = UIText.CreateTagDialog_NewTag;
 		SWTBotShell createDialog = bot.shell(shellTitle).activate();
-		waitInUI();
+		TestUtil.joinJobs(JobFamilies.FILL_TAG_LIST);
 		createDialog.bot().textWithLabel(UIText.CreateTagDialog_tagName)
 				.setText(name);
 		createDialog.bot()
 				.styledTextWithLabel(UIText.CreateTagDialog_tagMessage)
 				.setText(message);
-		waitInUI();
 		createDialog.bot().button(IDialogConstants.OK_LABEL).click();
+		TestUtil.joinJobs(JobFamilies.TAG);
 	}
 
 	private String getObjectIdOfCommit() throws Exception {
-
 		String branch = repository.getFullBranch();
 		if (ObjectId.isId(branch))
 			return branch;
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java
index 542e3d1ebc..d5252b722b 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java
@@ -231,6 +231,7 @@ public abstract class GitRepositoriesViewTestBase extends
 			shell.bot().tree().expandNode(gitCategory).getNode(viewName)
 					.select();
 			shell.bot().button(IDialogConstants.OK_LABEL).click();
+			TestUtil.joinJobs(JobFamilies.REPO_VIEW_REFRESH);
 
 			viewbot = bot.viewByTitle(viewName);