diff options
author | Sergey Prigogin | 2016-07-13 03:39:35 +0000 |
---|---|---|
committer | Sergey Prigogin | 2016-07-13 03:42:39 +0000 |
commit | 73fd0ef44b36fd04a8268b9600d4f21f91a43381 (patch) | |
tree | d9b82abd76678f85f9118c37a47509355e7eec0e /tests/org.eclipse.compare.tests | |
parent | 30ce23c898392ba97114d8ba7cf5eddd7a0d6373 (diff) | |
download | eclipse.platform.team-73fd0ef44b36fd04a8268b9600d4f21f91a43381.tar.gz eclipse.platform.team-73fd0ef44b36fd04a8268b9600d4f21f91a43381.tar.xz eclipse.platform.team-73fd0ef44b36fd04a8268b9600d4f21f91a43381.zip |
Bug 213780 - Compare With direction should be configurableY20160714-1000I20160719-0800I20160716-1900
Fixed tests sensitive to the layout preference.
Change-Id: Ib30bb4c7ac8b42a81d8e1e55a0f0a897de587b05
Diffstat (limited to 'tests/org.eclipse.compare.tests')
2 files changed, 37 insertions, 7 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/ContentMergeViewerTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/ContentMergeViewerTest.java index fd87e5d34..99e90de7a 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/ContentMergeViewerTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/ContentMergeViewerTest.java @@ -10,14 +10,19 @@ *******************************************************************************/ package org.eclipse.compare.tests; -import junit.framework.Assert; -import junit.framework.TestCase; - +import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.contentmergeviewer.ContentMergeViewer; +import org.eclipse.compare.internal.ComparePreferencePage; +import org.eclipse.compare.internal.CompareUIPlugin; +import org.eclipse.compare.internal.ICompareUIConstants; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.widgets.Composite; +import junit.framework.Assert; +import junit.framework.TestCase; + public class ContentMergeViewerTest extends TestCase { private MyContentMergeViewer myContentMergeViewer; @@ -37,7 +42,7 @@ public class ContentMergeViewerTest extends TestCase { private class MyContentMergeViewer extends ContentMergeViewer { protected MyContentMergeViewer() { - super(0, null, null); + super(0, null, new CompareConfiguration()); } public boolean leftDirty = false; @@ -86,6 +91,9 @@ public class ContentMergeViewerTest extends TestCase { } protected void setUp() throws Exception { + super.setUp(); + IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore(); + store.setDefault(ComparePreferencePage.LAYOUT, ICompareUIConstants.PREF_VALUE_RIGHT_TO_LEFT); result = new boolean[] { false, false }; myContentMergeViewer = new MyContentMergeViewer(); myContentMergeViewer.addPropertyChangeListener(new IPropertyChangeListener() { @@ -96,6 +104,12 @@ public class ContentMergeViewerTest extends TestCase { }); } + protected void tearDown() throws Exception { + IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore(); + store.setToDefault(ComparePreferencePage.LAYOUT); + super.tearDown(); + } + // set left to true public void testFFTX() { diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java index f7c068f3a..98b125d58 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java @@ -16,8 +16,6 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; - import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.ICompareFilter; import org.eclipse.compare.IEditableContent; @@ -25,6 +23,9 @@ import org.eclipse.compare.IStreamContentAccessor; import org.eclipse.compare.ITypedElement; import org.eclipse.compare.contentmergeviewer.TextMergeViewer; import org.eclipse.compare.internal.ChangeCompareFilterPropertyAction; +import org.eclipse.compare.internal.ComparePreferencePage; +import org.eclipse.compare.internal.CompareUIPlugin; +import org.eclipse.compare.internal.ICompareUIConstants; import org.eclipse.compare.internal.IMergeViewerTestAdapter; import org.eclipse.compare.internal.MergeViewerContentProvider; import org.eclipse.compare.internal.Utilities; @@ -33,6 +34,7 @@ import org.eclipse.compare.structuremergeviewer.Differencer; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocument; @@ -46,6 +48,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; +import junit.framework.TestCase; + public class TextMergeViewerTest extends TestCase { /** @@ -250,7 +254,19 @@ public class TextMergeViewerTest extends TestCase { } return document; } - + + protected void setUp() throws Exception { + super.setUp(); + IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore(); + store.setDefault(ComparePreferencePage.LAYOUT, ICompareUIConstants.PREF_VALUE_RIGHT_TO_LEFT); + } + + protected void tearDown() throws Exception { + IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore(); + store.setToDefault(ComparePreferencePage.LAYOUT); + super.tearDown(); + } + public void testCopyRightToLeft() throws Exception { DiffNode parentNode = new DiffNode(new ParentTestElement(), new ParentTestElement()); String copiedText = "hi there"; |