diff --git a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/META-INF/MANIFEST.MF index b0f02d16539..8a989d1ae9a 100644 --- a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/META-INF/MANIFEST.MF @@ -2,15 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.e4.ui.workbench.addons.swt.test -Bundle-Version: 1.5.0.qualifier +Bundle-Version: 1.5.100.qualifier Bundle-Localization: plugin Fragment-Host: org.eclipse.e4.ui.workbench.addons.swt;bundle-version="[1.1.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)", - org.eclipse.e4.core.commands;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.e4.core.commands;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)", org.eclipse.jface.databinding;bundle-version="[1.6.200,2.0.0)", - org.eclipse.e4.ui.workbench.swt;bundle-version="[0.12.100,1.0.0)" + org.eclipse.e4.ui.workbench.swt;bundle-version="[0.12.100,1.0.0)", + org.mockito.mockito-core;bundle-version="5.15.2", + junit-jupiter-params;bundle-version="5.11.4", + junit-jupiter-api;bundle-version="5.11.4", + junit-platform-suite-api;bundle-version="1.11.4" Bundle-Vendor: %providerName Export-Package: org.eclipse.e4.ui.workbench.addons.minmax;x-internal:=true Automatic-Module-Name: org.eclipse.e4.ui.workbench.addons.swt.test diff --git a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/AllTests.java b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/AllTests.java index a71abf59b69..7735ed58e8c 100644 --- a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/AllTests.java +++ b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/AllTests.java @@ -4,12 +4,11 @@ import org.eclipse.e4.ui.workbench.addons.minmax.MaximizableChildrenTag; import org.eclipse.e4.ui.workbench.addons.minmax.MaximizeBugTest; import org.eclipse.e4.ui.workbench.addons.minmax.MaximizePartSashContainerPlaceholderTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // MaximizeBugTest.class, // MaximizePartSashContainerPlaceholderTest.class, // MaximizableChildrenTag.class, // diff --git a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddonTest.java b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddonTest.java index b6b850df1d3..a5322b94e4c 100644 --- a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddonTest.java +++ b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddonTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Vector Informatik GmbH and others. + * Copyright (c) 2024, 2025 Vector Informatik GmbH and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,16 +10,15 @@ *******************************************************************************/ package org.eclipse.e4.ui.workbench.addons.cleanupaddon; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URL; import java.time.Duration; import java.util.function.Supplier; -import org.eclipse.core.runtime.Platform.OS; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.di.UISynchronize; @@ -56,9 +55,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; public class CleanupAddonTest { private static final Duration TIMEOUT = Duration.ofSeconds(30); @@ -74,12 +75,12 @@ public class CleanupAddonTest { private MTrimmedWindow window; private IEclipseContext appContext; - @Before + @BeforeEach public void before() { prepareApplicationModel(); } - @After + @AfterEach public void tearDown() { renderer.removeGui(window); renderer.stop(); @@ -188,12 +189,10 @@ public Image adornImage(Image toAdorn, Image adornment) { shell = (Shell) renderer.createGui(window); } + @DisabledOnOs(value = { OS.MAC }, // + disabledReason = "not working reliably on Mac, see https://github.com/eclipse-platform/eclipse.platform.ui/issues/1784") @Test public void testRemovingPrimaryDataStackTransfersToRemainingStack() { - assumeFalse( - "not working reliably on Mac, see https://github.com/eclipse-platform/eclipse.platform.ui/issues/1784", - OS.isMac()); - PartStackUtil.initializeAsPrimaryDataStack(partStack1); assertTrue(PartStackUtil.isPrimaryDataStack(partStack1)); assertFalse(PartStackUtil.isPrimaryDataStack(partStack2)); @@ -218,5 +217,4 @@ private static void waitForCondition(Supplier condition, Duration timeo Display.getCurrent().readAndDispatch(); } } - } diff --git a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizableChildrenTag.java b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizableChildrenTag.java index 36e2883aa0b..dc145cd9066 100644 --- a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizableChildrenTag.java +++ b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizableChildrenTag.java @@ -1,7 +1,7 @@ package org.eclipse.e4.ui.workbench.addons.minmax; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URL; @@ -41,9 +41,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MaximizableChildrenTag { @@ -57,12 +57,12 @@ public class MaximizableChildrenTag { private MTrimmedWindow window; private IEclipseContext appContext; - @Before + @BeforeEach public void before() { prepareApplicationModel(); } - @After + @AfterEach public void tearDown() { renderer.removeGui(window); renderer.stop(); diff --git a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizeBugTest.java b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizeBugTest.java index 16e349afc69..c0b77c63531 100644 --- a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizeBugTest.java +++ b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizeBugTest.java @@ -1,13 +1,11 @@ package org.eclipse.e4.ui.workbench.addons.minmax; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.stream.Stream; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -45,76 +43,29 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -@RunWith(Parameterized.class) +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + public class MaximizeBugTest { - @Parameters(name = "org.eclipse.ui.editorss: {0} - subwindowPerspective: {1} - maximizeMainFirst: {2} - addSubwindowToPerspective:{3}") - public static Collection data() { - final List data = new ArrayList<>(); - // useCorrectPlaceholderId,usePerspektiveInSubWindow,maximizeMainFirst,addSubwindowToPerspective - // working - data.add(new Object[] { true, true, true, true }); - data.add(new Object[] { true, true, false, true }); - data.add(new Object[] { true, false, true, true }); - data.add(new Object[] { true, false, false, true }); - - data.add(new Object[] { true, true, true, false }); - data.add(new Object[] { true, true, false, false }); - // not working - data.add(new Object[] { true, false, true, false }); - data.add(new Object[] { true, false, false, false }); - - // Extremely evil - // data.add(new Object[] { false, true,true,true }); - // data.add(new Object[] { false, true,false,true }); - // data.add(new Object[] { false, false,true,true }); - // data.add(new Object[] { false, false,false,true }); - // data.add(new Object[] { false, true,true,false }); - // data.add(new Object[] { false, true,false,false }); - // data.add(new Object[] { false, false,true,false }); - // data.add(new Object[] { false, false,false,false }); - - return data; - } + private static final int USE_CORRECT_PLACEHOLDER_ID = 0; + private static final int USE_PERSPECTIVE_IN_SUBWINDOW = 1; + private static final int MAXIMIZE_MAIN_FIRST = 2; + private static final int ADD_SUBWINDOW_TO_PERSPECTIVE = 3; private MPartStack partStackMain; private MPlaceholder placeholderMain; private MPartStack partStackSub; private MPlaceholder placeholderSub; - private boolean useCorrectPlaceholderId; - private boolean usePerspektiveInSubWindow; - private boolean maximizeMainFirst; - private boolean addSubwindowToPerspective; private Shell shell; private MTrimmedWindow windowSub; private IEclipseContext appContext; private IPresentationEngine renderer; private MTrimmedWindow window; - public MaximizeBugTest(boolean useCorrectPlaceholderId, - boolean usePerspektiveInSubWindow, boolean maximizeMainFirst, - boolean addSubwindowToPerspective) { - this.useCorrectPlaceholderId = useCorrectPlaceholderId; - this.usePerspektiveInSubWindow = usePerspektiveInSubWindow; - this.maximizeMainFirst = maximizeMainFirst; - this.addSubwindowToPerspective = addSubwindowToPerspective; - - } - - @Before - public void before() { - prepareApplicationModel(); - } - - @After + @AfterEach public void tearDown() { renderer.removeGui(window); renderer.stop(); @@ -122,7 +73,9 @@ public void tearDown() { appContext.dispose(); } - private void prepareApplicationModel() { + private void prepareApplicationModel(boolean useCorrectPlaceholderId, boolean usePerspektiveInSubWindow, + boolean addSubwindowToPerspective) { + MApplication application = ApplicationFactoryImpl.eINSTANCE .createApplication(); @@ -286,8 +239,12 @@ public Image adornImage(Image toAdorn, Image adornment) { shell = (Shell) renderer.createGui(window); } - @Test - public void testMainPlaceholderMax() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(partStackMain.getTags().contains( @@ -304,8 +261,12 @@ public void testMainPlaceholderMax() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testMainPartStackMax() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(placeholderMain.getTags().contains( @@ -322,8 +283,12 @@ public void testMainPartStackMax() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testSubPlaceholderMax() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testSubPlaceholderMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(partStackSub.getTags().contains( @@ -340,8 +305,12 @@ public void testSubPlaceholderMax() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testSubPartStackMax() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testSubPartStackMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(placeholderSub.getTags().contains( @@ -358,8 +327,12 @@ public void testSubPartStackMax() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testMainPlaceholderMaxThenUnzoom() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxThenUnzoom(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(partStackMain.getTags().contains( @@ -393,8 +366,12 @@ public void testMainPlaceholderMaxThenUnzoom() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testMainPartStackMaxThenUnzoom() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxThenUnzoom(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(placeholderMain.getTags().contains( @@ -427,8 +404,12 @@ public void testMainPartStackMaxThenUnzoom() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testSubPlaceholderMaxThenUnzoom() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testSubPlaceholderMaxThenUnzoom(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(partStackSub.getTags().contains( @@ -461,8 +442,12 @@ public void testSubPlaceholderMaxThenUnzoom() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testSubPartStackMaxThenUnzoom() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testSubPartStackMaxThenUnzoom(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(placeholderSub.getTags().contains( @@ -495,9 +480,13 @@ public void testSubPartStackMaxThenUnzoom() { IPresentationEngine.MAXIMIZED)); } - @Test - public void testMainPlaceholderMaxSubPlaceholderMax() { - if (maximizeMainFirst) { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxSubPlaceholderMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + + if (parameters[MAXIMIZE_MAIN_FIRST]) { placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -512,9 +501,13 @@ public void testMainPlaceholderMaxSubPlaceholderMax() { } - @Test - public void testMainPlaceholderMaxSubPartStackMax() { - if (maximizeMainFirst) { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxSubPartStackMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + + if (parameters[MAXIMIZE_MAIN_FIRST]) { placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -529,10 +522,13 @@ public void testMainPlaceholderMaxSubPartStackMax() { } - @Test - public void testMainPartStackMaxSubPlaceholderMax() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxSubPlaceholderMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -547,10 +543,13 @@ public void testMainPartStackMaxSubPlaceholderMax() { } - @Test - public void testMainPartStackMaxSubPartStackMax() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxSubPartStackMax(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -565,10 +564,13 @@ public void testMainPartStackMaxSubPartStackMax() { } - @Test - public void testMainPlaceholderMaxSubPlaceholderMaxUnzoomMain() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxSubPlaceholderMaxUnzoomMain(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -602,10 +604,13 @@ public void testMainPlaceholderMaxSubPlaceholderMaxUnzoomMain() { } - @Test - public void testMainPlaceholderMaxSubPartStackMaxUnzoomMain() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxSubPartStackMaxUnzoomMain(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -639,10 +644,13 @@ public void testMainPlaceholderMaxSubPartStackMaxUnzoomMain() { } - @Test - public void testMainPartStackMaxSubPlaceholderMaxUnzoomMain() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxSubPlaceholderMaxUnzoomMain(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -675,10 +683,13 @@ public void testMainPartStackMaxSubPlaceholderMaxUnzoomMain() { } - @Test - public void testMainPartStackMaxSubPartStackMaxUnzoomMain() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxSubPartStackMaxUnzoomMain(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -710,10 +721,13 @@ public void testMainPartStackMaxSubPartStackMaxUnzoomMain() { } - @Test - public void testMainPlaceholderMaxSubPlaceholderMaxUnzoomSub() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxSubPlaceholderMaxUnzoomSub(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -747,10 +761,13 @@ public void testMainPlaceholderMaxSubPlaceholderMaxUnzoomSub() { } - @Test - public void testMainPlaceholderMaxSubPartStackMaxUnzoomSub() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPlaceholderMaxSubPartStackMaxUnzoomSub(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -784,10 +801,13 @@ public void testMainPlaceholderMaxSubPartStackMaxUnzoomSub() { } - @Test - public void testMainPartStackMaxSubPlaceholderMaxUnzoomSub() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxSubPlaceholderMaxUnzoomSub(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -820,10 +840,13 @@ public void testMainPartStackMaxSubPlaceholderMaxUnzoomSub() { } - @Test - public void testMainPartStackMaxSubPartStackMaxUnzoomSub() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testMainPartStackMaxSubPartStackMaxUnzoomSub(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); - if (maximizeMainFirst) { + if (parameters[MAXIMIZE_MAIN_FIRST]) { partStackMain.getTags().add(IPresentationEngine.MAXIMIZED); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); } else { @@ -862,8 +885,12 @@ public void testMainPartStackMaxSubPartStackMaxUnzoomSub() { IPresentationEngine.MINIMIZED)); } - @Test - public void testSubWindowWithSubWindowMaximizeStack() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testSubWindowWithSubWindowMaximizeStack(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + MUIElement[] subWindowElements = prepareSubWindow(); partStackSub.getTags().add(IPresentationEngine.MAXIMIZED); @@ -879,8 +906,12 @@ public void testSubWindowWithSubWindowMaximizeStack() { } } - @Test - public void testSubWindowWithSubWindowMaximizePlaceholder() { + @ParameterizedTest + @MethodSource("createTestParameters") + public void testSubWindowWithSubWindowMaximizePlaceholder(boolean[] parameters) { + prepareApplicationModel(parameters[USE_CORRECT_PLACEHOLDER_ID], parameters[USE_PERSPECTIVE_IN_SUBWINDOW], + parameters[ADD_SUBWINDOW_TO_PERSPECTIVE]); + MUIElement[] subWindowElements = prepareSubWindow(); placeholderSub.getTags().add(IPresentationEngine.MAXIMIZED); @@ -929,4 +960,38 @@ private MUIElement[] prepareSubWindow() { windowSub.getWindows().add(subSubWindow); return new MUIElement[] { partStackSubSub, placeholderSubSub }; } + + /** + * All parameterized test methods receive their parameters from this static + * method.
+ *
+ * The {@code boolean} arrays returned consist of + *
  • use correct placeholder id for editor
    • + *
  • use sub-window perspective
    • + *
  • maximize main first
    • + *
  • add sub-window to perspective
    • + * + * @return a stream of boolean[] + */ + static Stream createTestParameters() { + return Stream.of( // + new boolean[] { true, true, true, true }, // + new boolean[] { true, true, false, true }, // + new boolean[] { true, false, true, true }, // + new boolean[] { true, false, false, true }, // + new boolean[] { true, true, true, false }, // + new boolean[] { true, true, false, false }, // + new boolean[] { true, false, true, false }, // + new boolean[] { true, false, false, false } // + // Extremely evil + // new boolean[] { false, true, true, true }, // + // new boolean[] { false, true, false, true }, // + // new boolean[] { false, false, true, true }, // + // new boolean[] { false, false, false, true }, // + // new boolean[] { false, true, true, false }, // + // new boolean[] { false, true, false, false }, // + // new boolean[] { false, false, true, false }, // + // new boolean[] { false, false, false, false } // + ); + } } diff --git a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizePartSashContainerPlaceholderTest.java b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizePartSashContainerPlaceholderTest.java index 8d5a364d7f3..fa6b91e6946 100644 --- a/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizePartSashContainerPlaceholderTest.java +++ b/tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizePartSashContainerPlaceholderTest.java @@ -1,12 +1,9 @@ package org.eclipse.e4.ui.workbench.addons.minmax; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -42,48 +39,23 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -@RunWith(Parameterized.class) -public class MaximizePartSashContainerPlaceholderTest { - - @Parameters(name = "org.eclipse.ui.editorss: {0}") - public static Collection data() { - final List data = new ArrayList<>(); - // useCorrectPlaceholderId - data.add(new Object[] { true }); - data.add(new Object[] { false }); +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; - return data; - } +public class MaximizePartSashContainerPlaceholderTest { private MPartStack partStackMain; private MPlaceholder placeholderMain; - private boolean useCorrectPlaceholderId; private Shell shell; - public MaximizePartSashContainerPlaceholderTest(boolean useCorrectPlaceholderId) { - this.useCorrectPlaceholderId = useCorrectPlaceholderId; - - } - - @Before - public void before() { - prepareApplicationModel(); - } - - @After + @AfterEach public void tearDown() { shell.dispose(); } - private void prepareApplicationModel() { + private void prepareApplicationModel(boolean useCorrectPlaceholderId) { MApplication application = ApplicationFactoryImpl.eINSTANCE .createApplication(); @@ -198,12 +170,14 @@ public Image adornImage(Image toAdorn, Image adornment) { } - @Test - public void testMainPlaceholderMax() { + @ParameterizedTest + @ValueSource(booleans = { true, false }) + public void testMainPlaceholderMax(boolean useCorrectPlaceholderId) { + prepareApplicationModel(useCorrectPlaceholderId); + placeholderMain.getTags().add(IPresentationEngine.MAXIMIZED); assertTrue(partStackMain.getTags().contains( IPresentationEngine.MINIMIZED_BY_ZOOM)); } - }