Skip to content

feat: Migrate com.avaloq.tools.ddk.xtext.checkcfg.core.test to Junit5 #1217

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
Nov 10, 2025
Merged

feat: Migrate com.avaloq.tools.ddk.xtext.checkcfg.core.test to Junit5 #1217

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
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
org.eclipse.core.runtime,
org.eclipse.xtend.lib,
org.eclipse.xtext.ui.testing,
org.junit,
org.eclipse.xtext.xbase.lib,
org.eclipse.ui.workbench;resolution:=optional,
org.objectweb.asm;resolution:=optional,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine
junit-platform-suite-api
Import-Package: org.hamcrest.core,
org.junit.runner;version="4.5.0",
org.junit.runner.manipulation;version="4.5.0",
Expand Down
12 changes: 9 additions & 3 deletions ...core.test/src/com/avaloq/tools/ddk/checkcfg/contentassist/CheckCfgContentAssistTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@

package com.avaloq.tools.ddk.checkcfg.contentassist

import com.avaloq.tools.ddk.checkcfg.util.CheckCfgTestUtil
import com.avaloq.tools.ddk.test.checkcfg.TestPropertySpecificationWithExpectedValues
import com.avaloq.tools.ddk.test.checkcfg.TestPropertySpecificationWithOutExpectedValues
import com.avaloq.tools.ddk.xtext.test.contentassist.AbstractAcfContentAssistTest
import com.google.common.collect.Lists
import org.junit.Test

import static com.avaloq.tools.ddk.checkcfg.CheckCfgConstants.PROPERTY_EXECUTABLE_EXTENSION_ATTRIBUTE
import static com.avaloq.tools.ddk.checkcfg.CheckCfgConstants.PROPERTY_EXTENSION_POINT
Expand All @@ -25,7 +22,16 @@ import static extension com.avaloq.tools.ddk.test.core.mock.ExtensionRegistryMoc
import static extension com.avaloq.tools.ddk.test.core.mock.ExtensionRegistryMock.mockExecutableExtension
import static extension com.avaloq.tools.ddk.test.core.mock.ExtensionRegistryMock.unMock
import com.avaloq.tools.ddk.test.core.BugTest
import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractAcfContentAssistTest
import org.junit.jupiter.api.Test
import com.avaloq.tools.ddk.checkcfg.util.CheckCfgTestUtil
import org.junit.jupiter.api.^extension.ExtendWith
import org.eclipse.xtext.testing.extensions.InjectionExtension
import com.avaloq.tools.ddk.checkcfg.CheckCfgUiInjectorProvider
import org.eclipse.xtext.testing.InjectWith

