Skip to content

Commit

Permalink
LemMinX-Maven 0.10.1 + Lemminx 0.27.0 + WWD 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@vrubezhny @laeubi
vrubezhny authored and laeubi committed Aug 15, 2023
1 parent 8c4961d commit cf3505f
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: M2E Maven POM File Editor using Wild Web Developer, Lemminx and Maven LS extension Tests
Bundle-SymbolicName: org.eclipse.m2e.editor.lemminx.tests
Bundle-Version: 2.0.0.qualifier
Bundle-Version: 2.0.1.qualifier
Automatic-Module-Name: org.eclipse.m2e.editor.lemminx.tests
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: Eclipse.org - m2e
Expand Down
14 changes: 10 additions & 4 deletions ...eclipse.m2e.editor.lemminx.tests/src/org/eclipse/m2e/editor/lemminx/tests/EditorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.eclipse.ui.tests.harness.util.DisplayHelper;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.ITextEditorActionConstants;
import org.eclipse.wildwebdeveloper.xml.internal.Activator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand All @@ -49,11 +50,17 @@
public class EditorTest extends AbstractMavenProjectTestCase {

private static final String GENERIC_EDITOR = "org.eclipse.ui.genericeditor.GenericEditor";

private static final String XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES = "org.eclipse.wildwebdeveloper.xml.downloadExternalResources.enabled";

private static final long WAIT_TIMEOUT = 15000;

private IWorkbenchPage page;
private IProject project;

@Before
public void setPage() {
Activator.getDefault().getPreferenceStore().setValue(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES, true);
page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
}

Expand All @@ -74,8 +81,7 @@ public void testGenericEditorHasMavenExtensionEnabled() throws Exception {
pomFile.create(getClass().getResourceAsStream("pom.xml"), true, null);
ITextEditor editorPart = (ITextEditor)IDE.openEditor(page, pomFile, GENERIC_EDITOR);
Display display = page.getWorkbenchWindow().getShell().getDisplay();
assertTrue("Missing diagnostic report", DisplayHelper.waitForCondition(display, 10000, () ->
{
assertTrue("Missing diagnostic report", DisplayHelper.waitForCondition(display, WAIT_TIMEOUT, () -> {
try {
return Arrays.stream(pomFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO)).anyMatch(marker ->
marker.getAttribute(IMarker.SEVERITY, -1) == IMarker.SEVERITY_ERROR &&
Expand All @@ -90,7 +96,7 @@ public void testGenericEditorHasMavenExtensionEnabled() throws Exception {
Set<Shell> beforeShells = Arrays.stream(display.getShells()).filter(Shell::isVisible).collect(Collectors.toSet());
editorPart.getSelectionProvider().setSelection(new TextSelection(offset, 0));
editorPart.getAction(ITextEditorActionConstants.CONTENT_ASSIST).run();
assertTrue("Missing completion proposals", DisplayHelper.waitForCondition(display, 10000, () -> {
assertTrue("Missing completion proposals", DisplayHelper.waitForCondition(display, WAIT_TIMEOUT, () -> {
Set<Shell> afterShells = Arrays.stream(display.getShells()).filter(Shell::isVisible).collect(Collectors.toSet());
afterShells.removeAll(beforeShells);
return afterShells.stream()
Expand Down Expand Up @@ -129,7 +135,7 @@ public void testOpenChildThenParentResolvesParent() throws Exception {
IFile pomFile = child.getFile("pom.xml");
page.openEditor(new FileEditorInput(pomFile), GENERIC_EDITOR);
Display display = page.getWorkbenchWindow().getShell().getDisplay();
assertTrue("Expected marker not published", DisplayHelper.waitForCondition(display, 60000, () -> {
assertTrue("Expected marker not published", DisplayHelper.waitForCondition(display, WAIT_TIMEOUT, () -> {
try {
IMarker[] markers = pomFile.findMarkers("org.eclipse.lsp4e.diagnostic", false, IResource.DEPTH_ZERO);
if (markers.length == 0) {
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Import-Package: javax.inject;version="[1.0.0,2.0.0)",
org.eclipse.core.runtime;version="3.5.0",
org.osgi.framework;version="1.10.0",
org.slf4j;version="[1.7.0,3.0.0)"
Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.2,1.3)",
Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.3,1.4)",
org.eclipse.lsp4e;bundle-version="0.16.0",
org.eclipse.lsp4j;bundle-version="0.9.0",
org.eclipse.m2e.core,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.editor.lemminx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<groupId>org.eclipse.lemminx</groupId>
<artifactId>lemminx-maven</artifactId>
<!-- Don't release m2e if this points to SNAPSHOT -->
<version>0.9.0</version>
<version>0.10.1</version>
<outputDirectory>${project.basedir}</outputDirectory>
<destFileName>lemminx-maven.jar</destFileName>
<!-- Edit forceQualifierUpdate.txt to force usage of newer SNAPSHOT, otherwise
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.repository/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</query>
</iu>
<category-def name="m2e" label="Maven Integration for Eclipse"/>
<repository-reference location="https://download.eclipse.org/wildwebdeveloper/releases/1.2.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4e/releases/0.23.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/eclipse/updates/4.28/" enabled="true" />
Expand Down
2 changes: 1 addition & 1 deletion target-platform/target-platform.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.2.0/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.0/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand Down

0 comments on commit cf3505f

Please sign in to comment.