Skip to content

test: migrate to JUnit5 #1303

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
markdomeng merged 1 commit into from
Apr 6, 2026
Merged

test: migrate to JUnit5 #1303

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 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime,
org.junit,
com.avaloq.tools.ddk.xtext.builder,
org.eclipse.xtext.builder,
org.mockito.mockito-core,
Expand Down
9 changes: 5 additions & 4 deletions ....tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/AbstractFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
*******************************************************************************/
package com.avaloq.tools.ddk.xtext.formatter;

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

import java.io.IOException;

import org.eclipse.emf.ecore.EObject;
Expand All @@ -19,7 +21,6 @@
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
import org.eclipse.xtext.resource.SaveOptions;
import org.eclipse.xtext.serializer.ISerializer;
import org.junit.Assert;

import com.avaloq.tools.ddk.xtext.test.AbstractXtextTest;

Expand Down Expand Up @@ -55,21 +56,21 @@ protected ISerializer getSerializer() {
protected void assertFormattedPTC(final String expected, final String model) throws IOException {
EObject m = getModel(model);
String res = getSerializer().serialize(m, SaveOptions.newBuilder().format().getOptions());
Assert.assertEquals("Serialization not equal", expected, res);
assertEquals(expected, res, "Serialization not equal");
}

protected void assertPreserved(final String model) throws IOException {
EObject m = getModel(model);
String res = getSerializer().serialize(m, SaveOptions.newBuilder().getOptions());
Assert.assertEquals("Preserved node model", model, res);
assertEquals(model, res, "Preserved node model");
}

// test formatting based on the NodeModel
protected void assertFormattedNM(final String expected, final String model, final int offset, final int length) throws IOException {
ICompositeNode node = NodeModelUtils.getNode(getModel(model)).getRootNode();
IFormattedRegion r = getXtextTestUtil().get(INodeModelFormatter.class).format(node, offset, length);
String actual = model.substring(0, r.getOffset()) + r.getFormattedText() + model.substring(r.getLength() + r.getOffset());
Assert.assertEquals("Formatting based on the NodeModel", expected, actual);
assertEquals(expected, actual, "Formatting based on the NodeModel");
}

}
Loading