Skip to content

Commit 81fbdc5

Browse files
philwebbphilwebb
committed
Upgrade to JUnit 5
Closes gh-290
1 parent 6f2d085 commit 81fbdc5

File tree

22 files changed

+270
-248
lines changed

22 files changed

+270
-248
lines changed

‎pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<maven-plugin-api.version>${maven-core.version}</maven-plugin-api.version>
4646
<maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
4747
<mockito.version>3.6.28</mockito.version>
48-
<junit.version>4.13.1</junit.version>
48+
<junit.version>5.8.1</junit.version>
4949
<javassist.version>3.21.0-GA</javassist.version>
5050
<picocontainer.version>1.2</picocontainer.version>
5151
<system-rules.version>1.16.0</system-rules.version>
@@ -445,8 +445,8 @@
445445
<dependencyManagement>
446446
<dependencies>
447447
<dependency>
448-
<groupId>junit</groupId>
449-
<artifactId>junit</artifactId>
448+
<groupId>org.junit.jupiter</groupId>
449+
<artifactId>junit-jupiter</artifactId>
450450
<version>${junit.version}</version>
451451
</dependency>
452452
<dependency>
@@ -550,8 +550,8 @@
550550
<dependencies>
551551
<!-- Test -->
552552
<dependency>
553-
<groupId>junit</groupId>
554-
<artifactId>junit</artifactId>
553+
<groupId>org.junit.jupiter</groupId>
554+
<artifactId>junit-jupiter</artifactId>
555555
<scope>test</scope>
556556
</dependency>
557557
<dependency>

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Bundle-SymbolicName: io.spring.javaformat.eclipse.tests
66
Automatic-Module-Name: io.spring.javaformat.eclipse.tests
77
Bundle-Version: 0.0.29.qualifier
88
Bundle-RequiredExecutionEnvironment: JavaSE-11
9-
Require-Bundle: org.junit;bundle-version="4.12"
9+
Require-Bundle: org.junit,
10+
org.junit.jupiter.api
1011
Bundle-ClassPath: .,
1112
lib/assertj-core.jar,
1213
lib/byte-buddy-agent.jar,

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/MessagesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.spring.javaformat.eclipse;
1818

1919
import org.eclipse.osgi.util.NLS;
20-
import org.junit.Test;
20+
import org.junit.jupiter.api.Test;
2121

2222
import static org.assertj.core.api.Assertions.assertThat;
2323

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectPropertiesTests.java

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
import java.util.Properties;
2727
import java.util.stream.Collectors;
2828

29-
import org.junit.Rule;
30-
import org.junit.Test;
31-
import org.junit.rules.TemporaryFolder;
29+
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.io.TempDir;
3231

3332
import io.spring.javaformat.config.JavaFormatConfig;
3433

