Skip to content

Commit b5a9926

Browse files
jkschneiderTeamModerne
jkschneider
and
TeamModerne
committed
refactor: Use a standard name for ExecutionContext
Co-authored-by: Moderne <[email protected]>
1 parent f1daedd commit b5a9926

23 files changed

+97
-97
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private static class UnqualifiedMethodInvocations extends JavaIsoVisitor<Executi
129129
private static final MethodMatcher ASSERTJ_FAIL_MATCHER = new MethodMatcher("org.assertj.core.api.Assertions" + " fail(..)");
130130

131131
@Override
132-
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
132+
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
133133
if (!ASSERTJ_FAIL_MATCHER.matches(method)) {
134134
return method;
135135
}
@@ -147,14 +147,14 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
147147
method = method.withTemplate(JavaTemplate.builder(this::getCursor, templateBuilder.toString())
148148
.staticImports("org.assertj.core.api.Assertions" + ".fail")
149149
.javaParser(() -> JavaParser.fromJavaVersion()
150-
.classpathFromResources(executionContext, "assertj-core-3.24.2")
150+
.classpathFromResources(ctx, "assertj-core-3.24.2")
151151
.build())
152152
.build(),
153153
method.getCoordinates().replace(),
154154
arguments.toArray()
155155
);
156156
maybeAddImport("org.assertj.core.api.Assertions", "fail");
157-
return super.visitMethodInvocation(method, executionContext);
157+
return super.visitMethodInvocation(method, ctx);
158158
}
159159
}
160160
}

‎src/main/java/org/openrewrite/java/testing/cleanup/AssertionsArgumentOrder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class AssertionsArgumentOrder extends Recipe {
5050
protected @Nullable TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
5151
return new JavaIsoVisitor<ExecutionContext>() {
5252
@Override
53-
public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
53+
public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ctx) {
5454
for (MethodMatcher jupiterAssertionMatcher : jupiterAssertionMatchers) {
5555
doAfterVisit(new UsesMethod<>(jupiterAssertionMatcher));
5656
}
@@ -92,8 +92,8 @@ private static class AssertionsArgumentOrderVisitor extends JavaIsoVisitor<Execu
9292
};
9393

9494
@Override
95-
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
96-
J.MethodInvocation mi = super.visitMethodInvocation(method, executionContext);
95+
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
96+
J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
9797

9898
final Expression expected;
9999
final Expression actual;
@@ -115,7 +115,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
115115
return actual;
116116
}
117117
return arg;
118-
})), executionContext, getCursor().getParentOrThrow());
118+
})), ctx, getCursor().getParentOrThrow());
119119
}
120120
return mi;
121121
}

