Use a separate job family for FileDiffContentProvider

Using the HISTORY_DIFF family was wrong; it's reserved for generating
the unified diff. That family is canceled in GitHistoryPage when new
diff are to be generated, which may inadvertently also cancel the file
diff generation.

Give the job in the asynchronous FileDiffContentProvider its own job
family. It needs a family so that UI tests can join on it.

Bug: 539099
Change-Id: I6f168cbd2544d2e08617536271a71ed6ebd027fb
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

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 314f6c311d..5a4c294cc4 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
@@ -267,12 +267,12 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
 	}
 
 	private SWTBotTable getFileDiffTable() throws Exception {
-		Job.getJobManager().join(JobFamilies.HISTORY_DIFF, null);
+		Job.getJobManager().join(JobFamilies.HISTORY_FILE_DIFF, null);
 		// Wait a little bit to give the UiJob triggered a chance to run
 		Thread.sleep(100);
-		// Then join the UI update
 		PlatformUI.getWorkbench().getDisplay().syncExec(() -> {
-			/* empty */ });
+			// Join the UI update
+		});
 		return getHistoryViewBot().table(1);
 	}