From bcf2247adb1949f64a339c48ee60dc010a1e2d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 30 Oct 2024 19:37:22 +0200 Subject: [PATCH 1/2] Cleanups in unstable tests in I-builds Use DisplayHelper to delay checks so listener changes can propagate. Remove unused variables. --- tests/org.eclipse.e4.ui.tests/.classpath | 12 ++++++++++-- tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF | 3 ++- .../eclipse/e4/ui/tests/workbench/MWindowTest.java | 10 ++++------ .../tests/filesearch/AnnotationManagerTest.java | 6 +----- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tests/org.eclipse.e4.ui.tests/.classpath b/tests/org.eclipse.e4.ui.tests/.classpath index 06bb5d7d2cc..7ab1564171f 100644 --- a/tests/org.eclipse.e4.ui.tests/.classpath +++ b/tests/org.eclipse.e4.ui.tests/.classpath @@ -1,7 +1,15 @@ - + + + + + - + + + + + diff --git a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF index 0afe8caf301..cb90cb0351d 100644 --- a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF @@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", org.eclipse.e4.ui.css.swt;bundle-version="0.11.0", org.mockito.mockito-core;bundle-version="2.13.0", org.eclipse.e4.ui.css.core;bundle-version="0.10.100", - org.eclipse.test;bundle-version="3.6.200" + org.eclipse.test;bundle-version="3.6.200", + org.eclipse.ui.tests.harness Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.e4.ui.tests.model.test, org.eclipse.e4.ui.tests.model.test.impl, diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java index 1f1d3ed6d1a..dd6f8311b89 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2023 IBM Corporation and others. + * Copyright (c) 2009, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -50,6 +50,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Widget; +import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -365,12 +366,9 @@ public void testWindow_Height() { // the shell's width should have been updated window.setHeight(300); - while (shell.getDisplay().readAndDispatch()) { - // spin the event loop - } - + // Give time for change to propagate + DisplayHelper.waitForCondition(shell.getDisplay(), 10000, () -> (300 == shell.getBounds().height)); assertEquals(shell.getBounds().height, window.getHeight()); - assertEquals(300, shell.getBounds().height); } @Test diff --git a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java index 5100700f577..2c3ea40eece 100644 --- a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java +++ b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -159,7 +159,6 @@ public void testReplaceQuery() throws Exception { IFile file = (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); - int annotationCount= 0; IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) { Annotation annotation= annotations.next(); @@ -169,7 +168,6 @@ public void testReplaceQuery() throws Exception { assertTrue(text.equalsIgnoreCase(fQuery2.getSearchString())); } } - assertEquals(0, annotationCount); } } finally { SearchPlugin.getActivePage().closeAllEditors(false); @@ -188,7 +186,6 @@ public void testSwitchQuery() throws Exception { IFile file = (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); - int annotationCount= 0; IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) { Annotation annotation= annotations.next(); @@ -198,7 +195,6 @@ public void testSwitchQuery() throws Exception { assertTrue(text.equalsIgnoreCase(fQuery1.getSearchString())); } } - assertEquals(0, annotationCount); } } finally { SearchPlugin.getActivePage().closeAllEditors(false); From f3e376c9fb021875e7d76e7c8c4db4a2d0eab831 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Wed, 30 Oct 2024 20:36:30 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.34 stream --- tests/org.eclipse.search.tests/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF index fc529157b0d..70fe03f11cf 100644 --- a/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.search.tests;singleton:=true -Bundle-Version: 3.11.500.qualifier +Bundle-Version: 3.11.600.qualifier Bundle-Activator: org.eclipse.search.tests.SearchTestPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin