diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java b/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java index fdf1e2695..4e1dffde9 100644 --- a/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java +++ b/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java @@ -102,7 +102,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu JavaTemplate template = JavaTemplate .builder("assertInstanceOf(#{any(java.lang.Class)}, #{any(java.lang.Object)}" + (reason != null ? ", #{any(java.lang.String)})" : ")")) - .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api-5", "junit-4")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api-5")) .staticImports("org.junit.jupiter.api.Assertions.assertInstanceOf") .build(); diff --git a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java index ae8a11053..0e307bca3 100644 --- a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java +++ b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java @@ -271,7 +271,6 @@ private J.Annotation maybeReplaceTestAnnotation(Cursor anno, @Nullable String pa .javaParser(JavaParser.fromJavaVersion() .classpathFromResources(ctx, "junit-jupiter-api-5", - "hamcrest-3", "junit-jupiter-params-5")) .imports("org.junit.jupiter.params.ParameterizedTest").build() .apply(anno, ((J.Annotation) anno.getValue()).getCoordinates().replace()); @@ -280,7 +279,6 @@ private J.Annotation maybeReplaceTestAnnotation(Cursor anno, @Nullable String pa .javaParser(JavaParser.fromJavaVersion() .classpathFromResources(ctx, "junit-jupiter-api-5", - "hamcrest-3", "junit-jupiter-params-5")) .imports("org.junit.jupiter.params.ParameterizedTest").build() .apply(anno, ((J.Annotation) anno.getValue()).getCoordinates().replace(), @@ -296,7 +294,6 @@ private J.Annotation maybeReplaceParametersAnnotation(Cursor anno, String method .javaParser(JavaParser.fromJavaVersion() .classpathFromResources(ctx, "junit-jupiter-api-5", - "hamcrest-3", "junit-jupiter-params-5")) .imports("org.junit.jupiter.params.provider.MethodSource").build(); if (initMethods.contains(initMethodName)) { diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TimeoutRuleToClassAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/TimeoutRuleToClassAnnotation.java index 448dc71a0..27fa27a4b 100644 --- a/src/main/java/org/openrewrite/java/testing/junit5/TimeoutRuleToClassAnnotation.java +++ b/src/main/java/org/openrewrite/java/testing/junit5/TimeoutRuleToClassAnnotation.java @@ -108,7 +108,7 @@ private J.ClassDeclaration insertTimeoutAnnotation(Expression ex, J.ClassDeclara maybeAddImport("java.util.concurrent.TimeUnit"); return JavaTemplate.builder(template) .javaParser(JavaParser.fromJavaVersion() - .classpathFromResources(ctx, "junit-jupiter-api-5", "hamcrest-3")) + .classpathFromResources(ctx, "junit-jupiter-api-5")) .imports("org.junit.jupiter.api.Timeout", "java.util.concurrent.TimeUnit") .build() diff --git a/src/main/resources/META-INF/rewrite/assertj.yml b/src/main/resources/META-INF/rewrite/assertj.yml index da00f4968..0c60b4a62 100644 --- a/src/main/resources/META-INF/rewrite/assertj.yml +++ b/src/main/resources/META-INF/rewrite/assertj.yml @@ -15,12 +15,10 @@ # --- - type: specs.openrewrite.org/v1beta/recipe name: org.openrewrite.java.testing.assertj.Assertj displayName: AssertJ best practices description: Migrates JUnit asserts to AssertJ and applies best practices to assertions. - preconditions: - org.openrewrite.Singleton tags: @@ -593,8 +591,8 @@ recipeList: oldPackageName: org.fest.assertions.data newPackageName: org.assertj.core.data - org.openrewrite.java.dependencies.ChangeDependency: - oldGroupId: org.easytesting - oldArtifactId: fest-assert-core - newGroupId: org.assertj - newArtifactId: assertj-core - newVersion: 3.x + oldGroupId: org.easytesting + oldArtifactId: fest-assert-core + newGroupId: org.assertj + newArtifactId: assertj-core + newVersion: 3.x diff --git a/src/main/resources/META-INF/rewrite/dbrider.yml b/src/main/resources/META-INF/rewrite/dbrider.yml index e55caccd0..6151893cb 100644 --- a/src/main/resources/META-INF/rewrite/dbrider.yml +++ b/src/main/resources/META-INF/rewrite/dbrider.yml @@ -32,4 +32,3 @@ recipeList: oldArtifactId: rider-spring newArtifactId: rider-junit5 newVersion: 1.x ---- diff --git a/src/main/resources/META-INF/rewrite/junit6.yml b/src/main/resources/META-INF/rewrite/junit6.yml index 22237ffcd..28a8bc65e 100755 --- a/src/main/resources/META-INF/rewrite/junit6.yml +++ b/src/main/resources/META-INF/rewrite/junit6.yml @@ -106,7 +106,6 @@ recipeList: - org.openrewrite.java.ChangeMethodName: methodPattern: org.junit.platform.testkit.engine.Executions started() newMethodName: finished - matchOverrides: false ignoreDefinition: true - org.openrewrite.properties.DeleteProperty: propertyKey: junit.jupiter.tempdir.scope diff --git a/src/test/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBooleanTest.java b/src/test/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBooleanTest.java index 3e61b9a4f..4fc78a8c1 100644 --- a/src/test/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBooleanTest.java +++ b/src/test/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBooleanTest.java @@ -110,7 +110,6 @@ void test() { @Test void assertTrueWithNonBoolean() { rewriteRun( - spec -> spec.recipe(new AssertEqualsBooleanToAssertBoolean()), // language=java java( """ diff --git a/src/test/java/org/openrewrite/java/testing/junit5/AddJupiterDependenciesTest.java b/src/test/java/org/openrewrite/java/testing/junit5/AddJupiterDependenciesTest.java index d23197812..cb1e879a8 100644 --- a/src/test/java/org/openrewrite/java/testing/junit5/AddJupiterDependenciesTest.java +++ b/src/test/java/org/openrewrite/java/testing/junit5/AddJupiterDependenciesTest.java @@ -44,7 +44,7 @@ void bar() { @Override public void defaults(RecipeSpec spec) { spec.recipe(new AddJupiterDependencies()) - .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api-5")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/testing/junit5/MockitoRuleDependencyTest.java b/src/test/java/org/openrewrite/java/testing/junit5/AddMockitoJupiterForRulesTest.java similarity index 99% rename from src/test/java/org/openrewrite/java/testing/junit5/MockitoRuleDependencyTest.java rename to src/test/java/org/openrewrite/java/testing/junit5/AddMockitoJupiterForRulesTest.java index e15c73c08..4c1826229 100644 --- a/src/test/java/org/openrewrite/java/testing/junit5/MockitoRuleDependencyTest.java +++ b/src/test/java/org/openrewrite/java/testing/junit5/AddMockitoJupiterForRulesTest.java @@ -26,7 +26,7 @@ import static org.openrewrite.java.Assertions.*; import static org.openrewrite.maven.Assertions.pomXml; -class MockitoRuleDependencyTest implements RewriteTest { +class AddMockitoJupiterForRulesTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.recipeFromResources("org.openrewrite.java.testing.junit5.UseMockitoExtension") diff --git a/src/test/java/org/openrewrite/java/testing/mockito/MockitoBestPracticesTest.java b/src/test/java/org/openrewrite/java/testing/mockito/MockitoBestPracticesTest.java index 095b11928..ed80da04c 100644 --- a/src/test/java/org/openrewrite/java/testing/mockito/MockitoBestPracticesTest.java +++ b/src/test/java/org/openrewrite/java/testing/mockito/MockitoBestPracticesTest.java @@ -38,7 +38,7 @@ public void defaults(RecipeSpec spec) { "junit-jupiter-api", "mockito-core", "mockito-junit-jupiter")) - .recipeFromResources("org.openrewrite.java.testing.mockito.Mockito1to5Migration"); + .recipeFromResources("org.openrewrite.java.testing.mockito.MockitoBestPractices"); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/testing/testcontainers/AddTestcontainersAnnotationsTest.java b/src/test/java/org/openrewrite/java/testing/testcontainers/AddTestcontainersAnnotationsTest.java index 8157325a5..a7fe8ce0c 100644 --- a/src/test/java/org/openrewrite/java/testing/testcontainers/AddTestcontainersAnnotationsTest.java +++ b/src/test/java/org/openrewrite/java/testing/testcontainers/AddTestcontainersAnnotationsTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.testcontainers; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; @@ -189,63 +190,6 @@ class MyTest { ); } - @Test - void ignoresNonGenericContainerRule() { - rewriteRun( - // language=java - java( - // before - """ - import org.junit.Rule; - import org.junit.rules.TemporaryFolder; - - class MyTest { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); - } - """ - ) - ); - } - - @Test - void ignoresNonRuleGenericContainer() { - rewriteRun( - java( - // language=java - """ - import org.testcontainers.containers.GenericContainer; - - class MyTest { - public static GenericContainer c_stat = new GenericContainer<>("redis:latest"); - public GenericContainer c = new GenericContainer<>("redis:latest"); - } - """ - ) - ); - } - - @Test - void isIdempotentForAlreadyMigratedClasses() { - rewriteRun( - // language=java - java( - // before - """ - import org.testcontainers.containers.GenericContainer; - import org.testcontainers.junit.jupiter.Container; - import org.testcontainers.junit.jupiter.Testcontainers; - - @Testcontainers - class MyTest { - @Container - public GenericContainer myContainer = new GenericContainer<>("redis:latest"); - } - """ - ) - ); - } - @Test void handlesPartiallyMigratedClass() { rewriteRun( @@ -346,4 +290,64 @@ class MyInnerClass { ) ); } + + @Nested + class NoChange { + @Test + void ignoresNonGenericContainerRule() { + rewriteRun( + // language=java + java( + // before + """ + import org.junit.Rule; + import org.junit.rules.TemporaryFolder; + + class MyTest { + @Rule + public TemporaryFolder tempFolder = new TemporaryFolder(); + } + """ + ) + ); + } + + @Test + void ignoresNonRuleGenericContainer() { + rewriteRun( + java( + // language=java + """ + import org.testcontainers.containers.GenericContainer; + + class MyTest { + public static GenericContainer c_stat = new GenericContainer<>("redis:latest"); + public GenericContainer c = new GenericContainer<>("redis:latest"); + } + """ + ) + ); + } + + @Test + void isIdempotentForAlreadyMigratedClasses() { + rewriteRun( + // language=java + java( + // before + """ + import org.testcontainers.containers.GenericContainer; + import org.testcontainers.junit.jupiter.Container; + import org.testcontainers.junit.jupiter.Testcontainers; + + @Testcontainers + class MyTest { + @Container + public GenericContainer myContainer = new GenericContainer<>("redis:latest"); + } + """ + ) + ); + } + } } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsDeepToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsDeepToAssertThatTest.java index 2a353decd..d37ff29be 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsDeepToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsDeepToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertEqualsDeepToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertEqualsDeepToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsNoOrderToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsNoOrderToAssertThatTest.java index 40c8c389c..856584a74 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsNoOrderToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsNoOrderToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertEqualsNoOrderToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertEqualsNoOrderToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThatTest.java index e80fd337a..d1712b7c4 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertEqualsToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertEqualsToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertListToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertListToAssertThatTest.java index e2246ed8f..cd347f626 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertListToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertListToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertListToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertListToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertNotSameToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertNotSameToAssertThatTest.java index b432c7bea..4f40de41b 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertNotSameToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertNotSameToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertNotSameToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertNotSameToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertSameToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertSameToAssertThatTest.java index ba7507561..4af149c91 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertSameToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertSameToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertSameToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertSameToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertThrowsToAssertThatTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertThrowsToAssertThatTest.java index 092dafc16..927113642 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertThrowsToAssertThatTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertThrowsToAssertThatTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertThrowsToAssertThatTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertThrowsToAssertThat()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertionToAssertJTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertionToAssertJTest.java index d949b6dad..07d74b872 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertionToAssertJTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgAssertionToAssertJTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgAssertionToAssertJTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipe(new TestNgAssertionToAssertJ()); } diff --git a/src/test/java/org/openrewrite/java/testing/testng/TestNgToAssertJTest.java b/src/test/java/org/openrewrite/java/testing/testng/TestNgToAssertJTest.java index 3adbce94b..0ea3a5a28 100644 --- a/src/test/java/org/openrewrite/java/testing/testng/TestNgToAssertJTest.java +++ b/src/test/java/org/openrewrite/java/testing/testng/TestNgToAssertJTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class TestNgToAssertJTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec - .parser(JavaParser.fromJavaVersion().classpath("testng")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7")) .recipeFromResources("org.openrewrite.java.testing.assertj.Assertj"); } diff --git a/src/test/java/org/openrewrite/java/testing/wiremock/MigrateStubMappingUuidToIdTest.java b/src/test/java/org/openrewrite/java/testing/wiremock/MigrateStubMappingUuidToIdTest.java index 91c19190f..a53dc10c8 100644 --- a/src/test/java/org/openrewrite/java/testing/wiremock/MigrateStubMappingUuidToIdTest.java +++ b/src/test/java/org/openrewrite/java/testing/wiremock/MigrateStubMappingUuidToIdTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.wiremock; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.test.RecipeSpec; @@ -287,84 +288,87 @@ void nestedUuidOutsideAStubMappingIsUntouched() { ); } - @Test - void unrelatedJsonIsUntouched() { - rewriteRun( - //language=json - json( - """ - { - "uuid": "8f4c3b1e-5d2a-4f6b-9c8d-1a2b3c4d5e6f", - "name": "some domain object", - "enabled": true - } - """, - spec -> spec.path("src/test/resources/fixtures/thing.json") - ) - ); - } + @Nested + class NoChange { + @Test + void unrelatedJsonIsUntouched() { + rewriteRun( + //language=json + json( + """ + { + "uuid": "8f4c3b1e-5d2a-4f6b-9c8d-1a2b3c4d5e6f", + "name": "some domain object", + "enabled": true + } + """, + spec -> spec.path("src/test/resources/fixtures/thing.json") + ) + ); + } - @Test - void stubShapedJsonOutsideMappingsIsUntouched() { - rewriteRun( - //language=json - json( - """ - { - "uuid": "8f4c3b1e-5d2a-4f6b-9c8d-1a2b3c4d5e6f", - "request": { - "method": "GET", - "url": "/user" - }, - "response": { - "status": 200 - } - } - """, - spec -> spec.path("src/test/resources/fixtures/recorded-call.json") - ) - ); - } + @Test + void stubShapedJsonOutsideMappingsIsUntouched() { + rewriteRun( + //language=json + json( + """ + { + "uuid": "8f4c3b1e-5d2a-4f6b-9c8d-1a2b3c4d5e6f", + "request": { + "method": "GET", + "url": "/user" + }, + "response": { + "status": 200 + } + } + """, + spec -> spec.path("src/test/resources/fixtures/recorded-call.json") + ) + ); + } - @Test - void uuidThatIsNotAUuidIsUntouched() { - rewriteRun( - //language=json - json( - """ - { - "uuid": "not-a-uuid", - "request": { - "method": "GET" - }, - "response": { - "status": 200 - } - } - """, - spec -> spec.path("src/test/resources/mappings/odd.json") - ) - ); - } + @Test + void uuidThatIsNotAUuidIsUntouched() { + rewriteRun( + //language=json + json( + """ + { + "uuid": "not-a-uuid", + "request": { + "method": "GET" + }, + "response": { + "status": 200 + } + } + """, + spec -> spec.path("src/test/resources/mappings/odd.json") + ) + ); + } - @Test - void stubMappingAlreadyOnIdOnly() { - rewriteRun( - //language=json - json( - """ - { - "id": "8f4c3b1e-5d2a-4f6b-9c8d-1a2b3c4d5e6f", - "request": { - "method": "GET" - }, - "response": { - "status": 200 - } - } - """, - spec -> spec.path("src/test/resources/mappings/get-user.json") - ) - ); + @Test + void stubMappingAlreadyOnIdOnly() { + rewriteRun( + //language=json + json( + """ + { + "id": "8f4c3b1e-5d2a-4f6b-9c8d-1a2b3c4d5e6f", + "request": { + "method": "GET" + }, + "response": { + "status": 200 + } + } + """, + spec -> spec.path("src/test/resources/mappings/get-user.json") + ) + ); + } } } diff --git a/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeHeaderTest.java b/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeHeaderTest.java index 0c3f5da6e..cd00559cd 100644 --- a/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeHeaderTest.java +++ b/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeHeaderTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.wiremock; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; @@ -175,85 +176,6 @@ class Stubs { ); } - @Test - void singleValueIsUntouched() { - rewriteRun( - //language=java - java( - """ - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; - - import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; - - class Stubs { - ResponseDefinitionBuilder response = aResponse() - .withHeader("Content-Type", "application/json"); - } - """ - ) - ); - } - - @Test - void otherHeadersKeepEveryValue() { - rewriteRun( - //language=java - java( - """ - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; - - import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; - - class Stubs { - ResponseDefinitionBuilder response = aResponse() - .withHeader("Set-Cookie", "a=1", "b=2"); - } - """ - ) - ); - } - - @Test - void valuesHeldInAnArrayCannotBeSplitApart() { - rewriteRun( - //language=java - java( - """ - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; - - import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; - - class Stubs { - ResponseDefinitionBuilder response(String[] values) { - return aResponse().withHeader("Content-Type", values); - } - } - """ - ) - ); - } - - @Test - void requestHeaderMatchersAreUntouched() { - rewriteRun( - //language=java - java( - """ - import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; - import static com.github.tomakehurst.wiremock.client.WireMock.get; - import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; - - import com.github.tomakehurst.wiremock.client.MappingBuilder; - - class Stubs { - MappingBuilder mapping = get(urlEqualTo("/x")) - .withHeader("Content-Type", equalTo("application/json")); - } - """ - ) - ); - } - @Test void appliesWithoutAnExplicitResponseDefinitionBuilderImport() { rewriteRun( @@ -290,4 +212,86 @@ void stub() { ) ); } + + @Nested + class NoChange { + @Test + void singleValueIsUntouched() { + rewriteRun( + //language=java + java( + """ + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; + + import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; + + class Stubs { + ResponseDefinitionBuilder response = aResponse() + .withHeader("Content-Type", "application/json"); + } + """ + ) + ); + } + + @Test + void otherHeadersKeepEveryValue() { + rewriteRun( + //language=java + java( + """ + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; + + import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; + + class Stubs { + ResponseDefinitionBuilder response = aResponse() + .withHeader("Set-Cookie", "a=1", "b=2"); + } + """ + ) + ); + } + + @Test + void valuesHeldInAnArrayCannotBeSplitApart() { + rewriteRun( + //language=java + java( + """ + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; + + import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; + + class Stubs { + ResponseDefinitionBuilder response(String[] values) { + return aResponse().withHeader("Content-Type", values); + } + } + """ + ) + ); + } + + @Test + void requestHeaderMatchersAreUntouched() { + rewriteRun( + //language=java + java( + """ + import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; + import static com.github.tomakehurst.wiremock.client.WireMock.get; + import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; + + import com.github.tomakehurst.wiremock.client.MappingBuilder; + + class Stubs { + MappingBuilder mapping = get(urlEqualTo("/x")) + .withHeader("Content-Type", equalTo("application/json")); + } + """ + ) + ); + } + } } diff --git a/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeStubHeaderTest.java b/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeStubHeaderTest.java index 32ce8a6ee..1691fd3e2 100644 --- a/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeStubHeaderTest.java +++ b/src/test/java/org/openrewrite/java/testing/wiremock/RemoveDuplicateContentTypeStubHeaderTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.wiremock; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.test.RecipeSpec; @@ -130,99 +131,102 @@ void headerNameIsMatchedCaseInsensitively() { ); } - @Test - void singleValueIsUntouched() { - rewriteRun( - //language=json - json( - """ - { - "response": { - "headers": { - "Content-Type": "application/json" + @Nested + class NoChange { + @Test + void singleValueIsUntouched() { + rewriteRun( + //language=json + json( + """ + { + "response": { + "headers": { + "Content-Type": "application/json" + } + } } - } - } - """, - spec -> spec.path("src/test/resources/mappings/get-user.json") - ) - ); - } + """, + spec -> spec.path("src/test/resources/mappings/get-user.json") + ) + ); + } - @Test - void otherHeadersKeepEveryValue() { - rewriteRun( - //language=json - json( - """ - { - "response": { - "headers": { - "Set-Cookie": [ "a=1", "b=2" ] + @Test + void otherHeadersKeepEveryValue() { + rewriteRun( + //language=json + json( + """ + { + "response": { + "headers": { + "Set-Cookie": [ "a=1", "b=2" ] + } + } } - } - } - """, - spec -> spec.path("src/test/resources/mappings/get-user.json") - ) - ); - } + """, + spec -> spec.path("src/test/resources/mappings/get-user.json") + ) + ); + } - @Test - void requestHeaderMatchersAreUntouched() { - rewriteRun( - //language=json - json( - """ - { - "request": { - "method": "GET", - "headers": { - "Content-Type": { - "equalTo": "application/json" + @Test + void requestHeaderMatchersAreUntouched() { + rewriteRun( + //language=json + json( + """ + { + "request": { + "method": "GET", + "headers": { + "Content-Type": { + "equalTo": "application/json" + } + } } } - } - } - """, - spec -> spec.path("src/test/resources/mappings/get-user.json") - ) - ); - } + """, + spec -> spec.path("src/test/resources/mappings/get-user.json") + ) + ); + } - @Test - void contentTypeArrayOutsideHeadersIsUntouched() { - rewriteRun( - //language=json - json( - """ - { - "supported": { - "Content-Type": [ "text/plain", "application/json" ] - } - } - """, - spec -> spec.path("src/test/resources/mappings/get-user.json") - ) - ); - } + @Test + void contentTypeArrayOutsideHeadersIsUntouched() { + rewriteRun( + //language=json + json( + """ + { + "supported": { + "Content-Type": [ "text/plain", "application/json" ] + } + } + """, + spec -> spec.path("src/test/resources/mappings/get-user.json") + ) + ); + } - @Test - void stubShapedJsonOutsideMappingsIsUntouched() { - rewriteRun( - //language=json - json( - """ - { - "response": { - "headers": { - "Content-Type": [ "text/plain", "application/json" ] + @Test + void stubShapedJsonOutsideMappingsIsUntouched() { + rewriteRun( + //language=json + json( + """ + { + "response": { + "headers": { + "Content-Type": [ "text/plain", "application/json" ] + } + } } - } - } - """, - spec -> spec.path("src/test/resources/fixtures/config.json") - ) - ); + """, + spec -> spec.path("src/test/resources/fixtures/config.json") + ) + ); + } } } diff --git a/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceRemovedConstructorsTest.java b/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceRemovedConstructorsTest.java index 32a8e7312..924afe7f1 100644 --- a/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceRemovedConstructorsTest.java +++ b/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceRemovedConstructorsTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.wiremock; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; @@ -130,38 +131,6 @@ class Client { ); } - @Test - void wireMockPortOnlyIsStillSupportedIn4x() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.client.WireMock; - - class Client { - WireMock remote = new WireMock(8080); - } - """ - ) - ); - } - - @Test - void wireMockSchemeAndHostIsLeftAloneBecauseThePortWouldChange() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.client.WireMock; - - class Client { - WireMock remote = new WireMock("https", "example.org"); - } - """ - ) - ); - } - @Test void stubMappingNoArgs() { rewriteRun( @@ -341,46 +310,6 @@ RequestPattern of(CustomMatcherDefinition definition) { ); } - @Test - void anonymousSubclassIsLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.http.ResponseDefinition; - - class Responses { - ResponseDefinition custom = new ResponseDefinition(200, "hello") { - @Override - public String toString() { - return "custom"; - } - }; - } - """ - ) - ); - } - - @Test - void constructorsRetainedIn4xAreLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.client.WireMock; - import com.github.tomakehurst.wiremock.core.Admin; - - class Client { - WireMock remote(Admin admin) { - return new WireMock(admin); - } - } - """ - ) - ); - } - @Test void wrappedAdminClientFoldsIntoBuilder() { rewriteRun( @@ -491,55 +420,130 @@ void accept(HttpAdminClient client) { ); } - @Test - void wrappedAdminClientSchemeAndHostIsLeftAloneBecauseThePortWouldChange() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.client.HttpAdminClient; - import com.github.tomakehurst.wiremock.client.WireMock; - - class Client { - WireMock remote = new WireMock(new HttpAdminClient("https", "example.org")); - } - """ - ) - ); - } - - @Test - void bareAdminClientIsLeftForTheDeveloper() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.client.HttpAdminClient; - - class Client { - HttpAdminClient admin = new HttpAdminClient("localhost", 8080); - } - """ - ) - ); - } - - @Test - void wireMockFromAnArbitraryAdminIsLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.client.WireMock; - import com.github.tomakehurst.wiremock.core.Admin; - - class Client { - WireMock remote(Admin admin) { - return new WireMock(admin); + @Nested + class NoChange { + @Test + void wireMockPortOnlyIsStillSupportedIn4x() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.client.WireMock; + + class Client { + WireMock remote = new WireMock(8080); } - } - """ - ) - ); + """ + ) + ); + } + + @Test + void wireMockSchemeAndHostIsLeftAloneBecauseThePortWouldChange() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.client.WireMock; + + class Client { + WireMock remote = new WireMock("https", "example.org"); + } + """ + ) + ); + } + + @Test + void anonymousSubclassIsLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.http.ResponseDefinition; + + class Responses { + ResponseDefinition custom = new ResponseDefinition(200, "hello") { + @Override + public String toString() { + return "custom"; + } + }; + } + """ + ) + ); + } + + @Test + void constructorsRetainedIn4xAreLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.client.WireMock; + import com.github.tomakehurst.wiremock.core.Admin; + + class Client { + WireMock remote(Admin admin) { + return new WireMock(admin); + } + } + """ + ) + ); + } + + @Test + void wrappedAdminClientSchemeAndHostIsLeftAloneBecauseThePortWouldChange() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.client.HttpAdminClient; + import com.github.tomakehurst.wiremock.client.WireMock; + + class Client { + WireMock remote = new WireMock(new HttpAdminClient("https", "example.org")); + } + """ + ) + ); + } + + @Test + void bareAdminClientIsLeftForTheDeveloper() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.client.HttpAdminClient; + + class Client { + HttpAdminClient admin = new HttpAdminClient("localhost", 8080); + } + """ + ) + ); + } + + @Test + void wireMockFromAnArbitraryAdminIsLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.client.WireMock; + import com.github.tomakehurst.wiremock.core.Admin; + + class Client { + WireMock remote(Admin admin) { + return new WireMock(admin); + } + } + """ + ) + ); + } } } diff --git a/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceSettersWithTransformTest.java b/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceSettersWithTransformTest.java index e8be013bd..29724a92a 100644 --- a/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceSettersWithTransformTest.java +++ b/src/test/java/org/openrewrite/java/testing/wiremock/ReplaceSettersWithTransformTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.wiremock; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; @@ -277,104 +278,6 @@ void describe(StubMapping mapping) { ); } - @Test - void setterWithoutBuilderEquivalentIsLeftForTheCompiler() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.stubbing.StubMapping; - - class Stubs { - void soil(StubMapping mapping) { - mapping.setDirty(true); - } - } - """ - ) - ); - } - - @Test - void finalReceiverIsLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.stubbing.StubMapping; - - class Stubs { - void describe(final StubMapping mapping) { - mapping.setName("get user"); - } - } - """ - ) - ); - } - - @Test - void finalFieldReceiverIsLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.stubbing.StubMapping; - - class Stubs { - private final StubMapping mapping = new StubMapping(); - - void describe() { - this.mapping.setName("get user"); - } - } - """ - ) - ); - } - - @Test - void capturedLocalInsideLambdaIsLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.stubbing.StubMapping; - - import java.util.List; - - class Stubs { - void describe(List names, StubMapping mapping) { - names.forEach(name -> mapping.setName(name)); - } - } - """ - ) - ); - } - - @Test - void nonAssignableReceiverIsLeftAlone() { - rewriteRun( - //language=java - java( - """ - import com.github.tomakehurst.wiremock.stubbing.StubMapping; - - class Stubs { - StubMapping current() { - return null; - } - - void describe() { - current().setName("get user"); - } - } - """ - ) - ); - } - @Test void argumentReadingALocalReceiverIsLeftAlone() { rewriteRun( @@ -436,4 +339,105 @@ void describe() { ) ); } + + @Nested + class NoChange { + @Test + void setterWithoutBuilderEquivalentIsLeftForTheCompiler() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.stubbing.StubMapping; + + class Stubs { + void soil(StubMapping mapping) { + mapping.setDirty(true); + } + } + """ + ) + ); + } + + @Test + void finalReceiverIsLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.stubbing.StubMapping; + + class Stubs { + void describe(final StubMapping mapping) { + mapping.setName("get user"); + } + } + """ + ) + ); + } + + @Test + void finalFieldReceiverIsLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.stubbing.StubMapping; + + class Stubs { + private final StubMapping mapping = new StubMapping(); + + void describe() { + this.mapping.setName("get user"); + } + } + """ + ) + ); + } + + @Test + void capturedLocalInsideLambdaIsLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.stubbing.StubMapping; + + import java.util.List; + + class Stubs { + void describe(List names, StubMapping mapping) { + names.forEach(name -> mapping.setName(name)); + } + } + """ + ) + ); + } + + @Test + void nonAssignableReceiverIsLeftAlone() { + rewriteRun( + //language=java + java( + """ + import com.github.tomakehurst.wiremock.stubbing.StubMapping; + + class Stubs { + StubMapping current() { + return null; + } + + void describe() { + current().setName("get user"); + } + } + """ + ) + ); + } + } } diff --git a/src/test/java/org/openrewrite/java/testing/wiremock/Wiremock3to4MigrationTest.java b/src/test/java/org/openrewrite/java/testing/wiremock/Wiremock3to4MigrationTest.java index 520043b6c..8cb333372 100644 --- a/src/test/java/org/openrewrite/java/testing/wiremock/Wiremock3to4MigrationTest.java +++ b/src/test/java/org/openrewrite/java/testing/wiremock/Wiremock3to4MigrationTest.java @@ -15,6 +15,7 @@ */ package org.openrewrite.java.testing.wiremock; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; @@ -176,56 +177,6 @@ void gradle() { ); } - @Test - void otherDependenciesAreUntouched() { - rewriteRun( - //language=xml - pomXml( - """ - - 4.0.0 - com.example - demo - 0.0.1-SNAPSHOT - - - org.junit.jupiter - junit-jupiter-api - 5.10.1 - test - - - - """ - ) - ); - } - - @Test - void alreadyOnWiremock4NoChange() { - rewriteRun( - //language=xml - pomXml( - """ - - 4.0.0 - com.example - demo - 0.0.1-SNAPSHOT - - - org.wiremock - wiremock - %s - test - - - - """.formatted(WIREMOCK_4_VERSION) - ) - ); - } - @Test void jetty12ModuleFoldedBackIntoWiremock() { rewriteRun( @@ -779,47 +730,6 @@ ResponseDefinitionBuilder response() { ); } - @Test - void duplicateContentTypeHeadersSurviveOnWiremock4() { - rewriteRun( - mavenProject("project", - //language=xml - pomXml( - """ - - 4.0.0 - com.example - demo - 0.0.1-SNAPSHOT - - - org.wiremock - wiremock - %s - test - - - - """.formatted(WIREMOCK_4_VERSION) - ), - //language=json - json( - """ - { - "response": { - "status": 200, - "headers": { - "Content-Type": [ "text/plain", "application/json" ] - } - } - } - """, - spec -> spec.path("src/test/resources/mappings/get-user.json") - ) - ) - ); - } - @Test void constructAndMutateBecomesBuilderAndTransform() { rewriteRun( @@ -918,25 +828,119 @@ List names(List methods) { ); } - @Test - void valueOnAnUnrelatedTypeIsUntouched() { - rewriteRun( - //language=java - java( - """ - class Methods { - static class Token { - String value() { - return "x"; + @Nested + class NoChange { + @Test + void otherDependenciesAreUntouched() { + rewriteRun( + //language=xml + pomXml( + """ + + 4.0.0 + com.example + demo + 0.0.1-SNAPSHOT + + + org.junit.jupiter + junit-jupiter-api + 5.10.1 + test + + + + """ + ) + ); + } + + @Test + void alreadyOnWiremock4NoChange() { + rewriteRun( + //language=xml + pomXml( + """ + + 4.0.0 + com.example + demo + 0.0.1-SNAPSHOT + + + org.wiremock + wiremock + %s + test + + + + """.formatted(WIREMOCK_4_VERSION) + ) + ); + } + + @Test + void duplicateContentTypeHeadersSurviveOnWiremock4() { + rewriteRun( + mavenProject("project", + //language=xml + pomXml( + """ + + 4.0.0 + com.example + demo + 0.0.1-SNAPSHOT + + + org.wiremock + wiremock + %s + test + + + + """.formatted(WIREMOCK_4_VERSION) + ), + //language=json + json( + """ + { + "response": { + "status": 200, + "headers": { + "Content-Type": [ "text/plain", "application/json" ] + } } - } + } + """, + spec -> spec.path("src/test/resources/mappings/get-user.json") + ) + ) + ); + } - String describe(Token token) { - return token.value(); + @Test + void valueOnAnUnrelatedTypeIsUntouched() { + rewriteRun( + //language=java + java( + """ + class Methods { + static class Token { + String value() { + return "x"; + } + } + + String describe(Token token) { + return token.value(); + } } - } - """ - ) - ); + """ + ) + ); + } } }