Skip to content

Commit b901861

Browse files
committed
test(build): MXTS-74974: migrate microdocs-core-java to JUnit 5, drop vintage engine
1 parent cc70b02 commit b901861

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

microdocs-core-java/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ repositories {
2323
dependencies {
2424
api("com.fasterxml.jackson.core:jackson-databind:2.10.1")
2525
api("com.mashape.unirest:unirest-java:1.4.9")
26-
testImplementation("junit:junit:4.12")
27-
// com.maxxton.convention forces useJUnitPlatform() on all Test tasks;
28-
// the vintage engine lets these existing JUnit 4 tests run on it.
29-
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
26+
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
27+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.2")
3028
}
3129

3230
task javadocJar(type: Jar, dependsOn: javadoc) {

microdocs-core-java/gradle.lockfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@ com.fasterxml.jackson.core:jackson-databind:2.10.1=compileClasspath,integrationT
77
com.mashape.unirest:unirest-java:1.4.9=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
88
commons-codec:commons-codec:1.9=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
99
commons-logging:commons-logging:1.2=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10-
junit:junit:4.12=integrationTestCompileClasspath,testCompileClasspath
11-
junit:junit:4.13.2=integrationTestRuntimeClasspath,testRuntimeClasspath
1210
org.apache.httpcomponents:httpasyncclient:4.1.1=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1311
org.apache.httpcomponents:httpclient:4.5.2=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1412
org.apache.httpcomponents:httpcore-nio:4.4.4=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1513
org.apache.httpcomponents:httpcore:4.4.4=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1614
org.apache.httpcomponents:httpmime:4.5.2=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
17-
org.hamcrest:hamcrest-core:1.3=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
15+
org.apiguardian:apiguardian-api:1.1.2=integrationTestCompileClasspath,testCompileClasspath
1816
org.json:json:20160212=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
19-
org.junit.platform:junit-platform-commons:1.10.2=integrationTestRuntimeClasspath,testRuntimeClasspath
17+
org.junit.jupiter:junit-jupiter-api:5.10.2=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
18+
org.junit.jupiter:junit-jupiter-engine:5.10.2=integrationTestRuntimeClasspath,testRuntimeClasspath
19+
org.junit.jupiter:junit-jupiter-params:5.10.2=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
20+
org.junit.jupiter:junit-jupiter:5.10.2=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
21+
org.junit.platform:junit-platform-commons:1.10.2=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2022
org.junit.platform:junit-platform-engine:1.10.2=integrationTestRuntimeClasspath,testRuntimeClasspath
21-
org.junit.vintage:junit-vintage-engine:5.10.2=integrationTestRuntimeClasspath,testRuntimeClasspath
22-
org.junit:junit-bom:5.10.2=integrationTestRuntimeClasspath,testRuntimeClasspath
23-
org.opentest4j:opentest4j:1.3.0=integrationTestRuntimeClasspath,testRuntimeClasspath
23+
org.junit.platform:junit-platform-launcher:1.10.2=integrationTestRuntimeClasspath,testRuntimeClasspath
24+
org.junit:junit-bom:5.10.2=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
25+
org.opentest4j:opentest4j:1.3.0=integrationTestCompileClasspath,integrationTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2426
empty=annotationProcessor,integrationTestAnnotationProcessor,testAnnotationProcessor

microdocs-core-java/src/test/java/com/maxxton/microdocs/core/reflect/ReflectClassTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import static org.junit.Assert.assertTrue;
6+
import org.junit.jupiter.api.Test;
7+
8+
import static org.junit.jupiter.api.Assertions.assertTrue;
79

810
/**
911
* @author Steven Hermans
1012
*/
1113
public class ReflectClassTest {
1214

13-
@org.junit.Test
15+
@Test
1416
public void testHasParent() {
1517
ReflectClass<ArrayList<?>> arrayListClass = new ReflectClass<>();
1618
arrayListClass.setSimpleName(ArrayList.class.getSimpleName());
@@ -31,7 +33,7 @@ public void testHasParent() {
3133

3234
}
3335

34-
@org.junit.Test
36+
@Test
3537
public void testHasParentNotLoaded() {
3638
ReflectClass<ArrayList<?>> arrayListClass = new ReflectClass<>();
3739
arrayListClass.setSimpleName(ArrayList.class.getSimpleName());

0 commit comments

Comments
 (0)