From 9d32236c6ab1ffeeb409b5d7fe5e48c931d468e8 Mon Sep 17 00:00:00 2001
From: Thomas Wolf
Date: Mon, 20 Nov 2017 12:47:01 +0100
Subject: [test stability] CompareActionsTest assumes resource model

The CompareActionsTest uses the synchronize view and expects the
resource model to be active. Other tests may have changed that
setting, though, and then these tests may fail.

Therefore set the active model provider explicitly. All tests using
the synchronize view must set the expected model provider(s).


Change-Id: Ib3eaadf48e386395a215feed8a350a807236b555
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>---
 .../egit/ui/test/team/actions/CompareActionsTest.java      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'org.eclipse.egit.ui.test/src/org')

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java
index f863e9b2ff..df76d02b55 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.mapping.ModelProvider;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.egit.core.op.ResetOperation;
 import org.eclipse.egit.core.op.TagOperation;
@@ -55,6 +56,9 @@ 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.eclipse.team.internal.ui.TeamUIPlugin;
+import org.eclipse.team.ui.TeamUI;
+import org.eclipse.team.ui.mapping.ITeamContentProviderDescriptor;
+import org.eclipse.team.ui.mapping.ITeamContentProviderManager;
 import org.eclipse.team.ui.synchronize.ISynchronizeManager;
 import org.eclipse.team.ui.synchronize.ISynchronizeView;
 import org.junit.Before;
@@ -77,6 +81,7 @@ public class CompareActionsTest extends LocalRepositoryTestCase {
 		Repository repo = lookupRepository(repositoryFile);
 
 		disablePerspectiveSwitchPrompt();
+		setEnabledModelProvider(ModelProvider.RESOURCE_MODEL_PROVIDER_ID);
 
 		TagBuilder tag = new TagBuilder();
 		tag.setTag("SomeTag");
@@ -97,6 +102,15 @@ public class CompareActionsTest extends LocalRepositoryTestCase {
 				repo));
 	}
 
+	private static void setEnabledModelProvider(String modelProviderId) {
+		ITeamContentProviderManager contentProviderManager = TeamUI
+				.getTeamContentProviderManager();
+		ITeamContentProviderDescriptor descriptor = contentProviderManager
+				.getDescriptor(modelProviderId);
+		contentProviderManager.setEnabledDescriptors(
+				new ITeamContentProviderDescriptor[] { descriptor });
+	}
+
 	@SuppressWarnings("restriction")
 	private static void disablePerspectiveSwitchPrompt() {
 		// disable perspective synchronize selection
-- 
cgit v1.2.3