Skip to content

Commit 991d16a

Browse files
markdomengmarkdomeng
authored
Merge pull request #1191 from markdomeng/xtext_ui_test_j5
feat: Migrate cat.ddk.xtext.ui.test to Junit5
2 parents 35089f8 + 1682f7a commit 991d16a

File tree

8 files changed

+110
-110
lines changed

8 files changed

+110
-110
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.eclipse.xtext.ui,
99
org.eclipse.xtext.xbase.lib,
1010
org.eclipse.xtext.testing,
11-
org.junit,
1211
org.mockito.mockito-core,
1312
com.avaloq.tools.ddk.xtext.ui,
1413
com.avaloq.tools.ddk.test.core,
1514
org.eclipse.ui.ide,
1615
com.avaloq.tools.ddk.xtext.test.core,
1716
junit-jupiter-api,
1817
junit-jupiter-engine,
19-
junit-vintage-engine
18+
net.bytebuddy.byte-buddy,
19+
org.objenesis,
20+
junit-platform-suite-api
2021
Export-Package: com.avaloq.tools.ddk.xtext.ui.test
2122
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‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import org.eclipse.xtext.util.Pair;
4444
import org.eclipse.xtext.util.Tuples;
4545
import org.eclipse.xtext.validation.Issue;
46-
import org.junit.Before;
47-
import org.junit.Test;
46+
import org.junit.jupiter.api.BeforeEach;
47+
import org.junit.jupiter.api.Test;
4848
import org.mockito.ArgumentMatchers;
4949

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

5858

