diff options
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java index e9d6429f1..6deea781f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java @@ -15,9 +15,14 @@ import static org.junit.Assert.assertNotNull; import java.util.Set; +import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin; +import org.eclipse.emf.compare.ide.ui.internal.preferences.EMFCompareUIPreferences; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jgit.api.Status; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** @@ -25,9 +30,29 @@ import org.junit.Test; * * @author Alexandra Buzila */ -@SuppressWarnings("nls") +@SuppressWarnings({"nls", "restriction", }) public class GitMergeTest extends AbstractGitLogicalModelTest { + private final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore(); + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + + // The test need to have the pre-merge preference set to true + store.setValue(EMFCompareUIPreferences.PRE_MERGE_MODELS_WHEN_CONFLICT, true); + } + + @Override + @After + public void tearDown() throws Exception { + super.tearDown(); + + // Reset pre-merge default value to the classic one + store.setToDefault(EMFCompareUIPreferences.PRE_MERGE_MODELS_WHEN_CONFLICT); + } + /** * Sets up a repository with three commits on two branches: * <ul> |