Skip to content

feat: Migrate cat.ddk.xtext.ui.test to Junit5 #42

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 2 commits into from
Oct 17, 2025
Merged

feat: Migrate cat.ddk.xtext.ui.test to Junit5 #42

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
ec38dde
feat: Migrate cat.ddk.xtext.ui.test to Junit5
MarkDomingo4458 Oct 17, 2025
42c2e02
Merge branch 'xtext_ui_test_j5' into junit5vintage2
markdomeng Oct 17, 2025
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
6 changes: 5 additions & 1 deletion com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.xtext.ui,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtext.testing,
org.mockito,
org.junit,
org.mockito.mockito-core,
com.avaloq.tools.ddk.xtext.ui,
Expand All @@ -16,6 +17,9 @@ Require-Bundle: org.eclipse.xtext.ui,
com.avaloq.tools.ddk.xtext.test.core,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine
junit-vintage-engine,
net.bytebuddy.byte-buddy,
org.objenesis,
junit-platform-suite-api
Export-Package: com.avaloq.tools.ddk.xtext.ui.test
Automatic-Module-Name: com.avaloq.tools.ddk.xtext.ui.test
6 changes: 3 additions & 3 deletions ...ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
import org.eclipse.xtext.validation.Issue;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;

import com.avaloq.tools.ddk.check.runtime.ui.quickfix.IModificationContextRegistry;
Expand All @@ -56,7 +56,7 @@
import com.google.inject.name.Names;


public class WorkbenchResolutionAdaptorRunTest {

Check warning on line 59 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate

private static final String TEST_FILE_NAME = "TestFileName"; //$NON-NLS-1$

Expand Down Expand Up @@ -95,8 +95,8 @@

private final WorkbenchMarkerResolutionGenerator wmrg = injector.getInstance(WorkbenchMarkerResolutionGenerator.class);

@Before
@BeforeEach
public void setUp() throws Exception {

Check warning on line 99 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java

View workflow job for this annotation

GitHub Actions / pmd

A method/constructor should not explicitly throw java.lang.Exception 

A method/constructor shouldn't explicitly throw the generic java.lang.Exception, since it
is unclear which exceptions that can be thrown from the methods. It might be
difficult to document and understand such vague interfaces. Use either a class
derived from RuntimeException or a checked exception.

SignatureDeclareThrowsException (Priority: 3, Ruleset: Design)
https://docs.pmd-code.org/snapshot/pmd_rules_java_design.html#signaturedeclarethrowsexception
wmrg.setIssueUtil(new IssueUtil());

when(mockRegistryProvider.get()).thenReturn(mockMarkerHelpRegistry);
Expand Down Expand Up @@ -128,7 +128,7 @@
}

@Test
public void testRun() throws CoreException {

Check warning on line 131 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate
WorkbenchResolutionAdapter adapter = wmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);
when(mockMarkerHelpRegistry.getResolutions(mockMarker)).thenReturn(mockMarkerResolutions);

Expand All @@ -142,7 +142,7 @@
}

@Test
public void testSingleRun() throws CoreException {

Check warning on line 145 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate
WorkbenchResolutionAdapter adapter = wmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);
when(mockMarkerHelpRegistry.getResolutions(mockMarker)).thenReturn(mockMarkerResolutions);

Expand Down
20 changes: 10 additions & 10 deletions ...xt.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

package com.avaloq.tools.ddk.xtext.ui.quickfix;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand All @@ -21,13 +21,13 @@
import org.eclipse.xtext.ui.editor.quickfix.IssueResolution;
import org.eclipse.xtext.ui.util.IssueUtil;
import org.eclipse.xtext.validation.Issue;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.avaloq.tools.ddk.xtext.ui.quickfix.WorkbenchMarkerResolutionGenerator.WorkbenchResolutionAdapter;


public class WorkbenchResolutionAdaptorTest {

Check warning on line 30 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate

private static final String TEST_LABEL = "ATestLabel"; //$NON-NLS-1$
private static final String TEST_DESCRIPTION = "ATestDescription"; //$NON-NLS-1$
Expand All @@ -37,13 +37,13 @@

private final WorkbenchMarkerResolutionGenerator mockWmrg = mock(WorkbenchMarkerResolutionGenerator.class);

@Before
@BeforeEach
public void setUp() throws Exception {

Check warning on line 41 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

View workflow job for this annotation

GitHub Actions / pmd

A method/constructor should not explicitly throw java.lang.Exception 

A method/constructor shouldn't explicitly throw the generic java.lang.Exception, since it
is unclear which exceptions that can be thrown from the methods. It might be
difficult to document and understand such vague interfaces. Use either a class
derived from RuntimeException or a checked exception.

SignatureDeclareThrowsException (Priority: 3, Ruleset: Design)
https://docs.pmd-code.org/snapshot/pmd_rules_java_design.html#signaturedeclarethrowsexception
when(mockWmrg.getIssueUtil()).thenReturn(new IssueUtil());
}

@Test
public void testGetLabel() {

Check warning on line 46 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate
IssueResolution mockIssueResolution = mock(IssueResolution.class);
IMarker mockMarker = mock(IMarker.class);

Expand All @@ -51,11 +51,11 @@

WorkbenchResolutionAdapter adapter = mockWmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);

assertEquals("Adapter delegates get label to resolution.", TEST_LABEL, adapter.getLabel()); //$NON-NLS-1$
assertEquals(TEST_LABEL, adapter.getLabel(), "Adapter delegates get label to resolution."); //$NON-NLS-1$
}