59-
public class WorkbenchResolutionAdaptorRunTest {
59+
class WorkbenchResolutionAdaptorRunTest {
6060

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

@@ -95,8 +95,8 @@ protected void configure() {
9595

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

98-
@Before
99-
public void setUp() throws Exception {
98+
@BeforeEach
99+
void setUp() {
100100
wmrg.setIssueUtil(new IssueUtil());
101101

102102
when(mockRegistryProvider.get()).thenReturn(mockMarkerHelpRegistry);
@@ -121,14 +121,13 @@ private void mockMarkerResource(final URI uri) throws CoreException {
121121
when(mockMarker.getAttribute(eq(Issue.URI_KEY), anyString())).thenReturn(uri.toString());
122122
when(mockMarker.isSubtypeOf(eq(MarkerTypes.ANY_VALIDATION))).thenReturn(true);
123123
when(mockStorage2UriMapper.getUri(eq(mockFile))).thenReturn(uri);
124-
@SuppressWarnings("unchecked")
125124
Iterable<Pair<IStorage, IProject>> storages = Lists.newArrayList(Tuples.create((IStorage) mockFile, mock(IProject.class)));
126125
when(mockStorage2UriMapper.getStorages(eq(uri))).thenReturn(storages);
127126
when(mockLanguageResourceHelper.isLanguageResource(eq(mockFile))).thenReturn(true);
128127
}
129128

130129
@Test
131-
public void testRun() throws CoreException {
130+
void testRun() throws CoreException {
132131
WorkbenchResolutionAdapter adapter = wmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);
133132
when(mockMarkerHelpRegistry.getResolutions(mockMarker)).thenReturn(mockMarkerResolutions);
134133

@@ -142,7 +141,7 @@ public void testRun() throws CoreException {
142141
}
143142

144143
@Test
145-
public void testSingleRun() throws CoreException {
144+
void testSingleRun() throws CoreException {
146145
WorkbenchResolutionAdapter adapter = wmrg.new WorkbenchResolutionAdapter(mockIssueResolution, mockMarker);
147146
when(mockMarkerHelpRegistry.getResolutions(mockMarker)).thenReturn(mockMarkerResolutions);
148147

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

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

14-
import static org.junit.Assert.assertArrayEquals;
15-
import static org.junit.Assert.assertEquals;
14+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
1616
import static org.mockito.Mockito.mock;
1717
import static org.mockito.Mockito.when;
1818

@@ -21,13 +21,13 @@
2121
import org.eclipse.xtext.ui.editor.quickfix.IssueResolution;
2222
import org.eclipse.xtext.ui.util.IssueUtil;
2323
import org.eclipse.xtext.validation.Issue;
24-
import org.junit.Before;
25-
import org.junit.Test;
24+
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.Test;
2626

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

2929

30-
public class WorkbenchResolutionAdaptorTest {
30+
class WorkbenchResolutionAdaptorTest {
3131

3232
private static final String TEST_LABEL = "ATestLabel"; //$NON-NLS-1$
3333
private static final String TEST_DESCRIPTION = "ATestDescription"; //$NON-NLS-1$
@@ -37,49 +37,49 @@ public class WorkbenchResolutionAdaptorTest {
3737

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

40-
@Before
41-
public void setUp() throws Exception {
40+
@BeforeEach
41+
void setUp() {
4242
when(mockWmrg.getIssueUtil()).thenReturn(new IssueUtil());
4343
}
4444

4545
@Test
46-
public void testGetLabel() {
46+
void testGetLabel() {
4747
IssueResolution mockIssueResolution = mock(IssueResolution.class);
4848
IMarker mockMarker = mock(IMarker.class);
4949

5050
when(mockIssueResolution.getLabel()).thenReturn(TEST_LABEL);
5151

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

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

5757
@Test
58-
public void testGetDescription() {
58+
void testGetDescription() {
5959
IssueResolution mockIssueResolution = mock(IssueResolution.class);
6060
IMarker mockMarker = mock(IMarker.class);
6161

6262
when(mockIssueResolution.getDescription()).thenReturn(TEST_DESCRIPTION);
6363

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

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

6969
@Test
70-
public void testGetImage() {
70+
void testGetImage() {
7171
IssueResolution mockIssueResolution = mock(IssueResolution.class);
7272
IMarker mockMarker = mock(IMarker.class);
7373

7474
when(mockWmrg.getImage(mockIssueResolution)).thenReturn(TEST_IMAGE);
7575

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

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

8181
@Test
82-
public void findOtherMarkers() {
82+
void findOtherMarkers() {
8383
IssueResolution mockIssueResolution = mock(IssueResolution.class);
8484
IMarker mockResolutionMarker = mock(IMarker.class);
8585
when(mockResolutionMarker.getAttribute(Issue.CODE_KEY, null)).thenReturn(CODE1);
@@ -95,14 +95,14 @@ public void findOtherMarkers() {
9595

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

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

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

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

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

107107
}
108108

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

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,30 @@
1111

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

14+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
15+
import static org.junit.jupiter.api.Assertions.assertThrows;
16+
1417
import org.eclipse.core.resources.IFile;
1518
import org.eclipse.jface.text.templates.TemplateException;
1619
import org.eclipse.jface.text.templates.TemplateVariable;
1720
import org.eclipse.xtext.XtextRuntimeModule;
21+
import org.eclipse.xtext.testing.extensions.InjectionExtension;
1822
import org.eclipse.xtext.ui.editor.model.IXtextDocument;
1923
import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext;
20-
import org.junit.Assert;
21-
import org.junit.Test;
22-
import org.junit.runner.RunWith;
24+
import org.junit.jupiter.api.AfterAll;
25+
import org.junit.jupiter.api.BeforeAll;
26+
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.TestInstance;
28+
import org.junit.jupiter.api.extension.ExtendWith;
2329
import org.mockito.Mockito;
2430

25-
import com.avaloq.tools.ddk.test.core.AfterAll;
26-
import com.avaloq.tools.ddk.test.core.BeforeAll;
27-
import com.avaloq.tools.ddk.xtext.test.junit.runners.XtextClassRunner;
2831
import com.google.common.collect.Iterables;
2932
import com.google.inject.Guice;
3033

3134

32-
@RunWith(XtextClassRunner.class)
33-
public class ResourceNameTemplateVariableResolverTest {
35+
@ExtendWith(InjectionExtension.class)
36+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
37+
class ResourceNameTemplateVariableResolverTest {
3438

3539
private static final Object[] FILE = new Object[] {"file"}; //$NON-NLS-1$
3640
private static final String FILENAME = "filename"; //$NON-NLS-1$
@@ -43,7 +47,7 @@ public class ResourceNameTemplateVariableResolverTest {
4347
private static ResourceNameTemplateVariableResolver resolver;
4448

4549
@BeforeAll
46-
public void beforeAll() {
50+
void beforeAll() {
4751
mockContext = Mockito.mock(XtextTemplateContext.class);
4852
mockFile = Mockito.mock(IFile.class);
4953

@@ -57,7 +61,7 @@ public void beforeAll() {
5761
}
5862

5963
@AfterAll
60-
public void afterAll() {
64+
void afterAll() {
6165
mockContext = null;
6266
mockFile = null;
6367

@@ -66,39 +70,39 @@ public void afterAll() {
6670
resolver = null;
6771
}
6872

69-
@Test(expected = NullPointerException.class)
70-
public void testResolveValuesWithNullVariable() {
71-
resolver.resolveValues(null, mockContext);
73+
@Test
74+
void testResolveValuesWithNullVariable() {
75+
assertThrows(NullPointerException.class, () -> resolver.resolveValues(null, mockContext));
7276
}
7377

74-
@Test(expected = NullPointerException.class)
75-
public void testResolveValuesWithNullContext() {
76-
resolver.resolveValues(Mockito.mock(TemplateVariable.class), null);
78+
@Test
79+
void testResolveValuesWithNullContext() {
80+
assertThrows(NullPointerException.class, () -> resolver.resolveValues(Mockito.mock(TemplateVariable.class), null));
7781
}
7882

7983
@Test
80-
public void testResolveValuesWithFileWithoutExtension() throws TemplateException {
84+
void testResolveValuesWithFileWithoutExtension() throws TemplateException {
8185
final String filename = "filenamewithnoextension"; //$NON-NLS-1$
8286
testResolveValues(FILE, filename, filename);
8387
}
8488

8589
@Test
86-
public void testResolveValuesWithFileWithExtension() throws TemplateException {
90+
void testResolveValuesWithFileWithExtension() throws TemplateException {
8791
testResolveValues(FILE, "filename.with.extension", "filename.with"); //$NON-NLS-1$//$NON-NLS-2$
8892
}
8993

9094
@Test
91-
public void testResolveValuesWithExtraParams() throws TemplateException {
95+
void testResolveValuesWithExtraParams() throws TemplateException {
9296
testResolveValues(new Object[] {FILE[0], "other", "random", "values"}, FILENAME, FILENAME); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
9397
}
9498

9599
@Test
96-
public void testResolveValuesWithUnknownParam() throws TemplateException {
100+
void testResolveValuesWithUnknownParam() throws TemplateException {
97101
testResolveValues(new Object[] {"This is not the parameter you are looking for"}, FILENAME); //$NON-NLS-1$
98102
}
99103

100104
@Test
101-
public void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
105+
void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
102106
testResolveValues(new Object[] {42}, FILENAME);
103107
}
104108

@@ -112,7 +116,7 @@ public void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
112116
* @param expectedResolvedValues
113117
* expected return value
114118
*/
115-
public void testResolveValues(final Object[] values, final String filename, final String... expectedResolvedValues) throws TemplateException {
119+
void testResolveValues(final Object[] values, final String filename, final String... expectedResolvedValues) throws TemplateException {
116120
// ARRANGE
117121
final TemplateVariable variable = helper.createTemplateVariable(resolver, "name", values); //$NON-NLS-1$
118122
Mockito.when(mockFile.getName()).thenReturn(filename);
@@ -121,7 +125,7 @@ public void testResolveValues(final Object[] values, final String filename, fina
121125
final String[] actualResolvedValues = Iterables.toArray(resolver.resolveValues(variable, mockContext), String.class);
122126

123127
// ASSERT
124-
Assert.assertArrayEquals("Resolved values", expectedResolvedValues, actualResolvedValues); //$NON-NLS-1$
128+
assertArrayEquals(expectedResolvedValues, actualResolvedValues, "Resolved values"); //$NON-NLS-1$
125129
}
126130

127131
}

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,60 @@
1111

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

14-
import static org.junit.Assert.assertArrayEquals;
14+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
15+
import static org.junit.jupiter.api.Assertions.assertThrows;
1516
import static org.mockito.Mockito.mock;
1617

1718
import java.util.List;
1819

1920
import org.eclipse.jface.text.templates.TemplateException;
2021
import org.eclipse.jface.text.templates.TemplateVariable;
2122
import org.eclipse.xtext.XtextRuntimeModule;
23+
import org.eclipse.xtext.testing.extensions.InjectionExtension;
2224
import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext;
23-
import org.junit.Test;
24-
import org.junit.runner.RunWith;
25+
import org.junit.jupiter.api.AfterAll;
26+
import org.junit.jupiter.api.BeforeAll;
27+
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.TestInstance;
29+
import org.junit.jupiter.api.extension.ExtendWith;
2530

26-
import com.avaloq.tools.ddk.test.core.AfterAll;
27-
import com.avaloq.tools.ddk.test.core.BeforeAll;
28-
import com.avaloq.tools.ddk.xtext.test.junit.runners.XtextClassRunner;
2931
import com.google.inject.Guice;
3032

3133

32-
@RunWith(XtextClassRunner.class)
33-
public class SimpleEnumTemplateVariableResolverTest {
34+
@ExtendWith(InjectionExtension.class)
35+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
36+
class SimpleEnumTemplateVariableResolverTest {
3437

3538
private static XtextTemplateContext mockContext;
3639
private static TemplateVariableResolverTestHelper helper;
3740
private static SimpleEnumTemplateVariableResolver resolver;
3841

3942
@BeforeAll
40-
public void beforeAll() {
43+
void beforeAll() {
4144
mockContext = mock(XtextTemplateContext.class);
4245
helper = Guice.createInjector(new XtextRuntimeModule()).getInstance(TemplateVariableResolverTestHelper.class);
4346
resolver = new SimpleEnumTemplateVariableResolver();
4447
}
4548

4649
@AfterAll
47-
public void afterAll() {
50+
void afterAll() {
4851
mockContext = null;
4952
helper = null;
5053
resolver = null;
5154
}
5255

53-
@Test(expected = NullPointerException.class)
54-
public void testResolveValuesWithNullVariable() {
55-
resolver.resolveValues(null, mockContext);
56+
@Test
57+
void testResolveValuesWithNullVariable() {
58+
assertThrows(NullPointerException.class, () -> resolver.resolveValues(null, mockContext));
5659
}
5760

5861
@Test
59-
public void testResolveValuesWithOneParam() throws TemplateException {
62+
void testResolveValuesWithOneParam() throws TemplateException {
6063
testResolveValues("Value"); //$NON-NLS-1$
6164
}
6265

6366
@Test
64-
public void testResolveValuesWithMultipleParams() throws TemplateException {
67+
void testResolveValuesWithMultipleParams() throws TemplateException {
6568
testResolveValues("Value 1", "Value 2", "Value 3"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
6669
}
6770

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

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

7982
}

0 commit comments

Comments
 (0)