Skip to content

Commit 89e1355

Browse files
timtebeekTeamModerne
timtebeek
and
TeamModerne
committed
refactor: OpenRewrite recipe best practices
Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/XX1hrwagC?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne <[email protected]>
1 parent 823b454 commit 89e1355

14 files changed

+106
-68
lines changed

‎src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
4040
return new JavaIsoVisitor<ExecutionContext>() {
4141

4242
@Override
43-
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
44-
J.MethodInvocation mi = super.visitMethodInvocation(method, executionContext);
43+
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
44+
J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
4545
MethodMatcher junit5Matcher = new MethodMatcher("org.junit.jupiter.api.Assertions assertTrue(boolean, ..)");
4646
MethodMatcher junit4Matcher = new MethodMatcher("org.junit.Assert assertTrue(.., boolean)");
4747

@@ -90,7 +90,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
9090

9191
JavaTemplate template = JavaTemplate
9292
.builder("assertInstanceOf(#{}.class, #{any(java.lang.Object)}" + (reason != null ? ", #{any(java.lang.String)})" : ")"))
93-
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(executionContext, "junit-jupiter-api-5.9", "junit-4.13"))
93+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api-5.9", "junit-4.13"))
9494
.staticImports("org.junit.jupiter.api.Assertions.assertInstanceOf")
9595
.build();
9696

