Skip to content
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

Jump to bottom

Fix failing case in Bug528706CompletionWithMultilineTagsTest #1431

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Fix failing case in Bug528706CompletionWithMultilineTagsTest #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4fee78
Fix failing case in Bug528706CompletionWithMultilineTagsTest
HannesWell Oct 3, 2024
92e97d3
Version bump(s) for 4.34 stream
eclipse-pde-bot Oct 3, 2024
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
2 changes: 1 addition & 1 deletion ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF
View file
Open in desktop
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: Tests for Generic Target Platform Editor
Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension.tests
Bundle-Version: 1.2.400.qualifier
Bundle-Version: 1.2.500.qualifier
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.pde.genericeditor.extension.tests</artifactId>
<version>1.2.400-SNAPSHOT</version>
<version>1.2.500-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<properties>
Expand Down
26 changes: 8 additions & 18 deletions ...ion.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

import org.eclipse.core.filebuffers.FileBuffers;
Expand Down Expand Up @@ -52,12 +54,7 @@ public abstract class AbstractTargetEditorTest {
protected File tempFile;

protected void checkProposals(String[] expectedProposals, ICompletionProposal[] actualProposals, int offset) {
assertEquals("Proposal lengths are not equal at offset " + offset + ". Actual: "
+ proposalListToString(actualProposals), expectedProposals.length, actualProposals.length);
for (int i = 0; i < actualProposals.length; i++) {
assertEquals("Proposal at index " + i + " did not match expected at offset " + offset,
actualProposals[i].getDisplayString(), expectedProposals[i]);
}
assertEquals(Arrays.asList(expectedProposals), toProposalStrings(actualProposals));
}

@Before
Expand Down Expand Up @@ -102,18 +99,11 @@ protected String proposalListToString(ICompletionProposal[] proposals) {
if (proposals == null) {
return "null";
}
if (proposals.length == 0) {
return "[]";
}
StringBuilder builder = new StringBuilder();
builder.append('[');
for (ICompletionProposal proposal : proposals) {
builder.append(proposal.getDisplayString());
builder.append(", ");
}
builder.setLength(builder.length() - 2);
builder.append(']');
return builder.toString();
return "[" + String.join(",", toProposalStrings(proposals)) + "]";
}

private static List<String> toProposalStrings(ICompletionProposal[] proposals) {
return Arrays.stream(proposals).map(ICompletionProposal::getDisplayString).toList();
}

public static ITextFileBuffer getTextFileBufferFromFile(File file) {
Expand Down
4 changes: 2 additions & 2 deletions ...g/eclipse/pde/genericeditor/extension/tests/Bug528706CompletionWithMultilineTagsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.pde.genericeditor.extension.tests;

import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.text.ITextViewer;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -49,8 +50,7 @@ public void testTagValueCompletionAsAMultiline() {

@Test
public void testTagValueCompletionAfterAMultiline() {
checkProposals(new String[] { "x86", "x86_64" },
contentAssist.computeCompletionProposals(textViewer, 181 + 1), 181);
checkProposals(Platform.knownOSArchValues(), contentAssist.computeCompletionProposals(textViewer, 181), 181);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...e.genericeditor.extension.tests/testing-files/target-files/MultilineTagTestCaseTarget.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
linu

</os>
<arch>x</arch>
<arch></arch>
</environment>
</target>
Loading