markdomeng · markdomeng · Oct 7, 2025 · Apr 23, 2025 · Apr 23, 2025 · Apr 23, 2025
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+text eol=crlf
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -4,8 +4,8 @@ jobs:
   pmd:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -26,9 +26,9 @@ jobs:
         uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.9.9
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'

diff --git a/com.avaloq.tools.ddk.check.core.test/.classpath b/com.avaloq.tools.ddk.check.core.test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
   <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
     <accessrules>
       <accessrule kind="accessible" pattern="org/eclipse/xtext/junit4/ui/util/**"/>

diff --git a/com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch b/com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch
@@ -23,7 +23,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.test.core.CheckCoreTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.check.core.test"/>

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 15.3.0.qualifier
+Bundle-Version: 16.1.0.qualifier
 Bundle-Vendor: Avaloq Group AG
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.core,
  com.avaloq.tools.ddk.xtext.test.core,
@@ -20,15 +20,17 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.testing,
- org.junit,
+ org.junit.jupiter.api,
  org.mockito,
  com.avaloq.tools.ddk.check.runtime.core,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtext.xbase,
  org.eclipse.xtext.xbase.lib,
  org.apache.logging.log4j,
  org.apache.commons.lang,
- org.eclipse.xtext.xbase.testing
+ org.eclipse.xtext.xbase.testing,
+ org.junit,
+ junit-jupiter-api
 Export-Package: com.avaloq.tools.ddk.check.core.test,
  com.avaloq.tools.ddk.check.core.test.util,
  com.avaloq.tools.ddk.check.test.core,

diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>15.3.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 

diff --git a/...dk.check.core.test/src/com/avaloq/tools/ddk/check/core/generator/IssueCodeValueTest.xtend b/...dk.check.core.test/src/com/avaloq/tools/ddk/check/core/generator/IssueCodeValueTest.xtend
@@ -16,7 +16,7 @@ import org.junit.runner.RunWith
 import com.avaloq.tools.ddk.check.CheckInjectorProvider
 import org.eclipse.xtext.testing.XtextRunner
 import com.avaloq.tools.ddk.check.core.test.AbstractCheckGenerationTestCase
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import java.util.List
 import org.eclipse.xtext.xbase.testing.JavaSource
 import java.io.ByteArrayInputStream

diff --git a/...s.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java b/...s.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java
@@ -11,6 +11,9 @@
 package com.avaloq.tools.ddk.check.core.test;
 
 import static com.google.common.collect.Sets.newHashSet;
+import org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,8 +22,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -37,9 +40,9 @@
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
 import org.eclipse.xtext.util.StringInputStream;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
 import com.avaloq.tools.ddk.check.CheckConstants;
 import com.avaloq.tools.ddk.check.ui.internal.CheckActivator;
@@ -54,14 +57,12 @@
 import com.google.inject.Injector;
 import com.google.inject.Provider;
 
-import junit.framework.TestCase;
-
 
 /**
  * An abstract test class for tests on Check models. Allows creating a project and adding files.
  */
 @SuppressWarnings({"PMD.SignatureDeclareThrowsException", "restriction"})
