Avoid potential deadlocks in repositories view

Don't join() in UI thread on a job which triggers Display.syncExec().
Neither join not sync execution was actually needed.

Bug: 506463
Change-Id: I4f11d4fa56507493a059a550108ce17c2fe96b10
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

3 files changed, 11 insertions, 2 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRemoteHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRemoteHandlingTest.java
index 5bab7a5f1b..4992147b2c 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRemoteHandlingTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRemoteHandlingTest.java
@@ -30,6 +30,7 @@ import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,6 +52,12 @@ public class GitRepositoriesViewRemoteHandlingTest extends
 		remoteRepositoryFile = createRemoteRepository(repositoryFile);
 		Activator.getDefault().getRepositoryUtil().addConfiguredRepository(
 				repositoryFile);
+		TestUtil.processUIEvents();
+	}
+
+	@After
+	public void after() throws Exception {
+		TestUtil.processUIEvents();
 	}
 
 	/**
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java
index 90e8a54545..7cf458858f 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java
@@ -238,8 +238,8 @@ public class GitRepositoriesViewRepoHandlingTest extends
 		SWTBotTree viewerTree = getOrOpenView().bot().tree();
 
 		TableCollection selection = viewerTree.selection();
-		assertTrue("Selection should contain one element",
-				selection.rowCount() == 1);
+		assertEquals("Selection should contain one element: " + selection, 1,
+				selection.rowCount());
 		String nodeText = selection.get(0).get(0);
 		assertTrue("Node text should contain project name", projectItem
 				.getText().startsWith(nodeText));
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java
index 1062094999..ab5fb39033 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java
@@ -339,6 +339,7 @@ public class GitRepositoriesViewTest extends GitRepositoriesViewTestBase {
 		removeSmartImportWizardToForceGitImportWizardUsage();
 		deleteAllProjects();
 		assertProjectExistence(PROJ2, false);
+		TestUtil.processUIEvents();
 		SWTBotTree tree = getOrOpenView().bot().tree();
 		String wizardTitle = NLS.bind(
 				UIText.GitCreateProjectViaWizardWizard_WizardTitle,
@@ -349,6 +350,7 @@ public class GitRepositoriesViewTest extends GitRepositoriesViewTestBase {
 				.getNode(PROJ2).select();
 		ContextMenuHelper.clickContextMenu(tree,
 				myUtil.getPluginLocalizedValue("ImportProjectsCommand"));
+		TestUtil.processUIEvents();
 		SWTBotShell shell = bot.shell(wizardTitle);
 		shell = bot.shell(wizardTitle);
 		// try import existing project first