Skip to content

Commit 00567b9

Browse files
slawekjaranowskislawekjaranowski
committed
Use newer version of surefire for itself testing, enable JUnit 5 in tests
1 parent c12fe63 commit 00567b9

File tree

39 files changed

+147
-618
lines changed

39 files changed

+147
-618
lines changed

‎maven-failsafe-plugin/pom.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
</dependency>
110110

111111
<dependency>
112-
<groupId>junit</groupId>
113-
<artifactId>junit</artifactId>
112+
<groupId>org.junit.jupiter</groupId>
113+
<artifactId>junit-jupiter-api</artifactId>
114114
<scope>test</scope>
115115
</dependency>
116116
<dependency>
@@ -151,16 +151,13 @@
151151
<artifactId>maven-surefire-plugin</artifactId>
152152
<configuration>
153153
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
154-
<includes>
155-
<include>**/JUnit4SuiteTest.java</include>
156-
</includes>
157154
</configuration>
158155
<dependencies>
159156
<dependency>
160157
<groupId>org.apache.maven.surefire</groupId>
161158
<artifactId>surefire-shadefire</artifactId>
162-
<version>3.5.0</version>
163159
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
160+
<version>3.5.2</version>
164161
</dependency>
165162
</dependencies>
166163
</plugin>

‎maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.apache.maven.artifact.DefaultArtifact;
2626
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
2727
import org.apache.maven.project.MavenProject;
28-
import org.junit.Before;
29-
import org.junit.Test;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
3030

