Skip to content

Migrate org.eclipse.e4.ui.tests to JUnit 5 #3707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Jan 28, 2026
+186 −179
Merged

Migrate org.eclipse.e4.ui.tests to JUnit 5 #3707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0",
org.eclipse.e4.core.contexts,
org.eclipse.e4.core.di,
org.eclipse.e4.ui.workbench;bundle-version="0.9.0",
org.junit;bundle-version="3.8.2",
org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0";visibility:=reexport,
org.eclipse.e4.core.commands;bundle-version="0.9.0",
Expand Down
338 changes: 173 additions & 165 deletions ...e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EModelServicePerspectiveFindTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

package org.eclipse.e4.ui.tests.application;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.List;
import org.eclipse.e4.core.contexts.IEclipseContext;
Expand All @@ -31,178 +31,186 @@
import org.eclipse.e4.ui.workbench.Selector;
import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.e4.ui.workbench.modeling.ElementMatcher;
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.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;

/**
* Test EModelService with its various IN_*_PERSPECTIVE and OUTSIDE_PERSPECTIVE
* flags. See bug 450130.
*/
@RunWith(Parameterized.class)
public class EModelServicePerspectiveFindTest {
@Parameters
public static Object[] data() {
return new Object[] { true, false };
}

/** If true, create simple app setup, otherwise a traditional setup */
@Parameter
public boolean simple;

private IEclipseContext applicationContext;
private EModelService modelService;
private MApplication app = null;
private MWindow window;
private MPerspectiveStack perspectiveStack;
private MPart partA;
private MPart partB;
private MPart outerPart;

private Selector selectAll;

@Before
public void setUp() {
applicationContext = E4Application.createDefaultContext();
modelService = applicationContext.get(EModelService.class);
selectAll = new ElementMatcher(null, null, (String) null);
if (simple) {
setupSimpleApplication();
} else {
setupWorkbenchApplication();
static abstract class AbstractPerspectiveFindTest {
private IEclipseContext applicationContext;
private EModelService modelService;
private MApplication app = null;
private MWindow window;
private MPerspectiveStack perspectiveStack;
private MPart partA;
private MPart partB;
private MPart outerPart;

private Selector selectAll;

abstract boolean isSimple();

@BeforeEach
public void setUp() {
applicationContext = E4Application.createDefaultContext();
modelService = applicationContext.get(EModelService.class);
selectAll = new ElementMatcher(null, null, (String) null);
if (isSimple()) {
setupSimpleApplication();
} else {
setupWorkbenchApplication();
}
}

@AfterEach
public void tearDown() {
applicationContext.dispose();
}

/**
* A simpler form of application setup as might be found in a new E4 app
*/
private void setupSimpleApplication() {
app = modelService.createModelElement(MApplication.class);
app.setContext(applicationContext);
window = modelService.createModelElement(MWindow.class);
window.setElementId("singleValidId");
app.getChildren().add(window);

setupPerspectiveStack();
window.getChildren().add(perspectiveStack);

outerPart = modelService.createModelElement(MPart.class);
MPartStack outerPartStack = modelService.createModelElement(MPartStack.class);
outerPartStack.getChildren().add(outerPart);
window.getChildren().add(outerPartStack);

window.setSelectedElement(perspectiveStack);
}

/**
* The form of application as might be found with an E3.x-based compat layer
*/
private void setupWorkbenchApplication() {
app = modelService.createModelElement(MApplication.class);
app.setContext(applicationContext);
window = modelService.createModelElement(MWindow.class);
window.setElementId("singleValidId");
app.getChildren().add(window);

MPartSashContainer topPSC = modelService.createModelElement(MPartSashContainer.class);
window.getChildren().add(topPSC);

setupPerspectiveStack();
topPSC.getChildren().add(perspectiveStack);

MPartStack outerPartStack = modelService.createModelElement(MPartStack.class);
outerPart = modelService.createModelElement(MPart.class);
outerPartStack.getChildren().add(outerPart);
topPSC.getChildren().add(outerPartStack);

window.setSelectedElement(topPSC);
topPSC.setSelectedElement(perspectiveStack);
}

/**
* Creates a perspective stack with two perspectives A and B, each with a
* part stack with a single part.
*/
private void setupPerspectiveStack() {
perspectiveStack = modelService.createModelElement(MPerspectiveStack.class);

MPerspective perspectiveA = modelService.createModelElement(MPerspective.class);
perspectiveStack.getChildren().add(perspectiveA);
MPartStack partStackA = modelService.createModelElement(MPartStack.class);
perspectiveA.getChildren().add(partStackA);
partA = modelService.createModelElement(MPart.class);
partStackA.getChildren().add(partA);

MPerspective perspectiveB = modelService.createModelElement(MPerspective.class);
perspectiveStack.getChildren().add(perspectiveB);
MPartStack partStackB = modelService.createModelElement(MPartStack.class);
perspectiveB.getChildren().add(partStackB);
partB = modelService.createModelElement(MPart.class);
partStackB.getChildren().add(partB);

perspectiveStack.setSelectedElement(perspectiveA);
}

@Test
public void testInActivePerspective() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.IN_ACTIVE_PERSPECTIVE,
selectAll);
assertNotNull(elements);
assertEquals(1, elements.size());
assertEquals(partA, elements.get(0));
}

@Test
public void testInAnyPerspective() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.IN_ANY_PERSPECTIVE,
selectAll);
assertNotNull(elements);
assertEquals(2, elements.size());
assertTrue(elements.contains(partA));
assertTrue(elements.contains(partB));
}

