diff --git a/src/main/resources/META-INF/rewrite/junit5.yml b/src/main/resources/META-INF/rewrite/junit5.yml index 1c884fbc9..cefd2bf66 100755 --- a/src/main/resources/META-INF/rewrite/junit5.yml +++ b/src/main/resources/META-INF/rewrite/junit5.yml @@ -314,7 +314,7 @@ recipeList: acceptTransitive: true scope: test - org.openrewrite.java.ChangeMethodName: - methodPattern: "mockwebserver3.MockWebServer shutdown()" + methodPattern: "okhttp3.mockwebserver.MockWebServer shutdown()" newMethodName: close - org.openrewrite.java.testing.junit5.UpdateMockWebServerMockResponse --- diff --git a/src/test/java/org/openrewrite/java/testing/junit5/UpgradeOkHttpMockWebServerTest.java b/src/test/java/org/openrewrite/java/testing/junit5/UpgradeOkHttpMockWebServerTest.java index ea39b0507..d171d592a 100644 --- a/src/test/java/org/openrewrite/java/testing/junit5/UpgradeOkHttpMockWebServerTest.java +++ b/src/test/java/org/openrewrite/java/testing/junit5/UpgradeOkHttpMockWebServerTest.java @@ -126,4 +126,73 @@ class ApiTest { ) ); } + + @Test + void shouldRenameShutdownToCloseAlongWithPackageChange() { + rewriteRun( + spec -> spec + .recipeFromResource( + "/META-INF/rewrite/junit5.yml", + "org.openrewrite.java.testing.junit5.UpgradeOkHttpMockWebServer") + .parser(JavaParser.fromJavaVersion() + .classpathFromResources(new InMemoryExecutionContext(), + "mockwebserver-4.10", + "okhttp-4.10", + "okio-jvm-3.12", + "junit-4" + )), + mavenProject("project", + //language=xml + pomXml( + """ + + 4.0.0 + com.example + demo + 0.0.1-SNAPSHOT + + + com.squareup.okhttp3 + mockwebserver + 4.10.0 + test + + + + """, + spec -> spec.after(pom -> + assertThat(pom) + .doesNotContain("mockwebserver") + .contains("mockwebserver3") + .actual() + ) + ), + srcTestJava( + //language=java + java( + """ + import okhttp3.mockwebserver.MockWebServer; + + class ApiTest { + MockWebServer server = new MockWebServer(); + void stop() { + server.shutdown(); + } + } + """, + """ + import mockwebserver3.MockWebServer; + + class ApiTest { + MockWebServer server = new MockWebServer(); + void stop() { + server.close(); + } + } + """ + ) + ) + ) + ); + } }