-
Notifications
You must be signed in to change notification settings - Fork 126
Added test for E4WorkbenchModelEditor XMI tab search #2320
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.
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
Open
r-mennig
wants to merge
1
commit into
eclipse-pde:master
Choose a base branch
from
r-mennig:xmitab_search_test
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/> | ||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="src" path="src"> | ||
| <attributes> | ||
| <attribute name="test" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>org.eclipse.e4.tools.emf.ui.tests</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.pde.ManifestBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.pde.SchemaBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.pde.PluginNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
2 changes: 2 additions & 0 deletions
2
org.eclipse.e4.tools.emf.ui.tests/.settings/org.eclipse.core.resources.prefs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| encoding/<project>=UTF-8 |
9 changes: 9 additions & 0 deletions
9
org.eclipse.e4.tools.emf.ui.tests/.settings/org.eclipse.jdt.core.prefs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 | ||
| org.eclipse.jdt.core.compiler.compliance=21 | ||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled | ||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning | ||
| org.eclipse.jdt.core.compiler.release=enabled | ||
| org.eclipse.jdt.core.compiler.source=21 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| Manifest-Version: 1.0 | ||
| Bundle-ManifestVersion: 2 | ||
| Bundle-Name: EMF UI Test-Fragment | ||
| Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui.tests | ||
| Bundle-Version: 1.0.0.qualifier | ||
| Bundle-Vendor: Eclipse.org | ||
| Fragment-Host: org.eclipse.e4.tools.emf.ui | ||
| Automatic-Module-Name: org.eclipse.e4.tools.emf.ui.tests | ||
| Bundle-RequiredExecutionEnvironment: JavaSE-21 | ||
| Import-Package: org.junit.jupiter.api;version="[5.14.3,6.0.0)" | ||
| Require-Bundle: org.eclipse.ui, | ||
| org.eclipse.ui.ide, | ||
| org.eclipse.e4.tools.emf.editor3x |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| output.. = bin/ | ||
| bin.includes = META-INF/ |
131 changes: 131 additions & 0 deletions
131
...ests/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/tests/XmiTabTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.tests; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URL; | ||
|
|
||
| import org.eclipse.core.resources.IFile; | ||
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.resources.IProjectDescription; | ||
| import org.eclipse.core.resources.IWorkspace; | ||
| import org.eclipse.core.resources.ResourcesPlugin; | ||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.core.runtime.FileLocator; | ||
| import org.eclipse.core.runtime.IPath; | ||
| import org.eclipse.e4.core.contexts.IEclipseContext; | ||
| import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.XmiTab; | ||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.custom.CTabFolder; | ||
| import org.eclipse.swt.custom.StyledText; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Display; | ||
| import org.eclipse.swt.widgets.Event; | ||
| import org.eclipse.swt.widgets.Text; | ||
| import org.eclipse.swt.widgets.Widget; | ||
| import org.eclipse.ui.IEditorPart; | ||
| import org.eclipse.ui.IWorkbenchPage; | ||
| import org.eclipse.ui.PlatformUI; | ||
| import org.eclipse.ui.ide.IDE; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.osgi.framework.FrameworkUtil; | ||
|
|
||
| public class XmiTabTest { | ||
|
|
||
| private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm"; //$NON-NLS-1$ | ||
|
|
||
| private IProject project; | ||
| private XmiTab xmiTab; | ||
| private Text searchTextWidget; | ||
| private StyledText sourceViewerTextWidget; | ||
|
|
||
| @BeforeEach | ||
| void setup() throws IOException, CoreException { | ||
| project = importTestProject("/tests/projects/xmitabtest"); | ||
| waitForUI(); | ||
|
|
||
| IFile file = project.getFile("src/Application.e4xmi"); | ||
| IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); | ||
| IEditorPart part = IDE.openEditor(page, file, MODEL_EDITOR_ID, true); | ||
| IEclipseContext context = part.getSite().getService(IEclipseContext.class); | ||
| Composite composite = context.get(Composite.class); | ||
| waitForUI(); | ||
|
|
||
| CTabFolder folder = (CTabFolder) composite.getChildren()[0]; | ||
| folder.setSelection(2 /* XMI tab index */); | ||
| waitForUI(); | ||
|
|
||
| xmiTab = (XmiTab) folder.getSelection().getControl(); | ||
| searchTextWidget = (Text) xmiTab.getChildren()[0]; | ||
| Composite sourceViewerComposite = (Composite) xmiTab.getChildren()[1]; | ||
| sourceViewerTextWidget = (StyledText) sourceViewerComposite.getChildren()[0]; | ||
| } | ||
|
|
||
| @AfterEach | ||
| void tearDown() throws CoreException { | ||
| if (project != null) { | ||
| project.delete(IProject.FORCE | IProject.NEVER_DELETE_PROJECT_CONTENT, null); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testSearchHighlight() { | ||
| searchTextWidget.forceFocus(); | ||
| waitForUI(); | ||
|
|
||
| Display display = Display.getDefault(); | ||
| display.post(keyEvent('a', SWT.KeyDown, display.getFocusControl())); | ||
| waitForUI(); | ||
|
|
||
| int[] ranges = sourceViewerTextWidget.getSelectionRanges(); | ||
| assertEquals(ranges[0], 41); | ||
| assertEquals(ranges[1], 1); | ||
|
|
||
| display.post(keyEvent('d', SWT.KeyDown, display.getFocusControl())); | ||
| waitForUI(); | ||
|
|
||
| ranges = sourceViewerTextWidget.getSelectionRanges(); | ||
| assertEquals(ranges[0], 262); | ||
| assertEquals(ranges[1], 2); | ||
|
|
||
| // find next occurrence | ||
| display.post(keyEvent(SWT.CR, SWT.KeyDown, display.getFocusControl())); | ||
| waitForUI(); | ||
|
|
||
| ranges = sourceViewerTextWidget.getSelectionRanges(); | ||
| assertEquals(ranges[0], 467); | ||
| assertEquals(ranges[1], 2); | ||
| } | ||
|
|
||
| private static void waitForUI() { | ||
| while (Display.getDefault().readAndDispatch()) { | ||
| // wait for UI | ||
| } | ||
| } | ||
|
|
||
| private static Event keyEvent(int key, int type, Widget widget) { | ||
| Event e = new Event(); | ||
| e.keyCode = key; | ||
| e.character = (char) key; | ||
| e.type = type; | ||
| e.widget = widget; | ||
| return e; | ||
| } | ||
|
|
||
| private static IProject importTestProject(String path) throws IOException, CoreException { | ||
| URL entry = FileLocator | ||
| .toFileURL(FileLocator.find(FrameworkUtil.getBundle(XmiTabTest.class), IPath.fromOSString(path))); | ||
| if (entry == null) { | ||
| throw new IllegalArgumentException(path + " does not exist"); | ||
| } | ||
| IPath projectFile = IPath.fromPortableString(entry.getPath()).append(IProjectDescription.DESCRIPTION_FILE_NAME); | ||
| IWorkspace workspace = ResourcesPlugin.getWorkspace(); | ||
| IProjectDescription projectDescription = workspace.loadProjectDescription(projectFile); | ||
| IProject project = workspace.getRoot().getProject(projectDescription.getName()); | ||
| project.create(projectDescription, null); | ||
| project.open(null); | ||
| return project; | ||
| } | ||
| } | ||
10 changes: 10 additions & 0 deletions
10
org.eclipse.e4.tools.emf.ui.tests/tests/projects/xmitabtest/.classpath
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"> | ||
| <attributes> | ||
| <attribute name="module" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
17 changes: 17 additions & 0 deletions
17
org.eclipse.e4.tools.emf.ui.tests/tests/projects/xmitabtest/.project
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>xmitabtest</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
2 changes: 2 additions & 0 deletions
2
...4.tools.emf.ui.tests/tests/projects/xmitabtest/.settings/org.eclipse.core.resources.prefs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| encoding/<project>=UTF-8 |
11 changes: 11 additions & 0 deletions
11
...ipse.e4.tools.emf.ui.tests/tests/projects/xmitabtest/.settings/org.eclipse.jdt.core.prefs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 | ||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
| org.eclipse.jdt.core.compiler.compliance=21 | ||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
| org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled | ||
| org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning | ||
| org.eclipse.jdt.core.compiler.release=enabled | ||
| org.eclipse.jdt.core.compiler.source=21 |
10 changes: 10 additions & 0 deletions
10
org.eclipse.e4.tools.emf.ui.tests/tests/projects/xmitabtest/src/Application.e4xmi
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="ASCII"?> | ||
| <application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmi:id="_LCXToEJBEfGXuaENIB6s3w" elementId="xmitabtest.application"> | ||
| <addons xmi:id="_LCXToUJBEfGXuaENIB6s3w" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/> | ||
| <addons xmi:id="_LCXTokJBEfGXuaENIB6s3w" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/> | ||
| <addons xmi:id="_LCXTo0JBEfGXuaENIB6s3w" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/> | ||
| <addons xmi:id="_LCXTpEJBEfGXuaENIB6s3w" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/> | ||
| <addons xmi:id="_LCXTpUJBEfGXuaENIB6s3w" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/> | ||
| <addons xmi:id="_LCXTpkJBEfGXuaENIB6s3w" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/> | ||
| <addons xmi:id="_LCXTp0JBEfGXuaENIB6s3w" elementId="org.eclipse.e4.ui.workbench.handler.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/> | ||
| </application:Application> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These helper methods could be replaced by existing utility methods (e.g. org.eclipse.pde.ui.tests.util.ProjectUtils), but I wasn't sure if depending on org.eclipse.pde.ui.tests would introduce some problems here.