Skip to content

Commit f4de24f

Browse files
committed
Fix ParameterizedRunnerToParameterized tests
1 parent 9968be8 commit f4de24f

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public ParameterizedRunnerToParameterizedTestsVisitor(J.ClassDeclaration scope,
172172

173173
// build @ParameterizedTest(#{}) template
174174
String parameterizedTestAnnotationTemplate = parameterizedTestAnnotationParameters != null ?
175-
"@ParameterizedTest(" + parameterizedTestAnnotationParameters.get(0).print(getCursor()) + ")" :
175+
"@ParameterizedTest(" + parameterizedTestAnnotationParameters.get(0).print() + ")" :
176176
"@ParameterizedTest";
177177

178178
this.parameterizedTestTemplate = JavaTemplate.builder(this::getCursor, parameterizedTestAnnotationTemplate)
@@ -198,9 +198,9 @@ public ParameterizedRunnerToParameterizedTestsVisitor(J.ClassDeclaration scope,
198198
J.VariableDeclarations vd = (J.VariableDeclarations) parameterizedTestMethodParameter;
199199
if (vd.getTypeExpression() != null && vd.getVariables().size() == 1) {
200200
initStatementParams.add(vd.getVariables().get(0).getSimpleName());
201-
initMethodTemplate.append(parameterizedTestMethodParameter.print(getCursor())).append(", ");
201+
initMethodTemplate.append(parameterizedTestMethodParameter.print()).append(", ");
202202
} else {
203-
throw new AssertionError("Expected VariableDeclarations with TypeExpression and single Variable, got [" + parameterizedTestMethodParameter.print(getCursor()) + "]");
203+
throw new AssertionError("Expected VariableDeclarations with TypeExpression and single Variable, got [" + parameterizedTestMethodParameter.print() + "]");
204204
}
205205
}
206206
initMethodTemplate.replace(initMethodTemplate.length() - 2, initMethodTemplate.length(), ") {\n");

src/test/kotlin/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterizedTest.kt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,33 @@ import org.openrewrite.java.JavaRecipeTest
2424
class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
2525
override val parser: JavaParser = JavaParser.fromJavaVersion()
2626
.classpath("junit")
27+
.logCompilationWarningsAndErrors(true)
2728
.build()
2829

2930
override val recipe: Recipe
3031
get() = ParameterizedRunnerToParameterized()
3132

3233
@Test
3334
fun parametersNameHasParameters() = assertChanged(
35+
dependsOn = arrayOf("""
36+
package abc;
37+
public class Vet {
38+
private Integer id;
39+
private String firstName;
40+
private String lastName;
41+
public void setId(Integer id) {
42+
this.id = id;
43+
}
44+
public void setFirstName(String firstName) {
45+
this.firstName = firstName;
46+
}
47+
public void setLastName(String lastName) {
48+
this.lastName = lastName;
49+
}
50+
}
51+
"""),
3452
before = """
53+
package abc;
3554
import org.junit.Test;
3655
import org.junit.runner.RunWith;
3756
import org.junit.runners.*;
@@ -70,6 +89,7 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
7089
}
7190
""",
7291
after = """
92+
package abc;
7393
import org.junit.jupiter.params.ParameterizedTest;
7494
import org.junit.jupiter.params.provider.MethodSource;
7595
@@ -333,6 +353,8 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
333353
fun nestedRunners() = assertChanged(
334354
before = """
335355
import java.util.Collection;
356+
import java.util.ArrayList;
357+
import java.util.List;
336358
import org.junit.Assert;
337359
import org.junit.BeforeClass;
338360
import org.junit.Test;
@@ -395,6 +417,8 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
395417
""",
396418
after = """
397419
import java.util.Collection;
420+
import java.util.ArrayList;
421+
import java.util.List;
398422
import org.junit.Assert;
399423
import org.junit.BeforeClass;
400424
import org.junit.Test;

0 commit comments

Comments
 (0)