‎src/main/java/org/openrewrite/java/testing/cleanup/RemoveEmptyTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Set<String> getTags() {
5656
protected @Nullable TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
5757
return new JavaIsoVisitor<ExecutionContext>() {
5858
@Override
59-
public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
59+
public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ctx) {
6060
doAfterVisit(new FindEmptyMethods(false));
6161
return cu;
6262
}
@@ -67,12 +67,12 @@ public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ex
6767
protected TreeVisitor<?, ExecutionContext> getVisitor() {
6868
return new JavaVisitor<ExecutionContext>() {
6969
@Override
70-
public J visitMethodDeclaration(MethodDeclaration method, ExecutionContext executionContext) {
70+
public J visitMethodDeclaration(MethodDeclaration method, ExecutionContext ctx) {
7171
if (hasTestAnnotation(method) && isEmptyMethod(method)) {
7272
//noinspection ConstantConditions
7373
return null;
7474
}
75-
return super.visitMethodDeclaration(method, executionContext);
75+
return super.visitMethodDeclaration(method, ctx);
7676
}
7777

7878
private boolean hasTestAnnotation(J.MethodDeclaration method) {

‎src/main/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefix.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public String getDescription() {
5757
protected @Nullable TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
5858
return new JavaVisitor<ExecutionContext>() {
5959
@Override
60-
public J visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
60+
public J visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ctx) {
6161
doAfterVisit(new UsesType<>("org.junit.jupiter.api.Test", false));
6262
doAfterVisit(new UsesType<>("org.junit.jupiter.api.TestTemplate", false));
6363
doAfterVisit(new UsesType<>("org.junit.jupiter.api.RepeatedTest", false));
@@ -81,8 +81,8 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
8181
private static class RemoveTestPrefixVisitor extends JavaIsoVisitor<ExecutionContext> {
8282
@Override
8383
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method,
84-
ExecutionContext executionContext) {
85-
J.MethodDeclaration m = super.visitMethodDeclaration(method, executionContext);
84+
ExecutionContext ctx) {
85+
J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
8686

8787
// Quickly reject invalid methods
8888
String simpleName = method.getSimpleName();

‎src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ private TestsNotPublicVisitor(Boolean orProtected) {
8585
}
8686

8787
@Override
88-
public ClassDeclaration visitClassDeclaration(ClassDeclaration classDecl, ExecutionContext executionContext) {
89-
ClassDeclaration c = super.visitClassDeclaration(classDecl, executionContext);
88+
public ClassDeclaration visitClassDeclaration(ClassDeclaration classDecl, ExecutionContext ctx) {
89+
ClassDeclaration c = super.visitClassDeclaration(classDecl, ctx);
9090

9191
if (c.getKind() != ClassDeclaration.Kind.Type.Interface
9292
&& c.getModifiers().stream().anyMatch(mod -> mod.getType() == J.Modifier.Type.Public)
@@ -129,15 +129,15 @@ public ClassDeclaration visitClassDeclaration(ClassDeclaration classDecl, Execut
129129
if (!modifierComments.isEmpty()) {
130130
c = c.withComments(ListUtils.concatAll(c.getComments(), modifierComments));
131131
}
132-
c = maybeAutoFormat(c, c.withModifiers(modifiers), c.getName(), executionContext, getCursor().getParentTreeCursor());
132+
c = maybeAutoFormat(c, c.withModifiers(modifiers), c.getName(), ctx, getCursor().getParentTreeCursor());
133133
}
134134
}
135135
return c;
136136
}
137137

138138
@Override
139-
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
140-
J.MethodDeclaration m = super.visitMethodDeclaration(method, executionContext);
139+
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
140+
J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
141141

142142
if (method.getMethodType() == null ||
143143
method.getMethodType().getDeclaringType().hasFlags(Flag.Abstract, Flag.Public)) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public String getDescription() {
5959
protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
6060
return new JavaVisitor<ExecutionContext>() {
6161
@Override
62-
public J visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
62+
public J visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ctx) {
6363
TEST_ANNOTATIONS.forEach(ann -> doAfterVisit(new UsesType<>(ann, false)));
6464
return cu;
6565
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public static class AssertToAssertionsVisitor extends JavaIsoVisitor<ExecutionCo
6262
"assertNull", "assertSame", "assertThrows", "assertTrue", "fail");
6363

6464
@Override
65-
public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
66-
JavaSourceFile c = super.visitJavaSourceFile(cu, executionContext);
65+
public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ctx) {
66+
JavaSourceFile c = super.visitJavaSourceFile(cu, ctx);
6767

6868
boolean hasWildcardAssertImport = false;
6969
for (J.Import imp : cu.getImports()) {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
100100
}
101101

102102
@Override
103-
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
104-
J.MethodDeclaration m = super.visitMethodDeclaration(method, executionContext);
103+
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
104+
J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
105105
Cursor classDeclCursor = getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance);
106106
// methods having names starting with parametersFor... are init methods
107107
if (m.getSimpleName().startsWith(PARAMETERS_FOR_PREFIX)) {
@@ -111,8 +111,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
111111
}
112112

113113
@Override
114-
public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext executionContext) {
115-
J.Annotation anno = super.visitAnnotation(annotation, executionContext);
114+
public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) {
115+
J.Annotation anno = super.visitAnnotation(annotation, ctx);
116116
Cursor classDeclCursor = getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance);
117117
if (PARAMETERS_MATCHER.matches(anno)) {
118118
String annotationArgumentValue = getAnnotationArgumentForInitMethod(anno, "method", "named");
@@ -232,8 +232,8 @@ public ParametersNoArgsImplicitMethodSource(Set<String> initMethods, Map<String,
232232

233233
@SuppressWarnings("SpellCheckingInspection")
234234
@Override
235-
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) {
236-
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, executionContext);
235+
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
236+
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
237237
// Remove @RunWith(JUnitParamsRunner.class) annotation
238238
doAfterVisit(new RemoveAnnotationVisitor(RUN_WITH_JUNIT_PARAMS_ANNOTATION_MATCHER));
239239

@@ -251,11 +251,11 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
251251
}
252252

253253
@Override
254-
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
254+
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
255255
if (unsupportedConversions.contains(method.getSimpleName())) {
256256
return method;
257257
}
258-
J.MethodDeclaration m = super.visitMethodDeclaration(method, executionContext);
258+
J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
259259
final String paramTestName = initMethodReferences.get(m.getSimpleName());
260260

261261
m = m.withLeadingAnnotations(ListUtils.map(m.getLeadingAnnotations(), anno -> {
@@ -271,7 +271,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
271271
if (initMethods.contains(m.getSimpleName()) || initMethodReferences.containsValue(m.getSimpleName())) {
272272
if (m.getModifiers().stream().noneMatch(it -> J.Modifier.Type.Static.equals(it.getType()))) {
273273
J.Modifier staticModifier = new J.Modifier(UUID.randomUUID(), Space.format(" "), Markers.EMPTY, J.Modifier.Type.Static, new ArrayList<>());
274-
m = maybeAutoFormat(m, m.withModifiers(ListUtils.concat(m.getModifiers(), staticModifier)), executionContext, getCursor().getParentTreeCursor());
274+
m = maybeAutoFormat(m, m.withModifiers(ListUtils.concat(m.getModifiers(), staticModifier)), ctx, getCursor().getParentTreeCursor());
275275
}
276276
}
277277
return m;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public String getDescription() {
5555
protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
5656
return new JavaVisitor<ExecutionContext>() {
5757
@Override
58-
public J visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
58+
public J visitJavaSourceFile(JavaSourceFile cu, ExecutionContext ctx) {
5959
ANNOTATION_TYPES.forEach(ann -> doAfterVisit(new UsesType<>(ann, false)));
6060
return cu;
6161
}
@@ -71,16 +71,16 @@ private static class LifecycleNonPrivateVisitor extends JavaIsoVisitor<Execution
7171
final List<AnnotationMatcher> lifeCycleAnnotationMatchers = ANNOTATION_TYPES.stream()
7272
.map(annoFqn -> "@" + annoFqn).map(AnnotationMatcher::new).collect(Collectors.toList());
7373
@Override
74-
public J.MethodDeclaration visitMethodDeclaration(MethodDeclaration method, ExecutionContext p) {
75-
J.MethodDeclaration md = super.visitMethodDeclaration(method, p);
74+
public J.MethodDeclaration visitMethodDeclaration(MethodDeclaration method, ExecutionContext ctx) {
75+
J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx);
7676

7777
if (J.Modifier.hasModifier(md.getModifiers(), Type.Private)
7878
&& md.getLeadingAnnotations().stream().anyMatch(ann -> lifeCycleAnnotationMatchers.stream()
7979
.anyMatch(matcher -> matcher.matches(ann)))) {
8080
return maybeAutoFormat(md,
8181
md.withModifiers(ListUtils.map(md.getModifiers(),
8282
modifier -> modifier.getType() == Type.Private ? null : modifier)),
83-
p, getCursor().getParentOrThrow());
83+
ctx, getCursor().getParentOrThrow());
8484
}
8585
return md;
8686
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Duration getEstimatedEffortPerOccurrence() {
6969
protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
7070
return new JavaIsoVisitor<ExecutionContext>() {
7171
@Override
72-
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext executionContext) {
72+
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
7373
for (J.ClassDeclaration clazz : cu.getClasses()) {
7474
if (TypeUtils.isAssignableTo(JavaType.ShallowClass.build("junit.framework.TestCase"), clazz.getType())) {
7575
return SearchResult.found(cu);
@@ -87,8 +87,8 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
8787
protected TreeVisitor<?, ExecutionContext> getVisitor() {
8888
return new JavaIsoVisitor<ExecutionContext>() {
8989
@Override
90-
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext executionContext) {
91-
J.CompilationUnit c = super.visitCompilationUnit(cu, executionContext);
90+
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
91+
J.CompilationUnit c = super.visitCompilationUnit(cu, ctx);
9292
doAfterVisit(new TestCaseVisitor());
9393
// ChangeType for org.junit.Assert method invocations because TestCase extends org.junit.Assert
9494
doAfterVisit(new ChangeType("junit.framework.TestCase", "org.junit.Assert", true));
@@ -101,8 +101,8 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
101101

102102
@SuppressWarnings("ConstantConditions")
103103
@Override
104-
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
105-
J.MethodInvocation mi = super.visitMethodInvocation(method, executionContext);
104+
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
105+
J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
106106
if ((mi.getSelect() != null && TypeUtils.isOfClassType(mi.getSelect().getType(), "junit.framework.TestCase"))
107107
|| (mi.getMethodType() != null && TypeUtils.isOfClassType(mi.getMethodType().getDeclaringType(), "junit.framework.TestCase"))) {
108108
String name = mi.getSimpleName();
@@ -122,11 +122,11 @@ private static class TestCaseVisitor extends JavaIsoVisitor<ExecutionContext> {
122122
private static final AnnotationMatcher OVERRIDE_ANNOTATION_MATCHER = new AnnotationMatcher("@java.lang.Override");
123123

124124
@Override
125-
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) {
125+
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
126126
if (!isSupertypeTestCase(classDecl.getType())) {
127127
return classDecl;
128128
}
129-
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, executionContext);
129+
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
130130
if (cd.getExtends() != null && cd.getExtends().getType() != null) {
131131
JavaType.FullyQualified fullQualifiedExtension = TypeUtils.asFullyQualified(cd.getExtends().getType());
132132
if (fullQualifiedExtension != null && "junit.framework.TestCase".equals(fullQualifiedExtension.getFullyQualifiedName())) {

0 commit comments

Comments
 (0)