‎src/main/java/org/openrewrite/java/testing/testcontainers/ExplicitContainerImage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
6464
final MethodMatcher methodMatcher = new MethodMatcher(containerClass + " <constructor>()");
6565
return Preconditions.check(new UsesMethod<>(methodMatcher), new JavaIsoVisitor<ExecutionContext>() {
6666
@Override
67-
public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext executionContext) {
68-
J.NewClass nc = super.visitNewClass(newClass, executionContext);
67+
public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
68+
J.NewClass nc = super.visitNewClass(newClass, ctx);
6969
if (methodMatcher.matches(newClass)) {
7070
return nc.withArguments(Arrays.asList(getConstructorArgument(newClass)));
7171
}

‎src/test/java/org/openrewrite/java/testing/assertj/MigrateChainedAssertToAssertJTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class Strings {
5555
void stringIsEmptyExample() {
5656
rewriteRun(
5757
//language=java
58-
java("""
58+
java(
59+
"""
5960
import org.junit.jupiter.api.Test;
6061
6162
import static org.assertj.core.api.Assertions.assertThat;

‎src/test/java/org/openrewrite/java/testing/hamcrest/AssertThatBooleanToAssertJTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public void defaults(RecipeSpec spec) {
4141
void assertThatBoolean() {
4242
rewriteRun(
4343
//language=java
44-
java("""
44+
java(
45+
"""
4546
import org.junit.jupiter.api.Test;
4647
4748
import static org.hamcrest.MatcherAssert.assertThat;

‎src/test/java/org/openrewrite/java/testing/hamcrest/HamcrestIsMatcherToAssertJTest.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public void defaults(RecipeSpec spec) {
4040
void isMatcher() {
4141
rewriteRun(
4242
//language=java
43-
java("""
43+
java(
44+
"""
4445
import org.junit.jupiter.api.Test;
4546
import static org.hamcrest.MatcherAssert.assertThat;
4647
import static org.hamcrest.Matchers.is;
@@ -73,7 +74,8 @@ void testEquals() {
7374
void isMatcherWithReason() {
7475
rewriteRun(
7576
//language=java
76-
java("""
77+
java(
78+
"""
7779
import org.junit.jupiter.api.Test;
7880
import static org.hamcrest.MatcherAssert.assertThat;
7981
import static org.hamcrest.Matchers.is;
@@ -109,7 +111,8 @@ void testEquals() {
109111
void isMatcherWithMatcher() {
110112
rewriteRun(
111113
//language=java
112-
java("""
114+
java(
115+
"""
113116
import org.junit.jupiter.api.Test;
114117
import static org.hamcrest.MatcherAssert.assertThat;
115118
import static org.hamcrest.Matchers.is;
@@ -130,7 +133,8 @@ void test() {
130133
void isObjectArray() {
131134
rewriteRun(
132135
//language=java
133-
java("""
136+
java(
137+
"""
134138
import org.junit.jupiter.api.Test;
135139
import static org.hamcrest.MatcherAssert.assertThat;
136140
import static org.hamcrest.Matchers.is;
@@ -163,7 +167,8 @@ void testEquals() {
163167
void isPrimitiveArray() {
164168
rewriteRun(
165169
//language=java
166-
java("""
170+
java(
171+
"""
167172
import org.junit.jupiter.api.Test;
168173
import static org.hamcrest.MatcherAssert.assertThat;
169174
import static org.hamcrest.Matchers.is;

‎src/test/java/org/openrewrite/java/testing/hamcrest/HamcrestMatcherToAssertJTest.java‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ void notMatcher() {
4343
rewriteRun(
4444
spec -> spec.recipe(new HamcrestMatcherToAssertJ("not", "isNotEqualTo")),
4545
//language=java
46-
java("""
46+
java(
47+
"""
4748
import org.junit.jupiter.api.Test;
4849
import static org.hamcrest.MatcherAssert.assertThat;
4950
import static org.hamcrest.Matchers.not;
@@ -65,7 +66,8 @@ void isMatcher() {
6566
rewriteRun(
6667
spec -> spec.recipe(new HamcrestMatcherToAssertJ("is", "isEqualTo")),
6768
//language=java
68-
java("""
69+
java(
70+
"""
6971
import org.junit.jupiter.api.Test;
7072
import static org.hamcrest.MatcherAssert.assertThat;
7173
import static org.hamcrest.Matchers.is;
@@ -87,7 +89,8 @@ void anyOfVarargsMatcher() {
8789
rewriteRun(
8890
spec -> spec.recipe(new HamcrestMatcherToAssertJ("is", "isEqualTo")),
8991
//language=java
90-
java("""
92+
java(
93+
"""
9194
import org.junit.jupiter.api.Test;
9295
import static org.hamcrest.MatcherAssert.assertThat;
9396
import static org.hamcrest.Matchers.anyOf;
@@ -109,7 +112,8 @@ void anyOfIterableMatcher() {
109112
rewriteRun(
110113
spec -> spec.recipe(new HamcrestMatcherToAssertJ("is", "isEqualTo")),
111114
//language=java
112-
java("""
115+
java(
116+
"""
113117
import java.util.List;
114118
import org.junit.jupiter.api.Test;
115119
import static org.hamcrest.MatcherAssert.assertThat;
@@ -135,7 +139,8 @@ void isEmpty() {
135139
rewriteRun(
136140
spec -> spec.recipe(new HamcrestMatcherToAssertJ("isEmptyString", "isEmpty")),
137141
//language=java
138-
java("""
142+
java(
143+
"""
139144
import org.junit.jupiter.api.Test;
140145
141146
import static org.hamcrest.MatcherAssert.assertThat;
@@ -211,7 +216,8 @@ void equalToString() {
211216
rewriteRun(
212217
spec -> spec.recipe(new HamcrestMatcherToAssertJ("equalTo", "isEqualTo")),
213218
//language=java
214-
java("""
219+
java(
220+
"""
215221
import org.junit.jupiter.api.Test;
216222
217223
import static org.hamcrest.MatcherAssert.assertThat;
@@ -248,7 +254,8 @@ void equalToStringLiteral() {
248254
rewriteRun(
249255
spec -> spec.recipe(new HamcrestMatcherToAssertJ("equalTo", "isEqualTo")),
250256
//language=java
251-
java("""
257+
java(
258+
"""
252259
import org.junit.jupiter.api.Test;
253260
254261
import static org.hamcrest.MatcherAssert.assertThat;
@@ -283,7 +290,8 @@ void equalToObject() {
283290
rewriteRun(
284291
spec -> spec.recipe(new HamcrestMatcherToAssertJ("equalTo", "isEqualTo")),
285292
//language=java
286-
java("""
293+
java(
294+
"""
287295
class Biscuit {
288296
String name;
289297
Biscuit(String name) {
@@ -292,7 +300,8 @@ class Biscuit {
292300
}
293301
"""),
294302
//language=java
295-
java("""
303+
java(
304+
"""
296305
import org.junit.jupiter.api.Test;
297306
298307
import static org.hamcrest.MatcherAssert.assertThat;
@@ -329,7 +338,8 @@ void lessThanNumber() {
329338
rewriteRun(
330339
spec -> spec.recipe(new HamcrestMatcherToAssertJ("lessThan", "isLessThan")),
331340
//language=java
332-
java("""
341+
java(
342+
"""
333343
import org.junit.jupiter.api.Test;
334344
335345
import static org.hamcrest.MatcherAssert.assertThat;
@@ -367,7 +377,8 @@ void containsInAnyOrderWithArray() {
367377
rewriteRun(
368378
spec -> spec.recipe(new HamcrestMatcherToAssertJ("containsInAnyOrder", "containsExactlyInAnyOrder")),
369379
//language=java
370-
java("""
380+
java(
381+
"""
371382
import org.junit.jupiter.api.Test;
372383
373384
import java.util.ArrayList;
@@ -409,7 +420,8 @@ void closeToTest() {
409420
rewriteRun(
410421
spec -> spec.recipe(new HamcrestMatcherToAssertJ("closeTo", "isCloseTo")),
411422
//language=java
412-
java("""
423+
java(
424+
"""
413425
import org.junit.jupiter.api.Test;
414426
415427
import static org.hamcrest.MatcherAssert.assertThat;
@@ -443,7 +455,8 @@ void closeToWorksWithBigDecimal() {
443455
rewriteRun(
444456
spec -> spec.recipe(new HamcrestMatcherToAssertJ("closeTo", "isCloseTo")),
445457
//language=java
446-
java("""
458+
java(
459+
"""
447460
import org.junit.jupiter.api.Test;
448461
import java.math.BigDecimal;
449462
@@ -488,7 +501,8 @@ void reasonAsLiteral() {
488501
rewriteRun(
489502
spec -> spec.recipe(new HamcrestMatcherToAssertJ("equalTo", "isEqualTo")),
490503
//language=java
491-
java("""
504+
java(
505+
"""
492506
import org.junit.jupiter.api.Test;
493507
494508
import static org.hamcrest.MatcherAssert.assertThat;
@@ -525,7 +539,8 @@ void reasonAsMethodCall() {
525539
rewriteRun(
526540
spec -> spec.recipe(new HamcrestMatcherToAssertJ("equalTo", "isEqualTo")),
527541
//language=java
528-
java("""
542+
java(
543+
"""
529544
import org.junit.jupiter.api.Test;
530545
531546
import static org.hamcrest.MatcherAssert.assertThat;

‎src/test/java/org/openrewrite/java/testing/hamcrest/HamcrestNotMatcherToAssertJTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ void notMatcher() {
4141
rewriteRun(
4242
spec -> spec.recipe(new HamcrestNotMatcherToAssertJ("equalTo", "isNotEqualTo")),
4343
//language=java
44-
java("""
44+
java(
45+
"""
4546
import org.junit.jupiter.api.Test;
4647
4748
import static org.hamcrest.MatcherAssert.assertThat;
@@ -77,7 +78,8 @@ void notMatcherWithReason() {
7778
rewriteRun(
7879
spec -> spec.recipe(new HamcrestNotMatcherToAssertJ("nullValue", "isNotNull")),
7980
//language=java
80-
java("""
81+
java(
82+
"""
8183
import org.junit.jupiter.api.Test;
8284
8385
import static org.hamcrest.MatcherAssert.assertThat;

‎src/test/java/org/openrewrite/java/testing/hamcrest/MigrateHamcrestToAssertJTest.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public void defaults(RecipeSpec spec) {
5858
void isEqualTo() {
5959
//language=java
6060
rewriteRun(
61-
java("""
61+
java(
62+
"""
6263
class Biscuit {
6364
String name;
6465
Biscuit(String name) {
@@ -74,7 +75,8 @@ int getHazelnutCount() {
7475
}
7576
}
7677
"""),
77-
java("""
78+
java(
79+
"""
7880
import org.junit.jupiter.api.Test;
7981
8082
import static org.hamcrest.MatcherAssert.assertThat;
@@ -113,7 +115,8 @@ public void biscuits() {
113115
void allOfStringMatchersAndConvert() {
114116
rewriteRun(
115117
//language=java
116-
java("""
118+
java(
119+
"""
117120
import org.junit.jupiter.api.Test;
118121
119122
import static org.hamcrest.MatcherAssert.assertThat;
@@ -154,7 +157,8 @@ void test() {
154157
void convertAnyOfMatchersAfterSatisfiesAnyOfConversion() {
155158
rewriteRun(
156159
//language=java
157-
java("""
160+
java(
161+
"""
158162
import org.junit.jupiter.api.Test;
159163
160164
import static org.hamcrest.MatcherAssert.assertThat;
@@ -322,7 +326,8 @@ void test() {
322326
String before = template.formatted(importsBefore, "assertThat(%s, %s(%s));".formatted(actual, hamcrestMatcher, matcherArgs));
323327
String after = template.formatted(importsAfter, "assertThat(%s).%s(%s);".formatted(actual, assertJAssertion, matcherArgs));
324328
rewriteRun(
325-
java("""
329+
java(
330+
"""
326331
class Biscuit {
327332
String name;
328333
Biscuit(String name) {

‎src/test/java/org/openrewrite/java/testing/hamcrest/RemoveIsMatcherTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public void defaults(RecipeSpec spec) {
3838
void isMatcher() {
3939
rewriteRun(
4040
//language=java
41-
java("""
41+
java(
42+
"""
4243
import org.junit.jupiter.api.Test;
4344
import static org.hamcrest.MatcherAssert.assertThat;
4445
import static org.hamcrest.Matchers.is;

‎src/test/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterizedTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,8 @@ public void testI2(String path) {
527527
void parameterizedTestWithEmptyConstructor() {
528528
rewriteRun(
529529
//language=java
530-
java("""
530+
java(
531+
"""
531532
import java.util.Arrays;
532533
import java.util.Collection;
533534
import org.junit.runners.Parameterized;

0 commit comments

Comments
 (0)