Skip to content

Commit d4f5d15

Browse files
timtebeektimtebeek
authored
Adopt TypeTable (#676)
* Adopt TypeTable * Unpin minor versions in jar references * Refresh TypeTable and include testng as referenced * Unpin JUnit 4 minor version * Unpin JUnit 4 minor version in JMockitTestUtils * Pin powermock to specific version to fix tests
1 parent a7fee68 commit d4f5d15

File tree

163 files changed

+1341
-1341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+1341
-1341
lines changed

‎build.gradle.kts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,29 @@ group = "org.openrewrite.recipe"
77
description = "A rewrite module automating best practices and major version migrations for popular Java test frameworks like JUnit and Mockito"
88

99
recipeDependencies {
10-
parserClasspath("org.assertj:assertj-core:3.+")
11-
parserClasspath("junit:junit:latest.release")
12-
parserClasspath("pl.pragmatists:JUnitParams:1.+")
13-
parserClasspath("org.junit.jupiter:junit-jupiter-api:latest.release")
14-
parserClasspath("org.junit.jupiter:junit-jupiter-params:latest.release")
15-
parserClasspath("org.hamcrest:hamcrest:latest.release")
10+
parserClasspath("com.github.database-rider:rider-junit5:1.44.0")
11+
parserClasspath("com.github.tomakehurst:wiremock-jre8:2.35.0")
1612
parserClasspath("com.squareup.okhttp3:mockwebserver:3.14.9")
13+
parserClasspath("com.squareup.okhttp3:mockwebserver:4.10.0")
14+
parserClasspath("junit:junit:4.+")
1715
parserClasspath("org.apiguardian:apiguardian-api:1.1.2")
18-
parserClasspath("com.github.tomakehurst:wiremock-jre8:2.35.0")
16+
parserClasspath("org.assertj:assertj-core:3.+")
17+
parserClasspath("org.hamcrest:hamcrest:3.+")
18+
parserClasspath("org.jmockit:jmockit:1.22") // last version with NonStrictExpectations
19+
parserClasspath("org.jmockit:jmockit:1.49")
20+
parserClasspath("org.junit.jupiter:junit-jupiter-api:5.+")
21+
parserClasspath("org.junit.jupiter:junit-jupiter-params:5.+")
1922
parserClasspath("org.mockito:mockito-all:1.10.19")
2023
parserClasspath("org.mockito:mockito-core:3.+")
2124
parserClasspath("org.mockito:mockito-core:5.+")
22-
parserClasspath("org.mockito:mockito-junit-jupiter:5.+")
23-
parserClasspath("org.jmockit:jmockit:1.49")
24-
parserClasspath("org.jmockit:jmockit:1.22") // last version with NonStrictExpectations
2525
parserClasspath("org.mockito:mockito-junit-jupiter:3.+")
26-
parserClasspath("org.powermock:powermock-api-mockito:1.7.+")
27-
parserClasspath("org.powermock:powermock-core:1.7.+")
28-
parserClasspath("com.squareup.okhttp3:mockwebserver:4.10.0")
29-
parserClasspath("org.springframework:spring-test:6.1.12")
30-
parserClasspath("com.github.database-rider:rider-junit5:1.44.0")
26+
parserClasspath("org.mockito:mockito-junit-jupiter:5.+")
27+
parserClasspath("org.powermock:powermock-api-mockito:1.6.5")
28+
parserClasspath("org.powermock:powermock-api-support:1.6.5")
29+
parserClasspath("org.powermock:powermock-core:1.6.5")
30+
parserClasspath("org.springframework:spring-test:6.1.+")
31+
parserClasspath("org.testng:testng:7.+")
32+
parserClasspath("pl.pragmatists:JUnitParams:1.+")
3133
}
3234

3335
val rewriteVersion = rewriteRecipe.rewriteVersion.get()

‎src/main/java/org/openrewrite/java/testing/assertj/AdoptAssertJDurationAssertions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ private List<Object> getUnitInfo(String name, int argValue) {
201201
private J.MethodInvocation applyTemplate(ExecutionContext ctx, J.MethodInvocation m, String template, Object... parameters) {
202202
J.MethodInvocation invocation = JavaTemplate.builder(template)
203203
.contextSensitive()
204-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
204+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
205205
.build()
206206
.apply(getCursor(), m.getCoordinates().replace(), parameters);
207207

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6666
if (args.size() == 2) {
6767
return JavaTemplate.builder("assertThat(#{anyArray()}).containsExactly(#{anyArray()});")
6868
.staticImports(ASSERTJ + ".assertThat")
69-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
69+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7070
.build()
7171
.apply(getCursor(), md.getCoordinates().replace(), actual, expected);
7272
}
@@ -75,15 +75,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
7575
// assert is using floating points with a delta and no message.
7676
return JavaTemplate.builder("assertThat(#{anyArray()}).containsExactly(#{anyArray()}, within(#{any()}));")
7777
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
78-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
78+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7979
.build()
8080
.apply(getCursor(), md.getCoordinates().replace(), actual, expected, args.get(2));
8181
}
8282
if (args.size() == 3) {
8383
Expression message = args.get(2);
8484
return JavaTemplate.builder("assertThat(#{anyArray()}).as(#{any()}).containsExactly(#{anyArray()});")
8585
.staticImports(ASSERTJ + ".assertThat")
86-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
86+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
8787
.build()
8888
.apply(getCursor(), md.getCoordinates().replace(), actual, message, expected);
8989
}
@@ -94,7 +94,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
9494
Expression message = args.get(3);
9595
return JavaTemplate.builder("assertThat(#{anyArray()}).as(#{any()}).containsExactly(#{anyArray()}, within(#{}));")
9696
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
97-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
97+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
9898
.build()
9999
.apply(getCursor(), md.getCoordinates().replace(), actual, message, expected, args.get(2));
100100
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6666
if (args.size() == 2) {
6767
return JavaTemplate.builder("assertThat(#{any()}).isEqualTo(#{any()});")
6868
.staticImports(ASSERTJ + ".assertThat")
69-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
69+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7070
.build()
7171
.apply(getCursor(), mi.getCoordinates().replace(), actual, expected);
7272
}
@@ -75,15 +75,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
7575
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isEqualTo(#{any()});")
7676
.staticImports(ASSERTJ + ".assertThat")
7777
.imports("java.util.function.Supplier")
78-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
78+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7979
.build()
8080
.apply(getCursor(), mi.getCoordinates().replace(), actual, message, expected);
8181
}
8282
if (args.size() == 3) {
8383
maybeAddImport(ASSERTJ, "within", false);
8484
return JavaTemplate.builder("assertThat(#{any()}).isCloseTo(#{any()}, within(#{any()}));")
8585
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
86-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
86+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
8787
.build()
8888
.apply(getCursor(), mi.getCoordinates().replace(), actual, expected, args.get(2));
8989
}
@@ -95,7 +95,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
9595
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isCloseTo(#{any()}, within(#{any()}));")
9696
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
9797
.imports("java.util.function.Supplier")
98-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
98+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
9999
.build()
100100
.apply(getCursor(), mi.getCoordinates().replace(), actual, message, expected, args.get(2));
101101
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6161
if (args.size() == 1) {
6262
return JavaTemplate.builder("assertThat(#{any(boolean)}).isFalse();")
6363
.staticImports("org.assertj.core.api.Assertions.assertThat")
64-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
64+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
6565
.build()
6666
.apply(getCursor(), mi.getCoordinates().replace(), actual);
6767
}
6868

6969
Expression message = args.get(1);
7070
return JavaTemplate.builder("assertThat(#{any(boolean)}).as(#{any()}).isFalse();")
7171
.staticImports("org.assertj.core.api.Assertions.assertThat")
72-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
72+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7373
.build()
7474
.apply(getCursor(), mi.getCoordinates().replace(), actual, message);
7575
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
5959
if (mi.getArguments().size() == 2) {
6060
return JavaTemplate.builder("assertThat(#{any()}).isInstanceOf(#{any()});")
6161
.staticImports("org.assertj.core.api.Assertions.assertThat")
62-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
62+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
6363
.build()
6464
.apply(getCursor(), method.getCoordinates().replace(), actual, expected);
6565
}
6666

6767
Expression messageOrSupplier = mi.getArguments().get(2);
6868
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isInstanceOf(#{any()});")
6969
.staticImports("org.assertj.core.api.Assertions.assertThat")
70-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
70+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7171
.build()
7272
.apply(getCursor(), method.getCoordinates().replace(), actual, messageOrSupplier, expected);
7373
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6666
if (args.size() == 2) {
6767
return JavaTemplate.builder("assertThat(#{any()}).isNotEqualTo(#{any()});")
6868
.staticImports(ASSERTJ + ".assertThat")
69-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
69+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7070
.build()
7171
.apply(getCursor(), mi.getCoordinates().replace(), actual, expected);
7272
}
7373
if (args.size() == 3 && isFloatingPointType(args.get(2))) {
7474
maybeAddImport(ASSERTJ, "within", false);
7575
return JavaTemplate.builder("assertThat(#{any()}).isNotCloseTo(#{any()}, within(#{any()}));")
7676
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
77-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
77+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7878
.build()
7979
.apply(getCursor(), mi.getCoordinates().replace(), actual, expected, args.get(2));
8080
}
8181
if (args.size() == 3) {
8282
Expression message = args.get(2);
8383
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isNotEqualTo(#{any()});")
8484
.staticImports(ASSERTJ + ".assertThat")
85-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
85+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
8686
.build()
8787
.apply(getCursor(), mi.getCoordinates().replace(), actual, message, expected);
8888
}
@@ -92,7 +92,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
9292
Expression message = args.get(3);
9393
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isNotCloseTo(#{any()}, within(#{any()}));")
9494
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
95-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
95+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
9696
.build()
9797
.apply(getCursor(), method.getCoordinates().replace(), actual, message, expected, args.get(2));
9898
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6161
if (args.size() == 1) {
6262
return JavaTemplate.builder("assertThat(#{any()}).isNotNull();")
6363
.staticImports("org.assertj.core.api.Assertions.assertThat")
64-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
64+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
6565
.build()
6666
.apply(getCursor(), mi.getCoordinates().replace(), actual);
6767

@@ -70,7 +70,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
7070
Expression message = args.get(1);
7171
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isNotNull();")
7272
.staticImports("org.assertj.core.api.Assertions.assertThat")
73-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
73+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7474
.build()
7575
.apply(getCursor(), mi.getCoordinates().replace(), actual, message);
7676
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6161
if (args.size() == 1) {
6262
return JavaTemplate.builder("assertThat(#{any()}).isNull();")
6363
.staticImports("org.assertj.core.api.Assertions.assertThat")
64-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
64+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
6565
.build()
6666
.apply(getCursor(), mi.getCoordinates().replace(), actual);
6767
}
6868

6969
Expression message = args.get(1);
7070
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isNull();")
7171
.staticImports("org.assertj.core.api.Assertions.assertThat")
72-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
72+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7373
.build()
7474
.apply(getCursor(), mi.getCoordinates().replace(), actual, message);
7575
}

‎src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6262
if (args.size() == 2) {
6363
return JavaTemplate.builder("assertThat(#{any()}).isSameAs(#{any()});")
6464
.staticImports("org.assertj.core.api.Assertions.assertThat")
65-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
65+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
6666
.build()
6767
.apply(getCursor(), mi.getCoordinates().replace(), actual, expected);
6868
}
6969

7070
Expression message = args.get(2);
7171
return JavaTemplate.builder("assertThat(#{any()}).as(#{any()}).isSameAs(#{any()});")
7272
.staticImports("org.assertj.core.api.Assertions.assertThat")
73-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
73+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
7474
.build()
7575
.apply(getCursor(), mi.getCoordinates().replace(), actual, message, expected);
7676
}

0 commit comments

Comments
 (0)