@ExtendWith(InjectionExtension)
@InjectWith(CheckCfgUiInjectorProvider)
class CheckCfgContentAssistTest extends AbstractAcfContentAssistTest {

override protected getXtextTestUtil() {
Expand Down
7 changes: 3 additions & 4 deletions ...ckcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/scoping/CheckCfgScopeProviderTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ package com.avaloq.tools.ddk.checkcfg.scoping
import com.avaloq.tools.ddk.test.core.BugTest
import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage
import com.avaloq.tools.ddk.checkcfg.util.CheckCfgTestUtil
import com.avaloq.tools.ddk.xtext.test.scoping.AbstractScopingTest

import static org.junit.Assert.assertArrayEquals
import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractScopingTest
import static org.junit.jupiter.api.Assertions.assertArrayEquals

final class CheckCfgScopeProviderTest extends AbstractScopingTest {

Expand Down Expand Up @@ -72,7 +71,7 @@ final class CheckCfgScopeProviderTest extends AbstractScopingTest {
// Check catalog has the correct fully-qualified package name
val actualName = element.name.segments;
val actualPackageName = actualName.take(EXP_PACKAGE_NAME_PREFIX.size);
assertArrayEquals("Catalog must have the correct fully-qualified package name", EXP_PACKAGE_NAME_PREFIX, actualPackageName);
assertArrayEquals(EXP_PACKAGE_NAME_PREFIX, actualPackageName, "Catalog must have the correct fully-qualified package name");
]
}
}
15 changes: 10 additions & 5 deletions ....ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
package com.avaloq.tools.ddk.checkcfg.syntax

import com.avaloq.tools.ddk.checkcfg.util.CheckCfgTestUtil
import com.avaloq.tools.ddk.xtext.test.validation.AbstractValidationTest
import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractValidationTest
import java.util.LinkedList
import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
import org.junit.Test
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.BeforeAll

class CheckCfgSyntaxTest extends AbstractValidationTest {

Expand All @@ -26,9 +27,9 @@ class CheckCfgSyntaxTest extends AbstractValidationTest {
override protected getRequiredSourceFileNames() {
new LinkedList<String>
}

@Test
def void testSyntax() {
@BeforeAll
def void setup() {
val checkSource = '''
package checkcfgtest

Expand All @@ -49,7 +50,11 @@ class CheckCfgSyntaxTest extends AbstractValidationTest {
'''
addCustomerSourceToWorkspace("customer$sca_testchecks.check", checkSource)
IResourcesSetupUtil.waitForBuild
}


@Test
def void testSyntax() {
val checkcfgSource = '''
check configuration checkconfiguration {
catalog checkcfgtest.CheckCfgTestChecks {
Expand Down
10 changes: 5 additions & 5 deletions ...ools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/test/CheckCfgTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
*******************************************************************************/
package com.avaloq.tools.ddk.checkcfg.test;

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

import com.avaloq.tools.ddk.checkcfg.contentassist.CheckCfgContentAssistTest;
import com.avaloq.tools.ddk.checkcfg.scoping.CheckCfgScopeProviderTest;
Expand All @@ -22,10 +22,10 @@


/**
* Empty class serving only as holder for JUnit4 annotations.
* Empty class serving only as holder for JUnit5 annotations.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
// @Format-Off
CheckCfgConfiguredParameterValidationsTest.class,
CheckCfgContentAssistTest.class,
Expand Down
2 changes: 1 addition & 1 deletion ...ools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgTestUtil.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

package com.avaloq.tools.ddk.checkcfg.util

import com.avaloq.tools.ddk.xtext.test.AbstractXtextTestUtil
import com.avaloq.tools.ddk.xtext.test.PluginTestProjectManager
import com.avaloq.tools.ddk.xtext.test.ITestProjectManager
import com.avaloq.tools.ddk.checkcfg.ui.internal.CheckcfgActivator
import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractXtextTestUtil

class CheckCfgTestUtil extends AbstractXtextTestUtil{

Expand Down
4 changes: 2 additions & 2 deletions ...com/avaloq/tools/ddk/checkcfg/validation/CheckCfgConfiguredParameterValidationsTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ package com.avaloq.tools.ddk.checkcfg.validation
import com.avaloq.tools.ddk.checkcfg.util.CheckCfgTestUtil
import com.avaloq.tools.ddk.test.checkcfg.TestPropertySpecificationWithExpectedValues
import com.avaloq.tools.ddk.test.checkcfg.TestPropertySpecificationWithOutExpectedValues
import com.avaloq.tools.ddk.xtext.test.validation.AbstractValidationTest
import com.google.common.collect.Lists
import org.junit.Test

import static com.avaloq.tools.ddk.checkcfg.CheckCfgConstants.PROPERTY_EXECUTABLE_EXTENSION_ATTRIBUTE
import static com.avaloq.tools.ddk.checkcfg.CheckCfgConstants.PROPERTY_EXTENSION_POINT

import static extension com.avaloq.tools.ddk.test.core.mock.ExtensionRegistryMock.mockConfigurationElement
import static extension com.avaloq.tools.ddk.test.core.mock.ExtensionRegistryMock.mockExecutableExtension
import static extension com.avaloq.tools.ddk.test.core.mock.ExtensionRegistryMock.unMock
import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractValidationTest
import org.junit.jupiter.api.Test

class CheckCfgConfiguredParameterValidationsTest extends AbstractValidationTest {

Expand Down
11 changes: 5 additions & 6 deletions ...ls.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@ package com.avaloq.tools.ddk.checkcfg.validation
import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration
import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage
import com.google.inject.Inject
import junit.framework.TestCase
import org.eclipse.xtext.testing.XtextRunner
import org.eclipse.xtext.testing.util.ParseHelper
import org.eclipse.xtext.testing.validation.ValidationTestHelper
import org.junit.Test
import org.junit.runner.RunWith
import org.eclipse.xtext.testing.InjectWith
import com.avaloq.tools.ddk.checkcfg.CheckCfgUiInjectorProvider
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.^extension.ExtendWith
import org.eclipse.xtext.testing.extensions.InjectionExtension

@InjectWith(typeof(CheckCfgUiInjectorProvider))
@RunWith(XtextRunner)
class CheckCfgTest extends TestCase {
@ExtendWith(InjectionExtension)
class CheckCfgTest {


@Inject
Expand Down
12 changes: 5 additions & 7 deletions ...eckcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,25 @@
package com.avaloq.tools.ddk.checkcfg.validation;

import org.eclipse.xtext.testing.InjectWith;
import org.eclipse.xtext.testing.XtextRunner;
import org.eclipse.xtext.testing.extensions.InjectionExtension;
import org.eclipse.xtext.testing.util.ParseHelper;
import org.eclipse.xtext.testing.validation.ValidationTestHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import com.avaloq.tools.ddk.checkcfg.CheckCfgUiInjectorProvider;
import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration;
import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage;
import com.avaloq.tools.ddk.checkcfg.util.CheckCfgModelUtil;
import com.google.inject.Inject;

import junit.framework.TestCase;


/**
* Performs validations on Check Configuration models.
*/
@InjectWith(CheckCfgUiInjectorProvider.class)
@RunWith(XtextRunner.class)
public class CheckCfgValidationTest extends TestCase {
@ExtendWith(InjectionExtension.class)
public class CheckCfgValidationTest {

@Inject
private ValidationTestHelper helper;
Expand Down
Loading