feat: Migrate com.avaloq.tools.ddk.xtext.format.test to Junit5

also made a junit5 copy of the AbstractXtextTestUtil and realign the
recently migrated junit5 tests to use this instead, since the old one
still uses the junti4 assertions

Author: MarkDomingo4458

com.avaloq.tools.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/util/ExportTestUtil.java

@@ -12,7 +12,7 @@
 
 import com.avaloq.tools.ddk.xtext.export.ExportConstants;
 import com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator;
-import com.avaloq.tools.ddk.xtext.test.AbstractXtextTestUtil;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractXtextTestUtil;
 import com.google.inject.Injector;
 
 
@@ -29,7 +29,7 @@ private static final class InstanceHolder {
     private static final ExportTestUtil INSTANCE = new ExportTestUtil();
 
     public static ExportTestUtil get() {
-        return INSTANCE;
+      return INSTANCE;
     }
   }
 

com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF

@@ -10,15 +10,14 @@ Fragment-Host: com.avaloq.tools.ddk.xtext.format.ui
 Require-Bundle: com.avaloq.tools.ddk.xtext.format,
  com.google.inject,
  com.avaloq.tools.ddk.xtext.test.core,
- org.junit,
  org.mockito.mockito-core,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtext.xbase.testing,
  org.objectweb.asm;resolution:=optional,
  org.eclipse.xtext.testing,
  junit-jupiter-api,
  junit-jupiter-engine,
- junit-vintage-engine
+ junit-platform-suite-api
 Export-Package: com.avaloq.tools.ddk.xtext.test.format;x-internal=true,
  com.avaloq.tools.ddk.xtext.format;x-internal=true
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.format.test

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/format/FormatParsingTest.xtend

@@ -6,13 +6,16 @@ package com.avaloq.tools.ddk.xtext.format
 import com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration
 import com.google.inject.Inject
 import org.eclipse.xtext.testing.InjectWith
-import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.testing.util.ParseHelper
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(XtextRunner)
+import org.junit.jupiter.api.^extension.ExtendWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.junit.jupiter.api.Test
+import static org.junit.jupiter.api.Assertions.assertNotNull
+import static org.junit.jupiter.api.Assertions.assertTrue
+
+
+@ExtendWith(InjectionExtension)
 @InjectWith(FormatInjectorProvider)
 class FormatParsingTest {
   @Inject
@@ -23,8 +26,8 @@ class FormatParsingTest {
     val result = parseHelper.parse('''
       Hello Xtext!
     ''')
-    Assert.assertNotNull(result)
+    assertNotNull(result)
     val errors = result.eResource.errors
-    Assert.assertTrue('''Unexpected errors: «errors.join(", ")»''', errors.isEmpty)
+    assertTrue(errors.isEmpty, '''Unexpected errors: «errors.join(", ")»''')
   }
 }

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/format/builder/FormatBuilderParticipantTest.java

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.format.builder;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -21,12 +21,12 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.xtext.resource.IResourceDescription.Delta;
 import org.eclipse.xtext.resource.IResourceServiceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatcher;
 
 import com.avaloq.tools.ddk.xtext.format.ui.builder.FormatBuilderParticipant;
