From 4ea17e12d33fc53a65993d2755730314c2a1d53a Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 29 Jul 2025 19:17:20 +0200 Subject: [PATCH] Repair and execute Editor tests --- .../editor/JavaPropertiesToolBarContributorTest.java | 2 -- .../org/eclipse/wb/tests/designer/editor/SplitModeTest.java | 4 +--- .../eclipse/wb/tests/designer/editor/UndoManagerTest.java | 5 ++--- .../wb/tests/designer/editor/actions/CutActionTest.java | 2 -- .../wb/tests/designer/editor/actions/SwitchActionTest.java | 3 +-- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java index 3944d1304..860a70aca 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java @@ -22,7 +22,6 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** @@ -91,7 +90,6 @@ public Test() { /** * Test for "Local to field" action. */ - @Disabled @Test public void test_convertLocalToField() throws Exception { openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java index fbdf4eb5d..7758708c0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java @@ -21,7 +21,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.awt.Component; @@ -63,7 +62,6 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Test - @Disabled public void test_reparse_afterDelay() throws Exception { IPreferenceStore preferences = DesignerPlugin.getPreferences(); preferences.setValue( @@ -81,6 +79,7 @@ public Test() { check_isEnabled(true); // set focus to Source, as if user does this { + m_designerEditor.getSite().getShell().forceActive(); MultiMode multiMode = (MultiMode) m_designerEditor.getMultiMode(); multiMode.getSourcePage().setFocus(); } @@ -94,7 +93,6 @@ public Test() { check_isEnabled(true); // wait for re-parse waitEventLoop(1000); - fetchContentFields(); check_isEnabled(false); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java index a92a0e0ed..4c98d6eb4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java @@ -51,7 +51,6 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -274,7 +273,6 @@ public Test() { /** * Sometimes expansion paths are remembered for wrong dump, so this causes later exception. */ - @Disabled @Test public void test_expandRemembered_bug_0() throws Exception { ContainerInfo frame = openContainer(""" @@ -311,6 +309,8 @@ public Test() { openSourcePage(); // organize imports actionBars.getGlobalActionHandler(JdtActionConstants.ORGANIZE_IMPORTS).run(); + // wait for "Organize Imports" job + waitEventLoop(50); assertEquals( getSourceDQ( "package test;", @@ -597,7 +597,6 @@ public Test() { * exceptions. */ @DisposeProjectAfter - @Disabled @Test public void test_showDesign_rename() throws Exception { openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java index 08b106639..04d70a0f8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java @@ -19,7 +19,6 @@ import org.eclipse.jface.action.IAction; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** @@ -72,7 +71,6 @@ public Test() { /** * Test for cut/paste single component. */ - @Disabled @Test public void test_cutSingle() throws Exception { ContainerInfo panel = openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java index 210d2b812..898385bb2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java @@ -16,7 +16,6 @@ import org.eclipse.wb.internal.core.editor.multi.MultiMode; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** @@ -33,7 +32,6 @@ public class SwitchActionTest extends SwingGefTest { /** * Test for switching to source and back to design. */ - @Disabled @Test public void test_1() throws Exception { openContainer(""" @@ -42,6 +40,7 @@ public class Test extends JPanel { public Test() { } }"""); + m_designerEditor.getSite().getShell().forceActive(); MultiMode multiMode = (MultiMode) m_designerEditor.getMultiMode(); // prepare action SwitchAction switchAction;