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

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

@@ -8,14 +8,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.xtext.ui,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtext.testing,
- org.junit,
  org.mockito.mockito-core,
  com.avaloq.tools.ddk.xtext.ui,
  com.avaloq.tools.ddk.test.core,
  org.eclipse.ui.ide,
  com.avaloq.tools.ddk.xtext.test.core,
  junit-jupiter-api,
  junit-jupiter-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

com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java

@@ -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;
@@ -56,7 +56,7 @@
 import com.google.inject.name.Names;
 
 
-public class WorkbenchResolutionAdaptorRunTest {
+class WorkbenchResolutionAdaptorRunTest {
 
   private static final String TEST_FILE_NAME = "TestFileName"; //$NON-NLS-1$
 
@@ -95,8 +95,8 @@ protected void configure() {
 
   private final WorkbenchMarkerResolutionGenerator wmrg = injector.getInstance(WorkbenchMarkerResolutionGenerator.class);
 
-  @Before
-  public void setUp() throws Exception {
+  @BeforeEach
+  void setUp() {
     wmrg.setIssueUtil(new IssueUtil());
 
     when(mockRegistryProvider.get()).thenReturn(mockMarkerHelpRegistry);
@@ -121,14 +121,13 @@ private void mockMarkerResource(final URI uri) throws CoreException {
     when(mockMarker.getAttribute(eq(Issue.URI_KEY), anyString())).thenReturn(uri.toString());
     when(mockMarker.isSubtypeOf(eq(MarkerTypes.ANY_VALIDATION))).thenReturn(true);
     when(mockStorage2UriMapper.getUri(eq(mockFile))).thenReturn(uri);
-    @SuppressWarnings("unchecked")
     Iterable<Pair<IStorage, IProject>> storages = Lists.newArrayList(Tuples.create((IStorage) mockFile, mock(IProject.class)));
     when(mockStorage2UriMapper.getStorages(eq(uri))).thenReturn(storages);
     when(mockLanguageResourceHelper.isLanguageResource(eq(mockFile))).thenReturn(true);
   }
 
   @Test
-  public void testRun() throws CoreException {
+  void testRun() throws CoreException {
     WorkbenchResolutionAdapter adapter = wmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);
     when(mockMarkerHelpRegistry.getResolutions(mockMarker)).thenReturn(mockMarkerResolutions);
 
@@ -142,7 +141,7 @@ public void testRun() throws CoreException {
   }
 
   @Test
-  public void testSingleRun() throws CoreException {
+  void testSingleRun() throws CoreException {
     WorkbenchResolutionAdapter adapter = wmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);
     when(mockMarkerHelpRegistry.getResolutions(mockMarker)).thenReturn(mockMarkerResolutions);
 

com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorTest.java

@@ -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;
 
@@ -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 {
+class WorkbenchResolutionAdaptorTest {
 
   private static final String TEST_LABEL = "ATestLabel"; //$NON-NLS-1$
   private static final String TEST_DESCRIPTION = "ATestDescription"; //$NON-NLS-1$
@@ -37,49 +37,49 @@ public class WorkbenchResolutionAdaptorTest {
 
   private final WorkbenchMarkerResolutionGenerator mockWmrg = mock(WorkbenchMarkerResolutionGenerator.class);
 
-  @Before
-  public void setUp() throws Exception {
+  @BeforeEach
+  void setUp() {
     when(mockWmrg.getIssueUtil()).thenReturn(new IssueUtil());
   }
 
   @Test
-  public void testGetLabel() {
+  void testGetLabel() {
     IssueResolution mockIssueResolution = mock(IssueResolution.class);
     IMarker mockMarker = mock(IMarker.class);
 
     when(mockIssueResolution.getLabel()).thenReturn(TEST_LABEL);
 
     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() {
+  void testGetDescription() {
     IssueResolution mockIssueResolution = mock(IssueResolution.class);
     IMarker mockMarker = mock(IMarker.class);
 
     when(mockIssueResolution.getDescription()).thenReturn(TEST_DESCRIPTION);
 
     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() {
+  void testGetImage() {
     IssueResolution mockIssueResolution = mock(IssueResolution.class);
     IMarker mockMarker = mock(IMarker.class);
 
     when(mockWmrg.getImage(mockIssueResolution)).thenReturn(TEST_IMAGE);
 
     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() {
+  void findOtherMarkers() {
     IssueResolution mockIssueResolution = mock(IssueResolution.class);
     IMarker mockResolutionMarker = mock(IMarker.class);
     when(mockResolutionMarker.getAttribute(Issue.CODE_KEY, null)).thenReturn(CODE1);
@@ -95,14 +95,14 @@ public void findOtherMarkers() {
 
     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$
 
   }
 

com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolverTest.java

@@ -11,26 +11,30 @@
 
 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)
-public class ResourceNameTemplateVariableResolverTest {
+@ExtendWith(InjectionExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ResourceNameTemplateVariableResolverTest {
 
   private static final Object[] FILE = new Object[] {"file"}; //$NON-NLS-1$
   private static final String FILENAME = "filename"; //$NON-NLS-1$
@@ -43,7 +47,7 @@ public class ResourceNameTemplateVariableResolverTest {
   private static ResourceNameTemplateVariableResolver resolver;
 
   @BeforeAll
-  public void beforeAll() {
+  void beforeAll() {
     mockContext = Mockito.mock(XtextTemplateContext.class);
     mockFile = Mockito.mock(IFile.class);
 
@@ -57,7 +61,7 @@ public void beforeAll() {
   }
 
   @AfterAll
-  public void afterAll() {
+  void afterAll() {
     mockContext = null;
     mockFile = null;
 
@@ -66,39 +70,39 @@ public void afterAll() {
     resolver = null;
   }
 
-  @Test(expected = NullPointerException.class)
-  public void testResolveValuesWithNullVariable() {
-    resolver.resolveValues(null, mockContext);
+  @Test
+  void testResolveValuesWithNullVariable() {
+    assertThrows(NullPointerException.class, () -> resolver.resolveValues(null, mockContext));
   }
 
-  @Test(expected = NullPointerException.class)
-  public void testResolveValuesWithNullContext() {
-    resolver.resolveValues(Mockito.mock(TemplateVariable.class), null);
+  @Test
+  void testResolveValuesWithNullContext() {
+    assertThrows(NullPointerException.class, () -> resolver.resolveValues(Mockito.mock(TemplateVariable.class), null));
   }
 
   @Test
-  public void testResolveValuesWithFileWithoutExtension() throws TemplateException {
+  void testResolveValuesWithFileWithoutExtension() throws TemplateException {
     final String filename = "filenamewithnoextension"; //$NON-NLS-1$
     testResolveValues(FILE, filename, filename);
   }
 
   @Test
-  public void testResolveValuesWithFileWithExtension() throws TemplateException {
+  void testResolveValuesWithFileWithExtension() throws TemplateException {
     testResolveValues(FILE, "filename.with.extension", "filename.with"); //$NON-NLS-1$//$NON-NLS-2$
   }
 
   @Test
-  public void testResolveValuesWithExtraParams() throws TemplateException {
+  void testResolveValuesWithExtraParams() throws TemplateException {
     testResolveValues(new Object[] {FILE[0], "other", "random", "values"}, FILENAME, FILENAME); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
   }
 
   @Test
-  public void testResolveValuesWithUnknownParam() throws TemplateException {
+  void testResolveValuesWithUnknownParam() throws TemplateException {
     testResolveValues(new Object[] {"This is not the parameter you are looking for"}, FILENAME); //$NON-NLS-1$
   }
 
   @Test
-  public void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
+  void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
     testResolveValues(new Object[] {42}, FILENAME);
   }
 
@@ -112,7 +116,7 @@ public void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
    * @param expectedResolvedValues
    *          expected return value
    */
-  public void testResolveValues(final Object[] values, final String filename, final String... expectedResolvedValues) throws TemplateException {
+  void testResolveValues(final Object[] values, final String filename, final String... expectedResolvedValues) throws TemplateException {
     // ARRANGE
     final TemplateVariable variable = helper.createTemplateVariable(resolver, "name", values); //$NON-NLS-1$
     Mockito.when(mockFile.getName()).thenReturn(filename);
@@ -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$
   }
 
 }

com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/SimpleEnumTemplateVariableResolverTest.java

@@ -11,57 +11,60 @@
 
 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)
-public class SimpleEnumTemplateVariableResolverTest {
+@ExtendWith(InjectionExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class SimpleEnumTemplateVariableResolverTest {
 
   private static XtextTemplateContext mockContext;
   private static TemplateVariableResolverTestHelper helper;
   private static SimpleEnumTemplateVariableResolver resolver;
 
   @BeforeAll
-  public void beforeAll() {
+  void beforeAll() {
     mockContext = mock(XtextTemplateContext.class);
     helper = Guice.createInjector(new XtextRuntimeModule()).getInstance(TemplateVariableResolverTestHelper.class);
     resolver = new SimpleEnumTemplateVariableResolver();
   }
 
   @AfterAll
-  public void afterAll() {
+  void afterAll() {
     mockContext = null;
     helper = null;
     resolver = null;
   }
 
-  @Test(expected = NullPointerException.class)
-  public void testResolveValuesWithNullVariable() {
-    resolver.resolveValues(null, mockContext);
+  @Test
+  void testResolveValuesWithNullVariable() {
+    assertThrows(NullPointerException.class, () -> resolver.resolveValues(null, mockContext));
   }
 
   @Test
-  public void testResolveValuesWithOneParam() throws TemplateException {
+  void testResolveValuesWithOneParam() throws TemplateException {
     testResolveValues("Value"); //$NON-NLS-1$
   }
 
   @Test
-  public void testResolveValuesWithMultipleParams() throws TemplateException {
+  void testResolveValuesWithMultipleParams() throws TemplateException {
     testResolveValues("Value 1", "Value 2", "Value 3"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
   }
 
@@ -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$
   }
 
 }