@Test
public void testGetDescription() {

Check warning on line 58 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate
IssueResolution mockIssueResolution = mock(IssueResolution.class);
IMarker mockMarker = mock(IMarker.class);

Expand All @@ -63,11 +63,11 @@

WorkbenchResolutionAdapter adapter = mockWmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);

assertEquals("Adapter delegates get description to resolution.", TEST_DESCRIPTION, adapter.getDescription()); //$NON-NLS-1$
assertEquals(TEST_DESCRIPTION, adapter.getDescription(), "Adapter delegates get description to resolution."); //$NON-NLS-1$
}

@Test
public void testGetImage() {

Check warning on line 70 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate
IssueResolution mockIssueResolution = mock(IssueResolution.class);
IMarker mockMarker = mock(IMarker.class);

Expand All @@ -75,11 +75,11 @@

WorkbenchResolutionAdapter adapter = mockWmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);

assertEquals("Adapter delegates get Image to resolution.", TEST_IMAGE, adapter.getImage()); //$NON-NLS-1$
assertEquals(TEST_IMAGE, adapter.getImage(), "Adapter delegates get Image to resolution."); //$NON-NLS-1$
}

@Test
public void findOtherMarkers() {

Check warning on line 82 in com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

View workflow job for this annotation

GitHub Actions / pmd

JUnit 5 tests should be package-private. 

Reports JUnit 5 test classes and methods that are not package-private.
Contrary to JUnit 4 tests, which required public visibility to be run by the engine,
JUnit 5 tests can also be run if they're package-private. Marking them as such
is a good practice to limit their visibility.

Test methods are identified as those which use `@Test`, `@RepeatedTest`,
`@TestFactory`, `@TestTemplate` or `@ParameterizedTest`.

JUnit5TestShouldBePackagePrivate (Priority: 3, Ruleset: Best Practices)
https://docs.pmd-code.org/snapshot/pmd_rules_java_bestpractices.html#junit5testshouldbepackageprivate
IssueResolution mockIssueResolution = mock(IssueResolution.class);
IMarker mockResolutionMarker = mock(IMarker.class);
when(mockResolutionMarker.getAttribute(Issue.CODE_KEY, null)).thenReturn(CODE1);
Expand All @@ -95,14 +95,14 @@

WorkbenchResolutionAdapter adapter = mockWmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockResolutionMarker);

assertArrayEquals("Adapter findOtherMarkers matching on CODE1.", matchingMarkers, adapter.findOtherMarkers(allMarkers)); //$NON-NLS-1$
assertArrayEquals(matchingMarkers, adapter.findOtherMarkers(allMarkers), "Adapter findOtherMarkers matching on CODE1."); //$NON-NLS-1$

when(mockResolutionMarker.getAttribute(Issue.CODE_KEY, null)).thenReturn(CODE2);
matchingMarkers = new IMarker[] {mockMarker2};

adapter = mockWmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockResolutionMarker);

assertArrayEquals("Adapter findOtherMarkers matching on CODE2.", matchingMarkers, adapter.findOtherMarkers(allMarkers)); //$NON-NLS-1$
assertArrayEquals(matchingMarkers, adapter.findOtherMarkers(allMarkers), "Adapter findOtherMarkers matching on CODE2."); //$NON-NLS-1$

}

Expand Down
28 changes: 16 additions & 12 deletions ...src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,29 @@

package com.avaloq.tools.ddk.xtext.ui.templates;

import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.templates.TemplateException;
import org.eclipse.jface.text.templates.TemplateVariable;
import org.eclipse.xtext.XtextRuntimeModule;
import org.eclipse.xtext.testing.extensions.InjectionExtension;
import org.eclipse.xtext.ui.editor.model.IXtextDocument;
import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;

import com.avaloq.tools.ddk.test.core.AfterAll;
import com.avaloq.tools.ddk.test.core.BeforeAll;
import com.avaloq.tools.ddk.xtext.test.junit.runners.XtextClassRunner;
import com.google.common.collect.Iterables;
import com.google.inject.Guice;


