diff options
-rw-r--r-- | org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/CodeMiningTest.java | 10 | ||||
-rw-r--r-- | org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/CodeMiningTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/CodeMiningTest.java index f1ebf98b295..b8ef5947b4e 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/CodeMiningTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/CodeMiningTest.java @@ -27,6 +27,8 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; +import org.eclipse.jface.util.Util; + import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -108,6 +110,10 @@ public class CodeMiningTest { @Test public void testCodeMiningCtrlHome() throws BadLocationException { + if(Util.isMac()) { + // See bug 541415. For whatever reason, this shortcut doesn't work on Mac + return; + } DelayedEchoCodeMiningProvider.DELAY = 500; fViewer.getDocument().set(TextViewerTest.generate5000Lines()); Assert.assertTrue(new DisplayHelper() { @@ -148,6 +154,10 @@ public class CodeMiningTest { @Test public void testCodeMiningCtrlEnd() throws BadLocationException { + if(Util.isMac()) { + // See bug 541415. For whatever reason, this shortcut doesn't work on Mac + return; + } fViewer.getDocument().set(TextViewerTest.generate5000Lines()); Assert.assertTrue(new DisplayHelper() { @Override diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java index 2138f499439..67fbc64792d 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java @@ -31,6 +31,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; +import org.eclipse.jface.util.Util; + import org.eclipse.jface.text.Document; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextViewer; @@ -70,6 +72,10 @@ public class TextViewerTest { @Test public void testCtrlHomeViewportListener() { + if(Util.isMac()) { + // See bug 541415. For whatever reason, this shortcut doesn't work on Mac + return; + } Shell shell= new Shell(); try { shell.setLayout(new FillLayout()); @@ -96,6 +102,10 @@ public class TextViewerTest { @Test public void testCtrlEndViewportListener() { + if(Util.isMac()) { + // See bug 541415. For whatever reason, this shortcut doesn't work on Mac + return; + } Shell shell= new Shell(); try { shell.setLayout(new FillLayout()); |