-import com.avaloq.tools.ddk.xtext.test.AbstractXtextTest;
-import com.avaloq.tools.ddk.xtext.test.AbstractXtextTestUtil;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractXtextTest;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractXtextTestUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -71,8 +71,8 @@ protected void beforeAllTests() {
   public void hasCorrectExtensionTest() {
     IResourceServiceProvider resourceServiceProvider = mock(IResourceServiceProvider.class);
     when(resourceServiceProvider.canHandle(argThat(new IsUri()))).thenReturn(true, false);
-    assertTrue("Check if the delta resource has correct extension", participant.hasCorrectExtension(delta, resourceServiceProvider));
-    assertFalse("Check if the delta resource has incorrect extension", participant.hasCorrectExtension(delta, resourceServiceProvider));
+    assertTrue(participant.hasCorrectExtension(delta, resourceServiceProvider), "Check if the delta resource has correct extension");
+    assertFalse(participant.hasCorrectExtension(delta, resourceServiceProvider), "Check if the delta resource has incorrect extension");
   }
 
   /**
@@ -81,11 +81,11 @@ public void hasCorrectExtensionTest() {
   @Test
   public void isSourceOriginatedTest() {
     when(uriCorrect.segments()).thenReturn(CORRECT_URI_SEGMENTS);
-    assertTrue("Check if the delta resource has correct URI and comes from SRC directory", participant.isSourceOriginated(delta));
+    assertTrue(participant.isSourceOriginated(delta), "Check if the delta resource has correct URI and comes from SRC directory");
     when(uriCorrect.segments()).thenReturn(BIN_URI_SEGMENTS);
-    assertFalse("Check if the delta resource has correct URI and does not come from SRC directory", participant.isSourceOriginated(delta));
+    assertFalse(participant.isSourceOriginated(delta), "Check if the delta resource has correct URI and does not come from SRC directory");
     when(uriCorrect.segments()).thenReturn(INCORRECT_URI_SEGMENTS);
-    assertFalse("Check if the delta resource has incorrect URI and comes from SRC directory", participant.isSourceOriginated(delta));
+    assertFalse(participant.isSourceOriginated(delta), "Check if the delta resource has incorrect URI and comes from SRC directory");
   }
 
   @Override

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/format/formatting/FormatFormattingTest.java

@@ -12,7 +12,7 @@
 
 import com.avaloq.tools.ddk.xtext.test.TestSource;
 import com.avaloq.tools.ddk.xtext.test.format.util.FormatTestUtil;
-import com.avaloq.tools.ddk.xtext.test.formatting.AbstractFormattingTest;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractFormattingTest;
 
 
 public class FormatFormattingTest extends AbstractFormattingTest {

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/format/scoping/FormatScopingTest.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.format.scoping;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.List;
 import java.util.Set;
@@ -27,13 +27,13 @@
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration;
 import com.avaloq.tools.ddk.xtext.format.format.FormatPackage;
 import com.avaloq.tools.ddk.xtext.format.format.GroupBlock;
 import com.avaloq.tools.ddk.xtext.test.format.util.FormatTestUtil;
-import com.avaloq.tools.ddk.xtext.test.scoping.AbstractScopingTest;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractScopingTest;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -112,7 +112,7 @@ public void allGrammarsScoped() {
   public void keywordScoped() {
     AbstractRule parserRuleA = grammarA.getRules().get(0);
     Set<URI> keywordURIs = Sets.newHashSet(Iterables.transform(GrammarUtil.containedKeywords(parserRuleA), TO_URI));
-    assertFalse("No keywords found", keywordURIs.isEmpty());
+    assertFalse(keywordURIs.isEmpty(), "No keywords found");
     assertScope(formatC.getRules().get(0), FormatPackage.Literals.GRAMMAR_ELEMENT_REFERENCE__KEYWORD, keywordURIs);
     AbstractRule parserRuleC = grammarC.getRules().get(0);
     assertScope(formatA.getRules().get(0), FormatPackage.Literals.GRAMMAR_ELEMENT_REFERENCE__KEYWORD, keywordURIs);
@@ -128,7 +128,7 @@ public void keywordScoped() {
   public void assignmentScoped() {
     AbstractRule parserRuleA = grammarA.getRules().get(0);
     Set<URI> assignmentURIs = Sets.newHashSet(Iterables.transform(GrammarUtil.containedAssignments(parserRuleA), TO_URI));
-    assertFalse("No assignments found", assignmentURIs.isEmpty());
+    assertFalse(assignmentURIs.isEmpty(), "No assignments found");
     assertScope(formatC.getRules().get(0), FormatPackage.Literals.GRAMMAR_ELEMENT_REFERENCE__ASSIGNMENT, assignmentURIs);
     assertScope(formatA.getRules().get(0), FormatPackage.Literals.GRAMMAR_ELEMENT_REFERENCE__ASSIGNMENT, assignmentURIs);
   }

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/format/validation/FormatValidationTest.java

@@ -10,16 +10,16 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.format.validation;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration;
 import com.avaloq.tools.ddk.xtext.test.format.util.FormatTestUtil;
-import com.avaloq.tools.ddk.xtext.test.validation.AbstractValidationTest;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractValidationTest;
 import com.google.common.collect.Lists;
 
 

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/test/format/FormatTestSuite.java

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.test.format;
 
-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.xtext.format.builder.FormatBuilderParticipantTest;
 import com.avaloq.tools.ddk.xtext.format.formatting.FormatFormattingTest;
@@ -20,10 +20,10 @@
 
 
 /**
- * Empty class serving only as holder for JUnit4 annotations.
+ * Empty class serving only as holder for JUnit5 annotations.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({FormatFormattingTest.class, FormatValidationTest.class, FormatScopingTest.class, FormatBuilderParticipantTest.class})
+@Suite
+@SelectClasses({FormatFormattingTest.class, FormatValidationTest.class, FormatScopingTest.class, FormatBuilderParticipantTest.class})
 public class FormatTestSuite {
 
 }

com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/test/format/util/FormatTestUtil.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.test.format.util;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 
@@ -20,9 +20,9 @@
 import com.avaloq.tools.ddk.xtext.format.FormatConstants;
 import com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration;
 import com.avaloq.tools.ddk.xtext.format.ui.internal.FormatActivator;
-import com.avaloq.tools.ddk.xtext.test.AbstractXtextTestUtil;
 import com.avaloq.tools.ddk.xtext.test.ITestProjectManager;
 import com.avaloq.tools.ddk.xtext.test.PluginTestProjectManager;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractXtextTestUtil;
 import com.google.inject.Injector;
 
 

com.avaloq.tools.ddk.xtext.generator.test/src/com/avaloq/tools/ddk/xtext/generator/test/util/GeneratorTestUtil.java

@@ -11,7 +11,7 @@
 package com.avaloq.tools.ddk.xtext.generator.test.util;
 
 import com.avaloq.tools.ddk.xtext.expression.ExpressionStandaloneSetup;
-import com.avaloq.tools.ddk.xtext.test.AbstractXtextTestUtil;
+import com.avaloq.tools.ddk.xtext.test.jupiter.AbstractXtextTestUtil;
 import com.google.inject.Injector;
 
 
@@ -28,7 +28,7 @@ private static final class InstanceHolder {
     private static final GeneratorTestUtil INSTANCE = new GeneratorTestUtil();
 
     public static GeneratorTestUtil get() {
-        return INSTANCE;
+      return INSTANCE;
     }
   }