Skip to content

Migrate remaining Ant UI tests to JUnit 5 #2368

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
HeikoKlare merged 1 commit into from
Jan 2, 2026
+100 −93
Merged

Migrate remaining Ant UI tests to JUnit 5 #2368

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
103 changes: 55 additions & 48 deletions ...eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/AntEditorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package org.eclipse.ant.tests.ui.editor;

import static org.eclipse.ant.tests.ui.testplugin.AntUITestUtil.getIFile;
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.io.File;

Expand All @@ -33,7 +33,7 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.Test;

@SuppressWarnings("restriction")
@AntUITest
Expand All @@ -47,9 +47,10 @@ public void testHoverForPath() throws PartInitException, BadLocationException {
int offset = getOffsetWithinLine(editor, 9, 20);
IRegion region = hover.getHoverRegion(editor.getViewer(), offset);
String hoverText = hover.getHoverInfo(editor.getViewer(), region);
assertNotNull("Expecting a hovertext object", hoverText); //$NON-NLS-1$
assertNotNull(hoverText, "Expecting a hovertext object"); //$NON-NLS-1$
String correctResultRegEx = "<html><body text=\"#.*\" bgcolor=\"#.*\"><h5>Path Elements:</h5><ul><li>.*</html>"; //$NON-NLS-1$
assertTrue("Expected the following hover text to match regex: " + correctResultRegEx, hoverText.matches(correctResultRegEx)); //$NON-NLS-1$
assertTrue(hoverText.matches(correctResultRegEx),
"Expected the following hover text to match regex: " + correctResultRegEx); //$NON-NLS-1$
}

@Test
Expand All @@ -60,9 +61,10 @@ public void testHoverForProperty() throws PartInitException, BadLocationExceptio
int offset = getOffsetWithinLine(editor, 42, 13);
IRegion region = hover.getHoverRegion(editor.getViewer(), offset);
String hoverText = hover.getHoverInfo(editor.getViewer(), region);
assertNotNull("Expecting a hovertext object", hoverText); //$NON-NLS-1$
assertNotNull(hoverText, "Expecting a hovertext object"); //$NON-NLS-1$
String correctResult = "<p>value with spaces</body></html>"; //$NON-NLS-1$
assertTrue("Expected the following hover text to end with: " + correctResult, hoverText.endsWith(correctResult)); //$NON-NLS-1$
assertTrue(hoverText.endsWith(correctResult),
"Expected the following hover text to end with: " + correctResult); //$NON-NLS-1$
}