@RunWith(XtextClassRunner.class)
@ExtendWith(InjectionExtension.class)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class ResourceNameTemplateVariableResolverTest {

private static final Object[] FILE = new Object[] {"file"}; //$NON-NLS-1$
Expand Down Expand Up @@ -66,14 +70,14 @@ public void afterAll() {
resolver = null;
}

@Test(expected = NullPointerException.class)
@Test
public void testResolveValuesWithNullVariable() {
resolver.resolveValues(null, mockContext);
assertThrows(NullPointerException.class, () -> resolver.resolveValues(null, mockContext));
}

@Test(expected = NullPointerException.class)
@Test
public void testResolveValuesWithNullContext() {
resolver.resolveValues(Mockito.mock(TemplateVariable.class), null);
assertThrows(NullPointerException.class, () -> resolver.resolveValues(Mockito.mock(TemplateVariable.class), null));
}

@Test
Expand Down Expand Up @@ -121,7 +125,7 @@ public void testResolveValues(final Object[] values, final String filename, fina
final String[] actualResolvedValues = Iterables.toArray(resolver.resolveValues(variable, mockContext), String.class);

// ASSERT
Assert.assertArrayEquals("Resolved values", expectedResolvedValues, actualResolvedValues); //$NON-NLS-1$
assertArrayEquals(expectedResolvedValues, actualResolvedValues, "Resolved values"); //$NON-NLS-1$
}

}
23 changes: 13 additions & 10 deletions ...t/src/com/avaloq/tools/ddk/xtext/ui/templates/SimpleEnumTemplateVariableResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,28 @@

package com.avaloq.tools.ddk.xtext.ui.templates;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;

import java.util.List;

import org.eclipse.jface.text.templates.TemplateException;
import org.eclipse.jface.text.templates.TemplateVariable;
import org.eclipse.xtext.XtextRuntimeModule;
import org.eclipse.xtext.testing.extensions.InjectionExtension;
import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;

import com.avaloq.tools.ddk.test.core.AfterAll;
import com.avaloq.tools.ddk.test.core.BeforeAll;
import com.avaloq.tools.ddk.xtext.test.junit.runners.XtextClassRunner;
import com.google.inject.Guice;


@RunWith(XtextClassRunner.class)
@ExtendWith(InjectionExtension.class)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class SimpleEnumTemplateVariableResolverTest {

private static XtextTemplateContext mockContext;
Expand All @@ -50,9 +53,9 @@ public void afterAll() {
resolver = null;
}

@Test(expected = NullPointerException.class)
@Test
public void testResolveValuesWithNullVariable() {
resolver.resolveValues(null, mockContext);
assertThrows(NullPointerException.class, () -> resolver.resolveValues(null, mockContext));
}

@Test
Expand All @@ -73,7 +76,7 @@ private void testResolveValues(final Object... values) throws TemplateException
final List<String> resolvedValues = resolver.resolveValues(variable, mockContext);

// ASSERT
assertArrayEquals("Resolved values", values, resolvedValues.toArray(new String[resolvedValues.size()])); //$NON-NLS-1$
assertArrayEquals(values, resolvedValues.toArray(new String[resolvedValues.size()]), "Resolved values"); //$NON-NLS-1$
}

}
56 changes: 29 additions & 27 deletions ...test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelperTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,32 @@

package com.avaloq.tools.ddk.xtext.ui.templates

import com.avaloq.tools.ddk.test.core.AfterAll
import com.avaloq.tools.ddk.test.core.BeforeAll
import com.avaloq.tools.ddk.xtext.test.junit.runners.XtextClassRunner
import com.google.inject.Guice
import org.eclipse.jface.text.IDocument
import org.eclipse.jface.text.IRegion
import org.eclipse.jface.text.Position
import org.eclipse.jface.text.templates.Template
import org.eclipse.xtext.XtextRuntimeModule
import org.eclipse.xtext.testing.extensions.InjectionExtension
import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext
import org.eclipse.xtext.ui.editor.templates.XtextTemplateContextType
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.^extension.ExtendWith

import static org.junit.Assert.assertArrayEquals
import static org.junit.Assert.assertEquals
import static org.junit.jupiter.api.Assertions.assertThrows
import static org.junit.jupiter.api.Assertions.assertEquals
import static org.junit.jupiter.api.Assertions.assertArrayEquals
import static org.mockito.ArgumentMatchers.anyInt
import static org.mockito.Mockito.mock
import static org.mockito.Mockito.spy
import static org.mockito.Mockito.verify
import static org.mockito.Mockito.when
import org.junit.jupiter.api.TestInstance
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.AfterAll

