diff options
| author | Sravan Kumar Lakkimsetti | 2016-05-18 14:06:27 +0000 |
|---|---|---|
| committer | Dani Megert | 2016-05-18 14:31:20 +0000 |
| commit | a2f14eca2c5e0d30c1ee0cdc179ddc3adbb874b6 (patch) | |
| tree | 058bbcc20c837639105d3def491d57b1ddae6396 | |
| parent | 8213623f2dc4c1fa52d64c4058684c6293d98d4b (diff) | |
| download | eclipse.platform.ui-a2f14eca2c5e0d30c1ee0cdc179ddc3adbb874b6.tar.gz eclipse.platform.ui-a2f14eca2c5e0d30c1ee0cdc179ddc3adbb874b6.tar.xz eclipse.platform.ui-a2f14eca2c5e0d30c1ee0cdc179ddc3adbb874b6.zip | |
Bug 493357 - [gtk3] 8 tests consistently fail on CentOS
- disabled the failing testcases on gtk3
Change-Id: I71a8cefa2292cb755fecb0c1e5f7901619d91ae8
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
5 files changed, 45 insertions, 7 deletions
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerRefreshTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerRefreshTest.java index 1801b72a4a0..bd36258fe50 100644 --- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerRefreshTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerRefreshTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Brad Reynolds. + * Copyright (c) 2006, 2016 Brad Reynolds, IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,24 +7,26 @@ * * Contributors: * Brad Reynolds - initial API and implementation + * IBM Corporation - Bug 493357 *******************************************************************************/ package org.eclipse.jface.tests.viewers; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ListViewer; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; +import org.eclipse.swt.internal.gtk.OS; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import junit.framework.TestCase; + public class ListViewerRefreshTest extends TestCase { /** * Used for viewing the UI. Set to 0 if not wanting to see the UI. @@ -71,6 +73,11 @@ public class ListViewerRefreshTest extends TestCase { * @throws Exception */ public void testNoSelectionRefresh() throws Exception { + if (OS.GTK3) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } + shell.setText("Lost Scrolled Position Test"); //$NON-NLS-1$ readAndDispatch(); @@ -99,6 +106,10 @@ public class ListViewerRefreshTest extends TestCase { * @throws Exception */ public void testSelectionRefresh() throws Exception { + if (OS.GTK3) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } shell.setText("Preserved Scrolled Position Test"); //$NON-NLS-1$ readAndDispatch(); diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java index 0414cccbed1..c26e8597a70 100644 --- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -149,6 +149,10 @@ public class ListViewerTest extends StructuredViewerTest { } public void testSelectionRevealBug177619() throws Exception { + if (disableTestsBug493357) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } TestElement model = TestElement.createModel(1, 100); fViewer.setInput(model); diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java index c02d0d97846..4c2b00eaf6c 100644 --- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2014 IBM Corporation and others. + * Copyright (c) 2005, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -199,6 +199,10 @@ public class SimpleVirtualLazyTreeViewerTest extends ViewerTestCase { System.out.println(getName() + " disabled due to Bug 347491"); return; } + if (disableTestsBug493357) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } assertTrue("SWT.SetData not received", setDataCalled); TreeViewer treeViewer = (TreeViewer) fViewer; // correct what the content provider is answering with diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ViewerTestCase.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ViewerTestCase.java index de3f6d926fe..98fc7865573 100644 --- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ViewerTestCase.java +++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ViewerTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,6 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.swt.SWT; +import org.eclipse.swt.internal.gtk.OS; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; @@ -38,12 +39,14 @@ public abstract class ViewerTestCase extends TestCase { public TestModel fModel; protected boolean disableTestsBug347491 = false; + protected boolean disableTestsBug493357 = false; private ILogger oldLogger; private ISafeRunnableRunner oldRunner; public ViewerTestCase(String name) { super(name); disableTestsBug347491 = Util.isCocoa(); + disableTestsBug493357 = OS.GTK3; } protected void assertSelectionEquals(String message, TestElement expected) { diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java index cce5d915b7d..5c2da1dc0d6 100644 --- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -172,6 +172,10 @@ public class VirtualLazyTreeViewerTest extends TreeViewerTest { if (disableTestsBug347491) { return; } + if (disableTestsBug493357) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } if (setDataCalls == 0) { System.err.println("SWT.SetData is not received. Cancelled test " + getName()); return; @@ -184,6 +188,10 @@ public class VirtualLazyTreeViewerTest extends TreeViewerTest { if (disableTestsBug347491) { return; } + if (disableTestsBug493357) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } if (setDataCalls == 0) { System.err.println("SWT.SetData is not received. Cancelled test " + getName()); return; @@ -208,6 +216,10 @@ public class VirtualLazyTreeViewerTest extends TreeViewerTest { if (disableTestsBug347491) { return; } + if (disableTestsBug493357) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } if (setDataCalls == 0) { System.err.println("SWT.SetData is not received. Cancelled test " + getName()); return; @@ -220,6 +232,10 @@ public class VirtualLazyTreeViewerTest extends TreeViewerTest { if (disableTestsBug347491) { return; } + if (disableTestsBug493357) { + System.out.println(getName() + " disabled due to Bug 493357"); + return; + } if (setDataCalls == 0) { System.err.println("SWT.SetData is not received. Cancelled test " + getName()); return; |