@Test
Expand All @@ -74,7 +76,7 @@ public void testPropertyOpenDeclaration() throws PartInitException, BadLocationE

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "property", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals(selection.getText(), "property", "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -85,9 +87,10 @@ public void testPatternSetHover() throws PartInitException, BadLocationException
int offset = getOffsetWithinLine(editor, 45, 25);
IRegion region = hover.getHoverRegion(editor.getViewer(), offset);
String hoverText = hover.getHoverInfo(editor.getViewer(), region);
assertNotNull("Expecting a hovertext object", hoverText); //$NON-NLS-1$
assertNotNull(hoverText, "Expecting a hovertext object"); //$NON-NLS-1$
String correctResult = "<h5>Includes:</h5><li>*.xml</li><p><p><h5>Excludes:</h5><li>**/*Test*</li></body></html>"; //$NON-NLS-1$
assertTrue("Expected the following hover text to end with: " + correctResult + "was: " + hoverText, hoverText.endsWith(correctResult)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(hoverText.endsWith(correctResult),
"Expected the following hover text to end with: " + correctResult + "was: " + hoverText); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -98,9 +101,10 @@ public void testBadPatternSetHover() throws PartInitException, BadLocationExcept
int offset = getOffsetWithinLine(editor, 46, 25);
IRegion region = hover.getHoverRegion(editor.getViewer(), offset);
String hoverText = hover.getHoverInfo(editor.getViewer(), region);
assertNotNull("Expecting a hovertext object", hoverText); //$NON-NLS-1$
assertNotNull(hoverText, "Expecting a hovertext object"); //$NON-NLS-1$
String correctResult = "Ant UI Tests" + File.separatorChar + "buildfiles" + File.separatorChar + "nothere not found."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
assertTrue("Expected the following hover text to ends with: " + correctResult, hoverText.endsWith(correctResult)); //$NON-NLS-1$
assertTrue(hoverText.endsWith(correctResult),
"Expected the following hover text to ends with: " + correctResult); //$NON-NLS-1$
}

@Test
Expand All @@ -111,19 +115,21 @@ public void testFileSetHover() throws PartInitException, BadLocationException {
int offset = getOffsetWithinLine(editor, 44, 20);
IRegion region = hover.getHoverRegion(editor.getViewer(), offset);
String hoverText = hover.getHoverInfo(editor.getViewer(), region);
assertNotNull("Expecting a hovertext object", hoverText); //$NON-NLS-1$
assertTrue("Expected to see '<h5>Includes:</h5><li>include</li>'", hoverText.contains("<h5>Includes:</h5><li>include</li>")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("Expected to see '<h5>Excludes:</h5><li>exclude</li>'", hoverText.contains("<h5>Excludes:</h5><li>exclude</li>")); //$NON-NLS-1$ //$NON-NLS-2$
assertNotNull(hoverText, "Expecting a hovertext object"); //$NON-NLS-1$
assertTrue(hoverText.contains("<h5>Includes:</h5><li>include</li>"), //$NON-NLS-1$
"Expected to see '<h5>Includes:</h5><li>include</li>'"); //$NON-NLS-1$
assertTrue(hoverText.contains("<h5>Excludes:</h5><li>exclude</li>"), //$NON-NLS-1$
"Expected to see '<h5>Excludes:</h5><li>exclude</li>'"); //$NON-NLS-1$
String text = "<li>**" + File.separator + "SCCS" + File.separator + "**</li>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
assertTrue("Expected to see '<li>**/SCCS/**</li>'", hoverText.contains(text)); //$NON-NLS-1$
assertTrue(hoverText.contains(text), "Expected to see '<li>**/SCCS/**</li>'"); //$NON-NLS-1$
text = "<li>**" + File.separator + ".DS_Store</li>"; //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("Expected to see '<li>**/.DS_Store</li>'", hoverText.contains(text)); //$NON-NLS-1$
assertTrue(hoverText.contains(text), "Expected to see '<li>**/.DS_Store</li>'"); //$NON-NLS-1$
text = "<li>**" + File.separator + ".bzrignore</li>"; //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("Expected to see '<li>**/.bzrignore</li>'", hoverText.contains(text)); //$NON-NLS-1$
assertTrue(hoverText.contains(text), "Expected to see '<li>**/.bzrignore</li>'"); //$NON-NLS-1$
text = "<li>**" + File.separator + ".gitattributes</li>"; //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("Expected to see '<li>**/.gitattributes</li>'", hoverText.contains(text)); //$NON-NLS-1$
assertTrue(hoverText.contains(text), "Expected to see '<li>**/.gitattributes</li>'"); //$NON-NLS-1$
text = "<li>**" + File.separator + ".hgtags</li>"; //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("Expected to see '<li>**/.hgtags</li>'", hoverText.contains(text)); //$NON-NLS-1$
assertTrue(hoverText.contains(text), "Expected to see '<li>**/.hgtags</li>'"); //$NON-NLS-1$
}

@Test
Expand All @@ -135,14 +141,14 @@ public void testTaskdefOpenDeclaration() throws PartInitException, BadLocationEx

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "taskdef", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("taskdef", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$

offset = getOffsetWithinLine(editor, 9, 10);
editor.selectAndReveal(offset, 3);

editor.openReferenceElement();
selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "taskdef", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("taskdef", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -154,14 +160,14 @@ public void testMacroDefOpenDeclaration() throws PartInitException, BadLocationE

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "macrodef", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("macrodef", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$

offset = getOffsetWithinLine(editor, 14, 9);
editor.selectAndReveal(offset, 1);

editor.openReferenceElement();
selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "macrodef", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("macrodef", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

/**
Expand All @@ -176,7 +182,7 @@ public void testMacroDefOpenDeclarationWithURI() throws PartInitException, BadLo

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct:", "macrodef", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("macrodef", selection.getText(), "Selection is not correct:"); //$NON-NLS-1$ //$NON-NLS-2$
}

/**
Expand All @@ -191,7 +197,7 @@ public void testSelfClosingTagOpenDeclaration() throws PartInitException, BadLoc

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "macrodef", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("macrodef", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -203,7 +209,7 @@ public void testMacroDefAttributeOpenDeclaration() throws PartInitException, Bad

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "attribute", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("attribute", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -215,7 +221,7 @@ public void testRefOpenDeclaration() throws PartInitException, BadLocationExcept

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "path", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("path", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -227,7 +233,7 @@ public void testTargetOpenDeclaration() throws PartInitException, BadLocationExc

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "target", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("target", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
Expand All @@ -239,7 +245,7 @@ public void testExtensionPointOpenDeclaration() throws PartInitException, BadLoc

editor.openReferenceElement();
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "extension-point", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("extension-point", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

/**
Expand All @@ -251,7 +257,7 @@ public void testExtensionPointOpenDeclaration() throws PartInitException, BadLoc
public void testAugmentOpenInEditor() throws Exception {
IFile file = getIFile("bug377075.ent"); //$NON-NLS-1$
IEditorPart part = EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
assertTrue("The opened editor must be the AntEditor", part instanceof AntEditor); //$NON-NLS-1$
assertTrue(part instanceof AntEditor, "The opened editor must be the AntEditor"); //$NON-NLS-1$
}

/**
Expand All @@ -263,12 +269,12 @@ public void testAugmentOpenInEditor() throws Exception {
public void testAugmentOpenAndSelect() throws Exception {
IFile file = getIFile("bug377075.ent"); //$NON-NLS-1$
IEditorPart part = EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
assertTrue("The opened editor must be the AntEditor", part instanceof AntEditor); //$NON-NLS-1$
assertTrue(part instanceof AntEditor, "The opened editor must be the AntEditor"); //$NON-NLS-1$
AntEditor editor = (AntEditor) part;
int offset = getOffsetWithinLine(editor, 5, 3);
editor.selectAndReveal(offset, 7); // should have 'augment' selected
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "augment", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("augment", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
}

/**
Expand All @@ -280,18 +286,18 @@ public void testAugmentOpenAndSelect() throws Exception {
public void testAugmentOpenSelectHover() throws Exception {
IFile file = getIFile("bug377075.ent"); //$NON-NLS-1$
IEditorPart part = EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
assertTrue("The opened editor must be the AntEditor", part instanceof AntEditor); //$NON-NLS-1$
assertTrue(part instanceof AntEditor, "The opened editor must be the AntEditor"); //$NON-NLS-1$
AntEditor editor = (AntEditor) part;
int offset = getOffsetWithinLine(editor, 1, 11);
editor.selectAndReveal(offset, 5); // select the 'path1' id for the path element
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
assertEquals("Selection is not correct", "path1", selection.getText()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("path1", selection.getText(), "Selection is not correct"); //$NON-NLS-1$ //$NON-NLS-2$
XMLTextHover hover = new XMLTextHover(editor);
IRegion region = hover.getHoverRegion(editor.getViewer(), offset);
assertNotNull("The selected region for the augmented element cannot be null", region); //$NON-NLS-1$
assertNotNull(region, "The selected region for the augmented element cannot be null"); //$NON-NLS-1$
String text = hover.getHoverInfo(editor.getViewer(), region);
assertNotNull("The hover text for the path element must not be null", text); //$NON-NLS-1$
assertTrue("The hover text must contain the augmented element 'foo'", text.contains("foo")); //$NON-NLS-1$ //$NON-NLS-2$
assertNotNull(text, "The hover text for the path element must not be null"); //$NON-NLS-1$
assertTrue(text.contains("foo"), "The hover text must contain the augmented element 'foo'"); //$NON-NLS-1$ //$NON-NLS-2$
}

/**
Expand All @@ -303,7 +309,7 @@ public void testAugmentOpenSelectHover() throws Exception {
public void testAugmentMissingId() throws Exception {
IFile file = getIFile("bug396219.ent"); //$NON-NLS-1$
IEditorPart part = EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
assertTrue("The opened editor must be the AntEditor", part instanceof AntEditor); //$NON-NLS-1$
assertTrue(part instanceof AntEditor, "The opened editor must be the AntEditor"); //$NON-NLS-1$
}

@Test
Expand All @@ -318,8 +324,9 @@ public void testHoverRegionWithSpaces() throws PartInitException, BadLocationExc
assertNotNull(region);
IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
String text = doc.get(region.getOffset(), region.getLength());
assertTrue("Region incorrect. Expected length of 7 and text of \"compile\", length was " + region.getLength() + " and text was " //$NON-NLS-1$ //$NON-NLS-2$
+ text, region.getLength() == 7 && "compile".equals(text)); //$NON-NLS-1$
assertTrue(region.getLength() == 7 && "compile".equals(text), //$NON-NLS-1$
"Region incorrect. Expected length of 7 and text of \"compile\", length was " + region.getLength() //$NON-NLS-1$
+ " and text was " + text); //$NON-NLS-1$
}

@Test
Expand All @@ -329,30 +336,30 @@ public void testOpenImport() throws PartInitException {

IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());

assertNotNull("Should have a document", doc); //$NON-NLS-1$
assertNotNull(doc, "Should have a document"); //$NON-NLS-1$
}

@Test
public void testOpenImportViaClasspath() throws PartInitException {
IFile file = getIFile("importViaClasspath.xml"); //$NON-NLS-1$
AntEditor editor = (AntEditor) EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
assertNotNull("Should have a document", doc); //$NON-NLS-1$
assertNotNull(doc, "Should have a document"); //$NON-NLS-1$

file = getIFile("BaseBaseBuild.xml"); //$NON-NLS-1$
editor = (AntEditor) EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
assertNotNull("Should have a document", doc); //$NON-NLS-1$
assertNotNull(doc, "Should have a document"); //$NON-NLS-1$

file = getIFile("BaseBuild.xml"); //$NON-NLS-1$
editor = (AntEditor) EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
assertNotNull("Should have a document", doc); //$NON-NLS-1$
assertNotNull(doc, "Should have a document"); //$NON-NLS-1$

file = getIFile("Base.xml"); //$NON-NLS-1$
editor = (AntEditor) EditorTestHelper.openInEditor(file, "org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
assertNotNull("Should have a document", doc); //$NON-NLS-1$
assertNotNull(doc, "Should have a document"); //$NON-NLS-1$
}

/**
Expand All @@ -363,7 +370,7 @@ public void testOpenImportWithByteOrderMark() throws PartInitException {
IFile file = getIFile("importWithByteOrderMark.xml"); //$NON-NLS-1$
AntEditor editor = (AntEditor) EditorTestHelper.openInEditor(file,
"org.eclipse.ant.ui.internal.editor.AntEditor", true); //$NON-NLS-1$
assertNotNull("Should have imported target", editor.getAntModel().getTargetNode("build")); //$NON-NLS-1$ //$NON-NLS-2$
assertNotNull(editor.getAntModel().getTargetNode("build"), "Should have imported target"); //$NON-NLS-1$ //$NON-NLS-2$
}

private int getOffsetWithinLine(AntEditor editor, int lineNumber, int offsetInLine) throws BadLocationException {
Expand Down
4 changes: 2 additions & 2 deletions ...tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
*******************************************************************************/
package org.eclipse.ant.tests.ui.editor.formatter;

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

import org.eclipse.ant.internal.ui.AntUIPlugin;
import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
import org.eclipse.ant.internal.ui.editor.formatter.XmlFormatter;
import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.junit.Test;
import org.junit.jupiter.api.Test;

@SuppressWarnings("restriction")
public class XmlFormatterTest {
Expand Down
4 changes: 2 additions & 2 deletions ...Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestTextCompletionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistantExtension2;
import org.eclipse.jface.text.source.ISourceViewer;
import org.junit.Assert;
import org.junit.jupiter.api.Assertions;
import org.w3c.dom.Element;

@SuppressWarnings("restriction")
Expand Down Expand Up @@ -159,7 +159,7 @@ public File getEditedFile() {
tempFile = File.createTempFile("test", null); //$NON-NLS-1$
}
catch (IOException e) {
Assert.fail(e.getMessage());
Assertions.fail(e.getMessage());
}
tempFile.deleteOnExit();
return tempFile;
Expand Down
Loading
Loading