Bug 325465 - Virtual viewer tests timeout when viewer is hidden

- Decided that the fix does more harm than good and backed out the ON_TOP style change.

11 files changed, 20 insertions, 119 deletions

diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java
index 300254fec..0230e6b9a 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java
@@ -14,12 +14,10 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -48,15 +46,8 @@ abstract public class CheckTests extends TestCase {
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java
index 7d06bd364..0ba1bcd50 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java
@@ -15,7 +15,6 @@ import java.util.Arrays;
 import junit.framework.TestCase;

 

 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;

-import org.eclipse.core.runtime.Platform;

 import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;

 import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation2;

 import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;

@@ -65,15 +64,8 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat
 

 	void createViewer() {

 		fDisplay = PlatformUI.getWorkbench().getDisplay();

-        // Tests end in DNF on Mac and Windows (bug 325465)

-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {

-            fShell = new Shell(fDisplay);

-        } else {

-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);

-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)

-        }

+        fShell = new Shell(fDisplay);

         fShell.setSize(800, 600);

-		fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);

 		fShell.setLayout(new FillLayout());

 		fViewer = new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer"));

         fViewer.getTree().addControlListener(new ControlListener() {

diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java
index 2e4cb5283..3a76e5ae8 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckUpdate;
@@ -28,7 +27,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -56,15 +54,8 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java
index 4faed5e15..a7e69d457 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java
@@ -18,7 +18,6 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
@@ -26,7 +25,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ITreeSelection;
 import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -51,16 +49,8 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         
         fShell.setLayout(new FillLayout());
 
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
index 49acc6d4d..15d1b0e73 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
@@ -49,12 +49,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-        }
+        fShell = new Shell(fDisplay);
         fShell.setSize(300, 80);
         fShell.setLayout(new FillLayout());
 
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java
index 6efb4a303..99132133e 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java
@@ -15,14 +15,12 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -50,15 +48,8 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java
index e517354b3..f9eb7397f 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java
@@ -14,13 +14,11 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -46,15 +44,8 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java
index 4d1533575..5303f9ecf 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java
@@ -19,7 +19,6 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
@@ -55,15 +54,8 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell, SWT.POP_UP);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java
index ea09035a7..18b5daee9 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java
@@ -15,7 +15,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy;
@@ -26,7 +25,6 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -50,15 +48,8 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
index 8b7cd9f95..b659716f6 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
@@ -27,7 +26,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.ITreeSelection;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -55,20 +53,8 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
 
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
-        
-        fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-        // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-        //fShell.setMaximized(true);
-        fShell.setSize(800, 600);
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java
index 2a01f29e4..293cf05ff 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java
@@ -14,12 +14,10 @@ import junit.framework.TestCase;
 
 import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
 import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -46,15 +44,8 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac and Windows (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX) || Platform.getOS().equals(Platform.OS_WIN32)) {
-            fShell = new Shell(fDisplay);
-            fShell.setMaximized(true);
-        } else {
-            fShell = new Shell(fDisplay, SWT.ON_TOP | SWT.SHELL_TRIM);
-            // Maximizing a shell with SWT.ON_TOP doesn't work on Linux (bug 325465)
-            fShell.setSize(800, 600);
-        }
+        fShell = new Shell(fDisplay);
+        fShell.setMaximized(true);
         fShell.setLayout(new FillLayout());
 
         fViewer = createViewer(fDisplay, fShell);