diff options
author | Sergey Prigogin | 2016-07-19 22:46:22 +0000 |
---|---|---|
committer | Sergey Prigogin | 2016-07-19 23:04:01 +0000 |
commit | d1a02b5588da41cf909755d308bae2f640998ce3 (patch) | |
tree | 7d918953121d67a3a7186a4fdce2974419904f5b /tests/org.eclipse.compare.tests | |
parent | 73fd0ef44b36fd04a8268b9600d4f21f91a43381 (diff) | |
download | eclipse.platform.team-d1a02b5588da41cf909755d308bae2f640998ce3.tar.gz eclipse.platform.team-d1a02b5588da41cf909755d308bae2f640998ce3.tar.xz eclipse.platform.team-d1a02b5588da41cf909755d308bae2f640998ce3.zip |
Revert "Bug 213780 - Compare With direction should be configurable"
This reverts commits ec30f62a24da6e8e47dbb3a566049c628bb74f05 and
73fd0ef44b36fd04a8268b9600d4f21f91a43381.
Change-Id: Idc485d2801533a72eb4a38803eb863f791ab239f
Diffstat (limited to 'tests/org.eclipse.compare.tests')
2 files changed, 6 insertions, 35 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 99e90de7a..c5cf39567 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,19 +10,15 @@ *******************************************************************************/ 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; @@ -91,9 +87,6 @@ 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() { @@ -104,12 +97,6 @@ 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 98b125d58..f7c068f3a 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,6 +16,8 @@ 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; @@ -23,9 +25,6 @@ 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; @@ -34,7 +33,6 @@ 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; @@ -48,8 +46,6 @@ 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 { /** @@ -254,19 +250,7 @@ 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"; |