@RunWith(XtextClassRunner)
@ExtendWith(InjectionExtension)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TemplateProposalProviderHelperTest {

static val SIMPLE_ENUM_VARIABLE_TYPE = new SimpleEnumTemplateVariableResolver().type
Expand Down Expand Up @@ -80,14 +83,14 @@ class TemplateProposalProviderHelperTest {
helper = null
}

@Test(expected=NullPointerException)
@Test
def void testCreateLiteralValuePatternWithNullName() {
helper.createLiteralValuePattern(null, 42)
assertThrows(NullPointerException, [| helper.createLiteralValuePattern(null, 42)])
}

@Test(expected=IllegalArgumentException)
@Test
def void testCreateLiteralValuePatternWithNameContainingWhitespace() {
helper.createLiteralValuePattern("Contains whitespace", 42)
assertThrows(IllegalArgumentException, [| helper.createLiteralValuePattern("Contains whitespace", 42)])
}

@Test
Expand Down Expand Up @@ -134,37 +137,36 @@ class TemplateProposalProviderHelperTest {

// ASSERT
verify(helperSpy).createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, defaultValue)
assertEquals("Expected result", expectedResult, actualResult)
assertEquals(expectedResult, actualResult, "Expected result")
}

@Test(expected=NullPointerException)
@Test
def void testCreateTemplateVariablePatternWithNullType() {
helper.createTemplateVariablePattern(null, VARIABLE_NAME)
assertThrows(NullPointerException, [| helper.createTemplateVariablePattern(null, VARIABLE_NAME)])
}

@Test(expected=IllegalArgumentException)
@Test
def void testCreateTemplateVariablePatternWithTypeContainingWhitespace() {
helper.createTemplateVariablePattern("Contains whitespace", VARIABLE_NAME)
assertThrows(IllegalArgumentException, [|helper.createTemplateVariablePattern("Contains whitespace", VARIABLE_NAME)])
}

@Test(expected=NullPointerException)
@Test
def void testCreateTemplateVariablePatternWithNullName() {
helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, null)
assertThrows(NullPointerException, [| helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, null)])
}

@Test(expected=IllegalArgumentException)
def void testCreateTemplateVariablePatternWithNameContainingWhitespace() {
helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, "Contains whitespace")
assertThrows(IllegalArgumentException, [| helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, "Contains whitespace")])
}

@Test(expected=NullPointerException)
@Test
def void testCreateTemplateVariablePatternWithNull() {
helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, null)
assertThrows(NullPointerException, [| helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, null)])
}

@Test(expected=IllegalArgumentException)
@Test
def void testCreateTemplateVariablePatternWithNoValues() {
helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME)
assertThrows(IllegalArgumentException, [| helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME)])
}

@Test
Expand Down Expand Up @@ -256,8 +258,8 @@ class TemplateProposalProviderHelperTest {
val actualValues = templateBuffer.variables.get(0).values

// ASSERT
assertEquals("Expected result", expectedResult, actualResult)
assertArrayEquals("Expected values", expectedValues, actualValues)
assertEquals(expectedResult, actualResult, "Expected result")
assertArrayEquals(expectedValues, actualValues, "Expected values")
}

}
4 changes: 2 additions & 2 deletions ....test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package com.avaloq.tools.ddk.xtext.ui.templates;

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

import org.eclipse.jface.text.templates.TemplateException;
import org.eclipse.jface.text.templates.TemplateTranslator;
Expand Down Expand Up @@ -55,7 +55,7 @@ public TemplateVariable createTemplateVariable(final TemplateVariableResolver re
// and has protected constructors thus cannot be directly instantiated
final String pattern = helper.createTemplateVariablePattern(resolver.getType(), name, values);
final TemplateVariable[] variables = translator.translate(pattern).getVariables();
assertEquals("Exactly one variable should be returned", 1, variables.length); //$NON-NLS-1$
assertEquals(1, variables.length, "Exactly one variable should be returned"); //$NON-NLS-1$
return variables[0];
}

Expand Down
9 changes: 5 additions & 4 deletions ...aloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/test/XtextUiTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

package com.avaloq.tools.ddk.xtext.ui.test;

import org.junit.runner.RunWith;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

import com.avaloq.tools.ddk.test.core.junit.runners.DiscerningSuite;
import com.avaloq.tools.ddk.xtext.ui.quickfix.WorkbenchResolutionAdaptorRunTest;
Expand All @@ -22,10 +23,10 @@


/**
* Empty class serving only as holder for JUnit4 annotations.
* Junit5 version of test suites. does not implement the logic in our {@link DiscerningSuite}.
*/
@RunWith(DiscerningSuite.class)
@DiscerningSuite.SuiteClasses({
@Suite
@SelectClasses({
// @Format-Off
WorkbenchResolutionAdaptorTest.class,
WorkbenchResolutionAdaptorRunTest.class,
Expand Down
Loading