Skip to content

Commit 84790ed

Browse files
committed
MavenRecipeTest to RewriteTest conversion.
1 parent 8b2ed72 commit 84790ed

File tree

3 files changed

+45
-39
lines changed

3 files changed

+45
-39
lines changed

src/test/kotlin/org/openrewrite/java/migrate/JavaVersion11Test.kt

+17-16
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@
1515
*/
1616
package org.openrewrite.java.migrate
1717

18-
import org.assertj.core.api.Assertions.assertThat
1918
import org.junit.jupiter.api.Test
20-
import org.openrewrite.Recipe
2119
import org.openrewrite.config.Environment
22-
import org.openrewrite.maven.MavenRecipeTest
20+
import org.openrewrite.maven.Assertions.pomXml
21+
import org.openrewrite.test.RecipeSpec
22+
import org.openrewrite.test.RewriteTest
2323

24-
class JavaVersion11Test : MavenRecipeTest {
25-
override val recipe: Recipe = Environment.builder()
26-
.scanRuntimeClasspath("org.openrewrite.java.migrate")
27-
.build()
28-
.activateRecipes("org.openrewrite.java.migrate.JavaVersion11")
24+
class JavaVersion11Test : RewriteTest {
25+
override fun defaults(spec: RecipeSpec) {
26+
spec.recipe(Environment.builder()
27+
.scanRuntimeClasspath("org.openrewrite.java.migrate")
28+
.build().activateRecipes("org.openrewrite.java.migrate.JavaVersion11"))
29+
}
2930

3031
@Test
31-
fun changeJavaVersion() = assertChanged(
32-
before = """
32+
fun changeJavaVersion() = rewriteRun (
33+
pomXml("""
3334
<project>
3435
<modelVersion>4.0.0</modelVersion>
3536
@@ -41,8 +42,7 @@ class JavaVersion11Test : MavenRecipeTest {
4142
<artifactId>my-app</artifactId>
4243
<version>1</version>
4344
</project>
44-
""",
45-
after = """
45+
""", """
4646
<project>
4747
<modelVersion>4.0.0</modelVersion>
4848
@@ -55,11 +55,12 @@ class JavaVersion11Test : MavenRecipeTest {
5555
<version>1</version>
5656
</project>
5757
"""
58+
)
5859
)
5960

6061
@Test
61-
fun changeMavenCompiler() = assertChanged(
62-
before = """
62+
fun changeMavenCompiler() = rewriteRun (
63+
pomXml("""
6364
<project>
6465
<modelVersion>4.0.0</modelVersion>
6566
@@ -73,7 +74,7 @@ class JavaVersion11Test : MavenRecipeTest {
7374
<version>1</version>
7475
</project>
7576
""",
76-
after = """
77+
"""
7778
<project>
7879
<modelVersion>4.0.0</modelVersion>
7980
@@ -86,6 +87,6 @@ class JavaVersion11Test : MavenRecipeTest {
8687
<artifactId>my-app</artifactId>
8788
<version>1</version>
8889
</project>
89-
"""
90+
""")
9091
)
9192
}

src/test/kotlin/org/openrewrite/java/migrate/jacoco/UpgradeJaCoCoMavenPluginVersionTest.kt

+14-12
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@
1616
package org.openrewrite.java.migrate.jacoco
1717

1818
import org.junit.jupiter.api.Test
19-
import org.openrewrite.Recipe
2019
import org.openrewrite.config.Environment
21-
import org.openrewrite.maven.MavenRecipeTest
22-
23-
class UpgradeJaCoCoMavenPluginVersionTest : MavenRecipeTest {
24-
override val recipe: Recipe = Environment.builder()
25-
.scanRuntimeClasspath("org.openrewrite.java.migrate.jacoco")
26-
.build()
27-
.activateRecipes("org.openrewrite.java.migrate.jacoco.UpgradeJaCoCoMavenPluginVersion")
20+
import org.openrewrite.maven.Assertions.pomXml
21+
import org.openrewrite.test.RecipeSpec
22+
import org.openrewrite.test.RewriteTest
2823

24+
class UpgradeJaCoCoMavenPluginVersionTest : RewriteTest {
25+
override fun defaults(spec: RecipeSpec) {
26+
spec.recipe(Environment.builder()
27+
.scanRuntimeClasspath("org.openrewrite.java.migrate.jacoco")
28+
.build()
29+
.activateRecipes("org.openrewrite.java.migrate.jacoco.UpgradeJaCoCoMavenPluginVersion"))
30+
}
2931
@Test
30-
fun property() = assertChanged(
31-
before = """
32+
fun property() = rewriteRun(
33+
pomXml("""
3234
<project>
3335
<modelVersion>4.0.0</modelVersion>
3436
@@ -64,7 +66,7 @@ class UpgradeJaCoCoMavenPluginVersionTest : MavenRecipeTest {
6466
</build>
6567
</project>
6668
""",
67-
after = """
69+
"""
6870
<project>
6971
<modelVersion>4.0.0</modelVersion>
7072
@@ -99,6 +101,6 @@ class UpgradeJaCoCoMavenPluginVersionTest : MavenRecipeTest {
99101
</plugins>
100102
</build>
101103
</project>
102-
"""
104+
""")
103105
)
104106
}

src/test/kotlin/org/openrewrite/java/migrate/wro4j/UpgradeWro4jMavenPluginVersionTest.kt

+14-11
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,23 @@
1616
package org.openrewrite.java.migrate.wro4j
1717

1818
import org.junit.jupiter.api.Test
19-
import org.openrewrite.Recipe
2019
import org.openrewrite.config.Environment
21-
import org.openrewrite.maven.MavenRecipeTest
20+
import org.openrewrite.maven.Assertions.pomXml
21+
import org.openrewrite.test.RecipeSpec
22+
import org.openrewrite.test.RewriteTest
2223

23-
class UpgradeWro4jMavenPluginVersionTest : MavenRecipeTest {
24-
override val recipe: Recipe = Environment.builder()
25-
.scanRuntimeClasspath("org.openrewrite.java.migrate.wro4j")
26-
.build()
27-
.activateRecipes("org.openrewrite.java.migrate.wro4j.UpgradeWro4jMavenPluginVersion")
24+
class UpgradeWro4jMavenPluginVersionTest : RewriteTest {
25+
override fun defaults(spec: RecipeSpec) {
26+
spec.recipe(Environment.builder()
27+
.scanRuntimeClasspath("org.openrewrite.java.migrate.wro4j")
28+
.build()
29+
.activateRecipes("org.openrewrite.java.migrate.wro4j.UpgradeWro4jMavenPluginVersion"))
30+
}
2831

2932
@Test
30-
fun property() = assertChanged(
33+
fun property() = rewriteRun(
3134
// As taken from Spring PetClinic 1.5.x
32-
before = """
35+
pomXml("""
3336
<project>
3437
<modelVersion>4.0.0</modelVersion>
3538
@@ -74,7 +77,7 @@ class UpgradeWro4jMavenPluginVersionTest : MavenRecipeTest {
7477
</build>
7578
</project>
7679
""",
77-
after = """
80+
"""
7881
<project>
7982
<modelVersion>4.0.0</modelVersion>
8083
@@ -118,6 +121,6 @@ class UpgradeWro4jMavenPluginVersionTest : MavenRecipeTest {
118121
</plugins>
119122
</build>
120123
</project>
121-
"""
124+
""")
122125
)
123126
}

0 commit comments

Comments
 (0)