@Test
public void testOuterPerspective() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.OUTSIDE_PERSPECTIVE,
selectAll);
assertNotNull(elements);
assertEquals(1, elements.size());
assertTrue(elements.contains(outerPart));
}

@Test
public void testInTrim() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.IN_TRIM, selectAll);
assertNotNull(elements);
assertEquals(0, elements.size());
}

@Test
public void testPresentation() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.PRESENTATION, selectAll);
assertNotNull(elements);
assertEquals(2, elements.size());
assertTrue(elements.contains(partA));
assertTrue(elements.contains(outerPart));
}

@Test
public void testAnywhere() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.ANYWHERE, selectAll);
assertNotNull(elements);
assertEquals(3, elements.size());
assertTrue(elements.contains(partA));
assertTrue(elements.contains(partB));
assertTrue(elements.contains(outerPart));
}
}

@After
public void tearDown() {
applicationContext.dispose();
}

/**
* A simpler form of application setup as might be found in a new E4 app
*/
private void setupSimpleApplication() {
app = modelService.createModelElement(MApplication.class);
app.setContext(applicationContext);
window = modelService.createModelElement(MWindow.class);
window.setElementId("singleValidId");
app.getChildren().add(window);

setupPerspectiveStack();
window.getChildren().add(perspectiveStack);

outerPart = modelService.createModelElement(MPart.class);
MPartStack outerPartStack = modelService.createModelElement(MPartStack.class);
outerPartStack.getChildren().add(outerPart);
window.getChildren().add(outerPartStack);

window.setSelectedElement(perspectiveStack);
}

/**
* The form of application as might be found with an E3.x-based compat layer
*/
private void setupWorkbenchApplication() {
app = modelService.createModelElement(MApplication.class);
app.setContext(applicationContext);
window = modelService.createModelElement(MWindow.class);
window.setElementId("singleValidId");
app.getChildren().add(window);

MPartSashContainer topPSC = modelService.createModelElement(MPartSashContainer.class);
window.getChildren().add(topPSC);

setupPerspectiveStack();
topPSC.getChildren().add(perspectiveStack);

MPartStack outerPartStack = modelService.createModelElement(MPartStack.class);
outerPart = modelService.createModelElement(MPart.class);
outerPartStack.getChildren().add(outerPart);
topPSC.getChildren().add(outerPartStack);

window.setSelectedElement(topPSC);
topPSC.setSelectedElement(perspectiveStack);
}

/**
* Creates a perspective stack with two perspectives A and B, each with a
* part stack with a single part.
*/
private void setupPerspectiveStack() {
perspectiveStack = modelService.createModelElement(MPerspectiveStack.class);

MPerspective perspectiveA = modelService.createModelElement(MPerspective.class);
perspectiveStack.getChildren().add(perspectiveA);
MPartStack partStackA = modelService.createModelElement(MPartStack.class);
perspectiveA.getChildren().add(partStackA);
partA = modelService.createModelElement(MPart.class);
partStackA.getChildren().add(partA);

MPerspective perspectiveB = modelService.createModelElement(MPerspective.class);
perspectiveStack.getChildren().add(perspectiveB);
MPartStack partStackB = modelService.createModelElement(MPartStack.class);
perspectiveB.getChildren().add(partStackB);
partB = modelService.createModelElement(MPart.class);
partStackB.getChildren().add(partB);

perspectiveStack.setSelectedElement(perspectiveA);
}

@Test
public void testInActivePerspective() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.IN_ACTIVE_PERSPECTIVE,
selectAll);
assertNotNull(elements);
assertEquals(1, elements.size());
assertEquals(partA, elements.get(0));
}

@Test
public void testInAnyPerspective() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.IN_ANY_PERSPECTIVE,
selectAll);
assertNotNull(elements);
assertEquals(2, elements.size());
assertTrue(elements.contains(partA));
assertTrue(elements.contains(partB));
}

@Test
public void testOuterPerspective() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.OUTSIDE_PERSPECTIVE,
selectAll);
assertNotNull(elements);
assertEquals(1, elements.size());
assertTrue(elements.contains(outerPart));
}

@Test
public void testInTrim() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.IN_TRIM, selectAll);
assertNotNull(elements);
assertEquals(0, elements.size());
}

@Test
public void testPresentation() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.PRESENTATION, selectAll);
assertNotNull(elements);
assertEquals(2, elements.size());
assertTrue(elements.contains(partA));
assertTrue(elements.contains(outerPart));
@Nested
class Simple extends AbstractPerspectiveFindTest {
@Override
boolean isSimple() {
return true;
}
}

@Test
public void testAnywhere() {
List<MPart> elements = modelService.findElements(window, MPart.class, EModelService.ANYWHERE, selectAll);
assertNotNull(elements);
assertEquals(3, elements.size());
assertTrue(elements.contains(partA));
assertTrue(elements.contains(partB));
assertTrue(elements.contains(outerPart));
@Nested
class Workbench extends AbstractPerspectiveFindTest {
@Override
boolean isSimple() {
return false;
}
}
}
}
Loading
Loading