-public abstract class AbstractCheckTestCase extends TestCase {
+public abstract class AbstractCheckTestCase {
   private static final int TWO_KILO_BYTES = 2048;
   protected static final Logger LOGGER = LogManager.getLogger(AbstractCheckTestCase.class);
   private static final PluginTestProjectManager PROJECT_MANAGER = new PluginTestProjectManager(CheckActivator.getInstance().getInjector(CheckConstants.GRAMMAR));
@@ -72,7 +73,7 @@ public abstract class AbstractCheckTestCase extends TestCase {
   private Provider<XtextResourceSet> resourceSetProvider;
 
   @Override
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     getInjector().injectMembers(this);
   }
@@ -83,7 +84,7 @@ public void setUp() throws Exception {
    * @throws Exception
    *           the exception
    */
-  @BeforeClass
+  @BeforeAll
   public static void prepareWorkspace() throws Exception {
     PROJECT_MANAGER.setup(ImmutableList.<TestSource> of());
   }
@@ -117,7 +118,7 @@ public <T> T get(final Class<T> clazz) {
   /**
    * Clean up after all tests have terminated.
    */
-  @AfterClass
+  @AfterAll
   public static void cleanUp() {
     PROJECT_MANAGER.teardown();
   }

diff --git a/...q.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend b/...q.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend
@@ -21,11 +21,11 @@ import org.eclipse.xtext.resource.XtextResource
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.testing.util.ParseHelper
-import org.junit.Ignore
-import org.junit.Test
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 @InjectWith(typeof(CheckUiInjectorProvider))
 @RunWith(typeof(XtextRunner))
@@ -73,8 +73,8 @@ class BasicModelTest {
   }
 
   /* Tests that Checks documented with ML_COMMENTs have an inferred description field. */
+  @Disabled("Fails because DocumentedImplCustom uses the null resource description provider to get the document provider")
   @Test
-  @Ignore("Fails because DocumentedImplCustom uses the null resource description provider to get the document provider")
   def void testInferingOfDescription() {
     val check = util.getFirstInstanceOf(parser.parse(modelUtil.modelWithCheck), typeof(Check))
     assertEquals("No documentation.", check.description)

diff --git a/...avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java b/...avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.check.core.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.eclipse.emf.common.util.URI;
@@ -25,7 +26,7 @@
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.XtextRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 
 import com.avaloq.tools.ddk.check.CheckInjectorProvider;
@@ -40,7 +41,7 @@
 */
 @RunWith(XtextRunner.class)
 @InjectWith(CheckInjectorProvider.class)
 public class BugAig1314 {

  /** Constructor of super class is protected... */
  private static class TestScope extends CatalogFromExtensionPointScope {
@@ -57,8 +58,8 @@
    *
    * @return Some syntactically correct but otherwise meaningless URL.
    */
-  private URL createURL() throws MalformedURLException {
-    return new URL("http://" + TEST_CATALOG_FILE + TEST_CATALOG_EXTENSION);
+  private URL createURL() throws MalformedURLException, URISyntaxException {
+    return new java.net.URI("http://" + TEST_CATALOG_FILE + TEST_CATALOG_EXTENSION).toURL();
   }
 
   /**
@@ -121,7 +122,7 @@
    * Tests that querying the same scope twice doesn't make the resource set grow.
    */
   @Test
-  public void testSameScopeUseTwice() throws MalformedURLException {
+  void testSameScopeUseTwice() throws MalformedURLException, URISyntaxException {
     XtextResourceSet rs = new XtextResourceSet();
     URL url = createURL();
     ModelLocation modelLocation = createModelLocation(url);
@@ -140,7 +141,7 @@
    * Tests that querying two different scopes doesn't make the resource set grow. That one was the real cause of bug AIG-1314.
    */
   @Test
-  public void testDifferentScopeUseTwice() throws MalformedURLException {
+  void testDifferentScopeUseTwice() throws MalformedURLException, URISyntaxException {
     XtextResourceSet rs = new XtextResourceSet();
     URL url = createURL();
     ModelLocation modelLocation = createModelLocation(url);

diff --git a/...avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend b/...avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend
@@ -19,8 +19,8 @@ import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.testing.util.ParseHelper
 import org.eclipse.xtext.xbase.XbasePackage
-import org.junit.Assert
-import org.junit.Test
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 
 @InjectWith(typeof(CheckUiInjectorProvider))

diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java
@@ -15,7 +15,7 @@
 
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.XtextRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 
 import com.avaloq.tools.ddk.check.CheckInjectorProvider;
@@ -26,13 +26,13 @@
 */
 @InjectWith(CheckInjectorProvider.class)
 @RunWith(XtextRunner.class)
 public class BugDsl27 extends AbstractCheckGenerationTestCase {

   /**
    * Tests that our test source compiles fine.
    */
-  @Test
-  public void testGeneratedCodeHasNoErrors() {
+  @org.junit.jupiter.api.Test
+  void testGeneratedCodeHasNoErrors() {
     try (InputStream sourceStream = BugDsl27.class.getResourceAsStream("bugdsl27/BugDsl27")) {
       generateAndCompile(sourceStream);
     } catch (IOException exception) {

diff --git a/...tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend b/...tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
@@ -22,7 +22,7 @@ import java.util.List
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 
 @InjectWith(typeof(CheckUiInjectorProvider))

diff --git a/...ore.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend b/...ore.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend
@@ -15,7 +15,7 @@ import com.avaloq.tools.ddk.check.CheckInjectorProvider
 import java.io.ByteArrayInputStream
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 import java.util.List
 import org.eclipse.xtext.xbase.testing.JavaSource

diff --git a/...ools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend b/...ools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
@@ -20,7 +20,7 @@ import org.eclipse.core.resources.IProject
 import org.eclipse.core.resources.IResource
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 

diff --git a/...s.ddk.check.core.test/src/com/avaloq/tools/ddk/check/formatting/CheckFormattingTest.xtend b/...s.ddk.check.core.test/src/com/avaloq/tools/ddk/check/formatting/CheckFormattingTest.xtend
@@ -18,7 +18,7 @@ import org.eclipse.xtext.preferences.MapBasedPreferenceValues
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.testing.formatter.FormatterTestHelper
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 
 @InjectWith(typeof(CheckUiInjectorProvider))

diff --git a/...src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend b/...src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.resource.XtextResource
 import org.eclipse.xtext.testing.XtextRunner
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 
 import static org.mockito.Mockito.mock

diff --git a/...k.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend b/...k.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend
@@ -13,7 +13,7 @@ import org.eclipse.xtext.testing.InjectWith
 import org.junit.runner.RunWith
 import org.eclipse.xtext.testing.XtextRunner
 import com.avaloq.tools.ddk.check.CheckUiInjectorProvider
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import com.google.inject.Inject
 import org.eclipse.xtext.testing.util.ParseHelper
 import com.avaloq.tools.ddk.check.check.CheckCatalog