Skip to content

Commit 465d19f

Browse files
carstenarturcarstenartur
authored
more Junit 4 to Junit 5 migrations (#2138)
some classes are not part of any suite and contain failing tests even before migrating
1 parent a4a3767 commit 465d19f

30 files changed

+278
-269
lines changed

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/AbstractSemanticHighlightingTest.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
1818

19-
import org.junit.Before;
20-
import org.junit.rules.ExternalResource;
19+
import org.junit.jupiter.api.BeforeEach;
20+
import org.junit.jupiter.api.extension.AfterEachCallback;
21+
import org.junit.jupiter.api.extension.BeforeEachCallback;
22+
import org.junit.jupiter.api.extension.ExtensionContext;
2123

2224
import org.eclipse.jdt.testplugin.JavaProjectHelper;
2325
import org.eclipse.jdt.text.tests.performance.EditorTestHelper;
@@ -49,7 +51,7 @@
4951

5052
public class AbstractSemanticHighlightingTest {
5153

52-
protected static class SemanticHighlightingTestSetup extends ExternalResource {
54+
protected static class SemanticHighlightingTestSetup implements BeforeEachCallback, AfterEachCallback {
5355

5456
private IJavaProject fJavaProject;
5557
private final String fTestFilename;
@@ -59,7 +61,7 @@ public SemanticHighlightingTestSetup(String testFilename) {
5961
}
6062

6163
@Override
62-
public void before() throws Exception {
64+
public void beforeEach(ExtensionContext context) throws Exception {
6365
fJavaProject= EditorTestHelper.createJavaProject(PROJECT, LINKED_FOLDER);
6466

6567
disableAllSemanticHighlightings();
@@ -82,7 +84,7 @@ protected String getTestFilename() {
8284
}
8385

8486
@Override
85-
public void after() {
87+
public void afterEach(ExtensionContext context) {
8688
EditorTestHelper.closeEditor(fEditor);
8789
fEditor= null;
8890
fSourceViewer= null;
@@ -113,7 +115,7 @@ public void after() {
113115

114116
private static SourceViewer fSourceViewer;
115117

116-
@Before
118+
@BeforeEach
117119
public void before() throws Exception {
118120
disableAllSemanticHighlightings();
119121
}

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/AutoboxingSemanticHighlightingTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import org.junit.Rule;
17-
import org.junit.Test;
16+
import org.junit.jupiter.api.Test;
17+
import org.junit.jupiter.api.extension.RegisterExtension;
1818

1919
import org.eclipse.jface.text.Position;
2020

2121
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
2222

2323
public class AutoboxingSemanticHighlightingTest extends AbstractSemanticHighlightingTest {
2424

25-
@Rule
25+
@RegisterExtension
2626
public SemanticHighlightingTestSetup shts=new SemanticHighlightingTestSetup("/SHTest/src/Autoboxing.java");
2727

2828
@Test

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BracketInserterTest.java‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertFalse;
18-
import static org.junit.Assert.assertNotEquals;
19-
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.assertTrue;
21-
import static org.junit.Assert.fail;
22-
23-
import org.junit.After;
24-
import org.junit.Before;
25-
import org.junit.Rule;
26-
import org.junit.Test;
27-
import org.junit.rules.TestName;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertFalse;
18+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNotNull;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
21+
import static org.junit.jupiter.api.Assertions.fail;
22+
23+
import org.junit.jupiter.api.AfterEach;
24+
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.TestInfo;
2827

2928
import org.eclipse.jdt.testplugin.JavaProjectHelper;
3029
import org.eclipse.jdt.text.tests.performance.DisplayHelper;
@@ -73,8 +72,12 @@
7372
* @since 3.1
7473
*/
7574
public class BracketInserterTest {
76-
@Rule
77-
public TestName tn= new TestName();
75+
private String testName;
76+
77+
@BeforeEach
78+
void init(TestInfo testInfo) {
79+
this.testName= testInfo.getDisplayName();
80+
}
7881

7982
private static final String SRC= "src";
8083
private static final String SEP= "/";
@@ -115,7 +118,7 @@ void foo(String[] args) {
115118
private Accessor fAccessor;
116119
private IJavaProject fProject;
117120

118-
@Before
121+
@BeforeEach
119122
public void setUp() throws Exception {
120123
IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
121124
store.setValue(PreferenceConstants.EDITOR_CLOSE_BRACKETS, true);
@@ -124,15 +127,15 @@ public void setUp() throws Exception {
124127
}
125128

126129
private void setUpProject(String sourceLevel) throws CoreException, JavaModelException {
127-
fProject= JavaProjectHelper.createJavaProject(tn.getMethodName(), "bin");
130+
fProject= JavaProjectHelper.createJavaProject(testName, "bin");
128131
fProject.setOption(JavaCore.COMPILER_SOURCE, sourceLevel);
129132
JavaProjectHelper.addSourceContainer(fProject, SRC);
130-
IPackageFragment fragment= fProject.findPackageFragment(new Path(SEP + tn.getMethodName() + SEP + SRC));
133+
IPackageFragment fragment= fProject.findPackageFragment(new Path(SEP + testName + SEP + SRC));
131134
fragment.createCompilationUnit(CU_NAME, CU_CONTENTS, true, new NullProgressMonitor());
132135
}
133136

134137
private void setUpEditor() {
135-
fEditor= openJavaEditor(new Path(SEP + tn.getMethodName() + SEP + SRC + SEP + CU_NAME));
138+
fEditor= openJavaEditor(new Path(SEP + testName + SEP + SRC + SEP + CU_NAME));
136139
assertNotNull(fEditor);
137140
fTextWidget= fEditor.getViewer().getTextWidget();
138141
assertNotNull(fTextWidget);
@@ -154,7 +157,7 @@ private JavaEditor openJavaEditor(IPath path) {
154157
}
155158
}
156159

157-
@After
160+
@AfterEach
158161
public void tearDown() throws Exception {
159162
EditorTestHelper.closeEditor(fEditor);
160163
fEditor= null;

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakIteratorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

1818
import java.text.BreakIterator;
1919

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/CompilationUnitDocumentProviderTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertNull;
19-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertNull;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
2020

21-
import org.junit.After;
22-
import org.junit.Test;
21+
import org.junit.jupiter.api.AfterEach;
22+
import org.junit.jupiter.api.Test;
2323

2424
import org.eclipse.jdt.testplugin.JavaProjectHelper;
2525

@@ -73,7 +73,7 @@ private void setupProject() throws CoreException, JavaModelException {
7373
*
7474
* @throws CoreException if deletion fails
7575
*/
76-
@After
76+
@AfterEach
7777
public void tearDown() throws CoreException {
7878
if (fJavaProject != null)
7979
JavaProjectHelper.delete(fJavaProject);

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JUnitProjectTestSetup.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.assertNotNull;
16+
import static org.junit.jupiter.api.Assertions.assertNotNull;
1717

18-
import org.junit.rules.ExternalResource;
18+
import org.junit.jupiter.api.extension.AfterEachCallback;
19+
import org.junit.jupiter.api.extension.BeforeEachCallback;
20+
import org.junit.jupiter.api.extension.ExtensionContext;
1921

2022
import org.eclipse.jdt.testplugin.JavaProjectHelper;
2123

@@ -34,7 +36,7 @@
3436
*
3537
* @since 3.1
3638
*/
37-
public class JUnitProjectTestSetup extends ExternalResource {
39+
public class JUnitProjectTestSetup implements BeforeEachCallback, AfterEachCallback {
3840

3941
private static IJavaProject fgProject;
4042

@@ -44,13 +46,13 @@ public static IJavaProject getProject() {
4446
}
4547

4648
@Override
47-
public void before() throws Exception {
49+
public void beforeEach(ExtensionContext context) throws Exception {
4850
String projectName= "JUnit_" + System.currentTimeMillis();
4951
fgProject= JavaProjectHelper.createJavaProjectWithJUnitSource(projectName, "src", "bin");
5052
}
5153

5254
@Override
53-
public void after() {
55+
public void afterEach(ExtensionContext context) {
5456
if (fgProject != null) {
5557
try {
5658
JavaProjectHelper.delete(fgProject);

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/Java24SemanticHighlightingTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import org.junit.Before;
17-
import org.junit.Rule;
18-
import org.junit.Test;
16+
import org.junit.jupiter.api.BeforeEach;
17+
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.extension.RegisterExtension;
1919

2020
import org.eclipse.jface.text.Position;
2121

2222
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingsCore;
2323

2424
public class Java24SemanticHighlightingTest extends AbstractSemanticHighlightingTest {
2525

26-
@Rule
26+
@RegisterExtension
2727
public SemanticHighlightingTestSetup shts= new SemanticHighlightingTestSetup( "/SHTest/src/Java24.java");
2828

29-
@Before
29+
@BeforeEach
3030
public void updateCompliance() {
3131
shts.updateCompliance("24", true);
3232
}

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaAutoIndentStrategyTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.fail;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.fail;
1818

19-
import org.junit.After;
20-
import org.junit.Before;
21-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2222

2323
import org.eclipse.core.runtime.ILogListener;
2424
import org.eclipse.core.runtime.IStatus;
@@ -453,12 +453,12 @@ public void testSmartIndentAfterNewLine10() {
453453
assertEquals(str, fDocument.get());
454454
}
455455

456-
@Before
456+
@BeforeEach
457457
public void setUp() throws Exception {
458458
JavaPlugin.getDefault().getLog().addLogListener(this);
459459
}
460460

461-
@After
461+
@AfterEach
462462
public void tearDown() throws Exception {
463463
JavaPlugin.getDefault().getLog().removeLogListener(this);
464464
}

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaBreakIteratorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import org.junit.Before;
17-
import org.junit.Test;
16+
import org.junit.jupiter.api.BeforeEach;
17+
import org.junit.jupiter.api.Test;
1818

1919
import org.eclipse.jdt.internal.ui.text.JavaBreakIterator;
2020

@@ -23,7 +23,7 @@
2323
*/
2424
public class JavaBreakIteratorTest extends BreakIteratorTest {
2525

26-
@Before
26+
@BeforeEach
2727
public void setUp() throws Exception {
2828
fBreakIterator= new JavaBreakIterator();
2929
}

‎org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaColoringTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.text.tests;
1515

16-
import static org.junit.Assert.fail;
16+
import static org.junit.jupiter.api.Assertions.fail;
1717

1818
import java.util.Iterator;
1919

20-
import org.junit.After;
21-
import org.junit.Before;
22-
import org.junit.Test;
20+
import org.junit.jupiter.api.AfterEach;
21+
import org.junit.jupiter.api.BeforeEach;
22+
import org.junit.jupiter.api.Test;
2323

2424
import org.eclipse.swt.custom.StyleRange;
2525

@@ -47,7 +47,7 @@ public class JavaColoringTest {
4747
protected IDocument fDocument;
4848
protected JavaTextTools fTextTools;
4949

50-
@Before
50+
@BeforeEach
5151
public void setUp() {
5252
IPreferenceStore store= new PreferenceStore();
5353
fTextTools= new JavaTextTools(store);
@@ -69,7 +69,7 @@ public void setUp() {
6969
System.out.print("------ next ---------\n");
7070
}
7171

72-
@After
72+
@AfterEach
7373
public void tearDown () {
7474
fTextTools.dispose();
7575
fTextTools= null;

0 commit comments

Comments
 (0)