Bug 325465 - Virtual viewer tests timeout when viewer is hidden

- Disabled ON_TOP for Windows

11 files changed, 30 insertions, 24 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 ce354068d..300254fec 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
@@ -48,8 +48,8 @@ abstract public class CheckTests extends TestCase {
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 6edcc467d..7d06bd364 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
@@ -65,8 +65,8 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat
 

 	void createViewer() {

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

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

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

+        // 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);

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 b537da0ae..2e4cb5283 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
@@ -56,8 +56,8 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 db1b3b878..4faed5e15 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
@@ -52,8 +52,8 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
 
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 0bc1186e3..49acc6d4d 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,8 +49,8 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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);
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 3aafd0362..6efb4a303 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
@@ -50,8 +50,8 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 404f80243..e517354b3 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,6 +14,7 @@ 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;
@@ -45,10 +46,15 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        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);
+        // 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.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 3f8c1aaf8..4d1533575 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
@@ -55,8 +55,8 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 8b22fdbb4..ea09035a7 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
@@ -50,8 +50,8 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 cffd73468..8b7cd9f95 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
@@ -55,8 +55,8 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
 
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {
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 70a98f47a..2a01f29e4 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
@@ -46,8 +46,8 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL
      */
     protected void setUp() throws Exception {
         fDisplay = PlatformUI.getWorkbench().getDisplay();
-        // Tests end in DNF on Mac (bug 325465)
-        if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+        // 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 {