3131
import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
3232
import static org.assertj.core.api.Assertions.assertThat;
@@ -36,11 +36,11 @@
3636
/**
3737
* @since 2.20
3838
*/
39-
public class IntegrationTestMojoTest {
39+
class IntegrationTestMojoTest {
4040
private IntegrationTestMojo mojo;
4141

42-
@Before
43-
public void init() throws InvalidVersionSpecificationException, IOException {
42+
@BeforeEach
43+
void init() throws InvalidVersionSpecificationException, IOException {
4444
Artifact artifact = new DefaultArtifact("g", "a", createFromVersionSpec("1.0"), "compile", "jar", "", null);
4545
artifact.setFile(new File("./target/tmp/a-1.0.jar"));
4646
new File("./target/tmp").mkdir();
@@ -52,47 +52,47 @@ public void init() throws InvalidVersionSpecificationException, IOException {
5252
}
5353

5454
@Test
55-
public void shouldBeJar() {
55+
void shouldBeJar() {
5656
mojo.setDefaultClassesDirectory(new File("./target/classes"));
5757
File binaries = mojo.getMainBuildPath();
5858
assertThat(binaries.getName()).isEqualTo("a-1.0.jar");
5959
}
6060

6161
@Test
62-
public void shouldBeAnotherJar() {
62+
void shouldBeAnotherJar() {
6363
mojo.setMainBuildPath(new File("./target/another-1.0.jar"));
6464
mojo.setDefaultClassesDirectory(new File("./target/classes"));
6565
File binaries = mojo.getMainBuildPath();
6666
assertThat(binaries.getName()).isEqualTo("another-1.0.jar");
6767
}
6868

6969
@Test
70-
public void shouldBeClasses() {
70+
void shouldBeClasses() {
7171
mojo.setMainBuildPath(new File("./target/classes"));
7272
mojo.setDefaultClassesDirectory(new File("./target/classes"));
7373
File binaries = mojo.getMainBuildPath();
7474
assertThat(binaries.getName()).isEqualTo("classes");
7575
}
7676

7777
@Test
78-
public void shouldGetNullEnv() {
78+
void shouldGetNullEnv() {
7979
assertThat(mojo.getExcludedEnvironmentVariables()).hasSize(0);
8080
}
8181

8282
@Test
83-
public void shouldGetEnv() {
83+
void shouldGetEnv() {
8484
mojo.setExcludedEnvironmentVariables(new String[] {"ABC", "KLM"});
8585
assertThat(mojo.getExcludedEnvironmentVariables()).hasSize(2).contains("ABC", "KLM");
8686
}
8787

8888
@Test
89-
public void testShouldGetPropertyFile() {
89+
void testShouldGetPropertyFile() {
9090
mojo.setSystemPropertiesFile(new File("testShouldGetPropertyFile"));
9191
assertThat(mojo.getSystemPropertiesFile()).isEqualTo(new File("testShouldGetPropertyFile"));
9292
}
9393

9494
@Test
95-
public void shouldHaveJUnit5EnginesFilter() {
95+
void shouldHaveJUnit5EnginesFilter() {
9696
mojo.setIncludeJUnit5Engines(new String[] {"e1", "e2"});
9797
assertThat(mojo.getIncludeJUnit5Engines()).isEqualTo(new String[] {"e1", "e2"});
9898

‎maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/JUnit4SuiteTest.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
2424
import org.apache.maven.surefire.api.suite.RunResult;
2525
import org.apache.maven.surefire.api.util.SureFireFileManager;
26-
import org.junit.Test;
26+
import org.junit.jupiter.api.Test;
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

3030
/**
3131
*
3232
*/
33-
public class MarshallerUnmarshallerTest {
33+
class MarshallerUnmarshallerTest {
3434
@Test
35-
public void shouldUnmarshallExistingXmlFile() throws Exception {
35+
void shouldUnmarshallExistingXmlFile() throws Exception {
3636
File xml = new File("target/test-classes/org/apache/maven/plugin/failsafe/failsafe-summary.xml");
3737
RunResult summary = FailsafeSummaryXmlUtils.toRunResult(xml);
3838

@@ -56,7 +56,7 @@ public void shouldUnmarshallExistingXmlFile() throws Exception {
5656
}
5757

5858
@Test
59-
public void shouldMarshallAndUnmarshallSameXml() throws Exception {
59+
void shouldMarshallAndUnmarshallSameXml() throws Exception {
6060
RunResult expected = new RunResult(
6161
7,
6262
1,

‎maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
2828
import org.apache.maven.surefire.api.suite.RunResult;
2929
import org.apache.maven.surefire.api.util.SureFireFileManager;
30-
import org.junit.Test;
30+
import org.junit.jupiter.api.Test;
3131

3232
import static java.lang.String.format;
3333
import static org.assertj.core.api.Assertions.assertThat;
@@ -37,10 +37,10 @@
3737
* @since 2.20
3838
*/
3939
@SuppressWarnings("checkstyle:magicnumber")
40-
public class RunResultTest {
40+
class RunResultTest {
4141

4242
@Test
43-
public void testAggregatedValues() {
43+
void testAggregatedValues() {
4444
RunResult simple = getSimpleAggregate();
4545

4646
assertThat(simple.getCompletedCount()).isEqualTo(20);
@@ -55,27 +55,27 @@ public void testAggregatedValues() {
5555
}
5656

5757
@Test
58-
public void testSerialization() throws Exception {
58+
void testSerialization() throws Exception {
5959
writeReadCheck(getSimpleAggregate());
6060
}
6161

6262
@Test
63-
public void testFailures() throws Exception {
63+
void testFailures() throws Exception {
6464
writeReadCheck(new RunResult(0, 1, 2, 3, "stacktraceHere", false));
6565
}
6666

6767
@Test
68-
public void testSkipped() throws Exception {
68+
void testSkipped() throws Exception {
6969
writeReadCheck(new RunResult(3, 2, 1, 0, null, true));
7070
}
7171

7272
@Test
73-
public void testFlakes() throws Exception {
73+
void testFlakes() throws Exception {
7474
writeReadCheck(new RunResult(3, 2, 1, 0, 2, null, true));
7575
}
7676

7777
@Test
78-
public void testLegacyDeserialization() throws Exception {
78+
void testLegacyDeserialization() throws Exception {
7979
File legacySummary = SureFireFileManager.createTempFile("failsafe", "test");
8080
String legacyFailsafeSummaryXmlTemplate = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
8181
+ "<failsafe-summary xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -113,7 +113,7 @@ public void testLegacyDeserialization() throws Exception {
113113
}
114114

115115
@Test
116-
public void testAppendSerialization() throws Exception {
116+
void testAppendSerialization() throws Exception {
117117
RunResult simpleAggregate = getSimpleAggregate();
118118
RunResult additional = new RunResult(2, 1, 2, 2, "msg " + ((char) 0x0E01), true);
119119

‎maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
import org.apache.maven.execution.MavenSession;
2828
import org.apache.maven.plugin.MojoExecutionException;
2929
import org.apache.maven.plugin.MojoFailureException;
30-
import org.junit.Before;
31-
import org.junit.Rule;
32-
import org.junit.Test;
33-
import org.junit.rules.TemporaryFolder;
30+
import org.junit.jupiter.api.BeforeEach;
31+
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.api.io.TempDir;
3433
import org.slf4j.Logger;
3534

35+
import static org.assertj.core.api.Assertions.assertThatCode;
3636
import static org.mockito.Mockito.mock;
3737
import static org.mockito.Mockito.when;
3838

39-
public class VerifyMojoTest {
39+
class VerifyMojoTest {
4040
private VerifyMojo mojo;
4141

42-
@Rule
43-
public TemporaryFolder tempFolder = new TemporaryFolder();
42+
@TempDir
43+
private File tempFolder;
4444

4545
private Logger logger = mock(Logger.class);
4646

47-
@Before
48-
public void init() throws UnsupportedEncodingException {
47+
@BeforeEach
48+
void init() throws UnsupportedEncodingException {
4949
mojo = new VerifyMojo(logger);
50-
mojo.setTestClassesDirectory(tempFolder.getRoot());
50+
mojo.setTestClassesDirectory(tempFolder);
5151
mojo.setReportsDirectory(getTestBaseDir());
5252
}
5353

@@ -71,26 +71,25 @@ private File getTestBaseDir() throws UnsupportedEncodingException {
7171
return new File(URLDecoder.decode(resource.getPath(), "UTF-8")).getAbsoluteFile();
7272
}
7373

74-
@Test(expected = MojoExecutionException.class)
75-
public void executeForForkError()
76-
throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
74+
@Test
75+
void executeForForkError() throws UnsupportedEncodingException {
7776
setupExecuteMocks();
7877
mojo.setSummaryFile(new File(getTestBaseDir(), "failsafe-summary-booter-fork-error.xml"));
79-
mojo.execute();
78+
79+
assertThatCode(mojo::execute).isExactlyInstanceOf(MojoExecutionException.class);
8080
}
8181

82-
@Test(expected = MojoExecutionException.class)
83-
public void executeForForkErrorTestFailureIgnore()
84-
throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
82+
@Test
83+
void executeForForkErrorTestFailureIgnore() throws UnsupportedEncodingException {
8584
setupExecuteMocks();
8685
mojo.setSummaryFile(new File(getTestBaseDir(), "failsafe-summary-booter-fork-error.xml"));
8786
mojo.setTestFailureIgnore(true);
88-
mojo.execute();
87+
88+
assertThatCode(mojo::execute).isExactlyInstanceOf(MojoExecutionException.class);
8989
}
9090

9191
@Test
92-
public void executeForPassingTests()
93-
throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
92+
void executeForPassingTests() throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
9493
setupExecuteMocks();
9594
mojo.setSummaryFile(new File(getTestBaseDir(), "failsafe-summary-success.xml"));
9695
mojo.execute();

‎maven-surefire-common/pom.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@
133133
<scope>provided</scope>
134134
</dependency>
135135

136+
<dependency>
137+
<groupId>org.junit.vintage</groupId>
138+
<artifactId>junit-vintage-engine</artifactId>
139+
<scope>test</scope>
140+
</dependency>
141+
136142
<dependency>
137143
<groupId>org.assertj</groupId>
138144
<artifactId>assertj-core</artifactId>
@@ -201,9 +207,6 @@
201207
<artifactId>maven-surefire-plugin</artifactId>
202208
<configuration>
203209
<argLine>${jvm.args.tests}</argLine>
204-
<includes>
205-
<include>**/JUnit4SuiteTest.java</include>
206-
</includes>
207210
<systemPropertyVariables>
208211
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
209212
</systemPropertyVariables>
@@ -212,8 +215,8 @@
212215
<dependency>
213216
<groupId>org.apache.maven.surefire</groupId>
214217
<artifactId>surefire-shadefire</artifactId>
215-
<version>3.5.0</version>
216218
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
219+
<version>3.5.2</version>
217220
</dependency>
218221
</dependencies>
219222
</plugin>

‎maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.eclipse.aether.resolution.DependencyRequest;
4545
import org.eclipse.aether.resolution.DependencyResolutionException;
4646
import org.eclipse.aether.resolution.DependencyResult;
47+
import org.junit.Ignore;
4748
import org.junit.Rule;
4849
import org.junit.Test;
4950
import org.junit.rules.ExpectedException;
@@ -105,6 +106,7 @@ public void shouldBeFailWithinRange() throws InvalidVersionSpecificationExceptio
105106
}
106107

107108
@Test
109+
@Ignore("old not executing tests - to review")
108110
public void testResolveArtifact()
109111
throws InvalidVersionSpecificationException, MojoExecutionException, DependencyResolutionException {
110112

0 commit comments

Comments
 (0)