@@ -41,48 +40,47 @@
4140
*/
4241
public class ProjectPropertiesTests {
4342

44-
@Rule
45-
public TemporaryFolder temp = new TemporaryFolder();
43+
@TempDir
44+
public File temp;
4645

4746
@Test
4847
public void addFromFolderAddsEclipseProperties() throws IOException {
49-
File folder = this.temp.newFolder();
50-
File file = new File(folder, "eclipse.properties");
48+
File file = new File(this.temp, "eclipse.properties");
5149
writeProperties(file, "2018");
5250
ProjectProperties properties = new ProjectProperties();
53-
properties.addFromFolder(folder);
51+
properties.addFromFolder(this.temp);
5452
assertThat(properties.get("copyright-year")).isEqualTo("2018");
5553
}
5654

5755
@Test
5856
public void addFromFolderWhenAlreadySetDoesNotOverwrite() throws IOException {
5957
ProjectProperties properties = new ProjectProperties();
60-
File folder = this.temp.newFolder();
61-
writeProperties(new File(folder, "eclipse.properties"), "2018");
62-
properties.addFromFolder(folder);
63-
folder = this.temp.newFolder();
64-
writeProperties(new File(folder, "eclipse.properties"), "2017");
65-
properties.addFromFolder(folder);
58+
File folder1 = new File(this.temp, "1");
59+
folder1.mkdirs();
60+
writeProperties(new File(folder1, "eclipse.properties"), "2018");
61+
properties.addFromFolder(folder1);
62+
File folder2 = new File(this.temp, "2");
63+
folder2.mkdirs();
64+
writeProperties(new File(folder2, "eclipse.properties"), "2017");
65+
properties.addFromFolder(folder2);
6666
assertThat(properties.get("copyright-year")).isEqualTo("2018");
6767
}
6868

6969
@Test
7070
public void addFromEmptyFolderUsesDefaults() throws IOException {
7171
ProjectProperties properties = new ProjectProperties();
72-
File folder = this.temp.newFolder();
73-
properties.addFromFolder(folder);
72+
properties.addFromFolder(this.temp);
7473
String currentYear = String.valueOf(LocalDate.now().getYear());
7574
assertThat(properties.get("copyright-year")).isEqualTo(currentYear);
7675
}
7776

7877
@Test
7978
public void getModifiedContentReplacesCopyrightYear() throws IOException {
8079
String year = "2016-2020";
81-
File folder = this.temp.newFolder();
82-
File file = new File(folder, "eclipse.properties");
80+
File file = new File(this.temp, "eclipse.properties");
8381
writeProperties(file, year);
8482
ProjectProperties properties = new ProjectProperties();
85-
properties.addFromFolder(folder);
83+
properties.addFromFolder(this.temp);
8684
ProjectSettingsFiles files = new ProjectSettingsFilesLocator().locateSettingsFiles();
8785
ProjectSettingsFile prefs = getFile(files, "org.eclipse.jdt.ui.prefs");
8886
String content = loadContent(properties.getModifiedContent(prefs).getContent(JavaFormatConfig.DEFAULT));

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFileTests.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
import java.io.FileNotFoundException;
2222
import java.io.PrintWriter;
2323

24-
import org.junit.Rule;
25-
import org.junit.Test;
26-
import org.junit.rules.TemporaryFolder;
24+
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.io.TempDir;
2726

2827
import io.spring.javaformat.config.JavaFormatConfig;
2928

@@ -36,12 +35,12 @@
3635
*/
3736
public class ProjectSettingsFileTests {
3837

39-
@Rule
40-
public TemporaryFolder temp = new TemporaryFolder();
38+
@TempDir
39+
public File temp;
4140

4241
@Test
4342
public void fromFileAdaptsFile() throws Exception {
44-
File file = this.temp.newFile();
43+
File file = new File(this.temp, "file");
4544
writeText(file, "test");
4645
ProjectSettingsFile projectSettingsFile = ProjectSettingsFile.fromFile(file);
4746
assertThat(projectSettingsFile.getName()).isEqualTo(file.getName());

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesLocatorTests.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
import java.util.Map;
2626
import java.util.Properties;
2727

28-
import org.junit.Rule;
29-
import org.junit.Test;
30-
import org.junit.rules.TemporaryFolder;
28+
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.io.TempDir;
3130

3231
import io.spring.javaformat.config.JavaFormatConfig;
3332

@@ -40,8 +39,8 @@
4039
*/
4140
public class ProjectSettingsFilesLocatorTests {
4241

43-
@Rule
44-
public TemporaryFolder temp = new TemporaryFolder();
42+
@TempDir
43+
public File temp;
4544

4645
@Test
4746
public void locateSettingsFilesWhenNoFoldersShouldReturnDefault() throws IOException {
@@ -52,19 +51,18 @@ public void locateSettingsFilesWhenNoFoldersShouldReturnDefault() throws IOExcep
5251

5352
@Test
5453
public void locateSettingsFilesOnlyFindPrefs() throws Exception {
55-
File folder = this.temp.newFolder();
56-
writeFile(folder, "foo.prefs");
57-
writeFile(folder, "bar.notprefs");
58-
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(folder).locateSettingsFiles();
54+
writeFile(this.temp, "foo.prefs");
55+
writeFile(this.temp, "bar.notprefs");
56+
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(this.temp).locateSettingsFiles();
5957
assertThat(files.iterator()).extracting(ProjectSettingsFile::getName).containsOnly("org.eclipse.jdt.core.prefs",
6058
"org.eclipse.jdt.ui.prefs", "foo.prefs");
6159
}
6260

6361
@Test
6462
public void locateSettingsFilesWhenMultipleFoldersFindsInEarliest() throws Exception {
65-
File folder1 = this.temp.newFolder();
63+
File folder1 = new File(this.temp, "1");
6664
writeFile(folder1, "foo.prefs", "foo1");
67-
File folder2 = this.temp.newFolder();
65+
File folder2 = new File(this.temp, "2");
6866
writeFile(folder2, "foo.prefs", "foo2");
6967
writeFile(folder2, "org.eclipse.jdt.core.prefs", "core2");
7068
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(folder1, folder2).locateSettingsFiles();

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesTests.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
package io.spring.javaformat.eclipse.projectsettings;
1818

19+
import java.io.File;
1920
import java.io.InputStream;
2021
import java.util.Collections;
2122

2223
import org.eclipse.core.resources.IFile;
2324
import org.eclipse.core.resources.IProject;
2425
import org.eclipse.core.runtime.IProgressMonitor;
25-
import org.junit.Rule;
26-
import org.junit.Test;
27-
import org.junit.rules.TemporaryFolder;
26+
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.io.TempDir;
2828

2929
import static org.assertj.core.api.Assertions.assertThat;
3030
import static org.mockito.ArgumentMatchers.any;
@@ -40,19 +40,21 @@
4040
*/
4141
public class ProjectSettingsFilesTests {
4242

43-
@Rule
44-
public TemporaryFolder temp = new TemporaryFolder();
43+
@TempDir
44+
public File temp;
4545

4646
@Test
4747
public void iteratorIteratesFiles() throws Exception {
48-
ProjectSettingsFile file = ProjectSettingsFile.fromFile(this.temp.newFile());
48+
ProjectSettingsFile file = ProjectSettingsFile.fromFile(new File(this.temp, "file.prefs"));
4949
ProjectSettingsFiles files = new ProjectSettingsFiles(Collections.singleton(file), new ProjectProperties());
5050
assertThat(files).containsOnly(file);
5151
}
5252

5353
@Test
5454
public void applyToProjectCopiesToDotSettings() throws Exception {
55-
ProjectSettingsFile file = ProjectSettingsFile.fromFile(this.temp.newFile("foo.prefs"));
55+
File prefsFile = new File(this.temp, "foo.prefs");
56+
prefsFile.createNewFile();
57+
ProjectSettingsFile file = ProjectSettingsFile.fromFile(prefsFile);
5658
ProjectSettingsFiles files = new ProjectSettingsFiles(Collections.singleton(file), new ProjectProperties());
5759
IProject project = mock(IProject.class);
5860
IProgressMonitor monitor = mock(IProgressMonitor.class);

‎spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/CheckTaskTests.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727

2828
import org.gradle.testkit.runner.BuildResult;
2929
import org.gradle.testkit.runner.TaskOutcome;
30-
import org.junit.Rule;
31-
import org.junit.Test;
32-
import org.junit.rules.TemporaryFolder;
30+
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.extension.ExtendWith;
32+
import org.junit.jupiter.api.io.TempDir;
3333

3434
import io.spring.javaformat.gradle.testkit.GradleBuild;
35+
import io.spring.javaformat.gradle.testkit.GradleBuildExtension;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
3738

@@ -40,13 +41,13 @@
4041
*
4142
* @author Phillip Webb
4243
*/
44+
@ExtendWith(GradleBuildExtension.class)
4345
public class CheckTaskTests {
4446

45-
@Rule
46-
public final GradleBuild gradleBuild = new GradleBuild();
47+
@TempDir
48+
public File temp;
4749

48-
@Rule
49-
public final TemporaryFolder temp = new TemporaryFolder();
50+
public GradleBuild gradleBuild;
5051

5152
@Test
5253
public void checkOk() throws IOException {
@@ -65,11 +66,11 @@ public void whenFirstInvocationSucceedsThenSecondInvocationIsUpToDate() throws I
6566

6667
@Test
6768
public void whenFirstInvocationSucceedsAndSourceIsModifiedThenSecondInvocationSucceeds() throws IOException {
68-
copyFolder(new File("src/test/resources/check-ok").toPath(), this.temp.getRoot().toPath());
69-
GradleBuild gradleBuild = this.gradleBuild.source(this.temp.getRoot());
69+
copyFolder(new File("src/test/resources/check-ok").toPath(), this.temp.toPath());
70+
GradleBuild gradleBuild = this.gradleBuild.source(this.temp);
7071
BuildResult result = gradleBuild.build("check");
7172
assertThat(result.task(":checkFormatMain").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
72-
Files.write(new File(this.temp.getRoot(), "src/main/java/simple/Simple.java").toPath(),
73+
Files.write(new File(this.temp, "src/main/java/simple/Simple.java").toPath(),
7374
Collections.singletonList("// A change to the file"), StandardOpenOption.APPEND);
7475
result = gradleBuild.build("--debug", "check");
7576
assertThat(result.task(":checkFormatMain").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);

‎spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/FormatTaskTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222

2323
import org.gradle.testkit.runner.BuildResult;
2424
import org.gradle.testkit.runner.TaskOutcome;
25-
import org.junit.Rule;
26-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.extension.ExtendWith;
2727

2828
import io.spring.javaformat.gradle.testkit.GradleBuild;
29+
import io.spring.javaformat.gradle.testkit.GradleBuildExtension;
2930

3031
import static org.assertj.core.api.Assertions.assertThat;
3132

@@ -34,10 +35,10 @@
3435
*
3536
* @author Phillip Webb
3637
*/
38+
@ExtendWith(GradleBuildExtension.class)
3739
public class FormatTaskTests {
3840

39-
@Rule
40-
public final GradleBuild gradleBuild = new GradleBuild();
41+
public GradleBuild gradleBuild;
4142

4243
@Test
4344
public void checkOk() throws IOException {

0 commit comments

Comments
 (0)