Skip to content

Commit dc61c73

Browse files
committed
Make MigrateHamcrestToAssertJTest robust against new releases
1 parent 99d1529 commit dc61c73

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

src/test/java/org/openrewrite/java/testing/hamcrest/MigrateHamcrestToAssertJTest.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.openrewrite.test.RecipeSpec;
3030
import org.openrewrite.test.RewriteTest;
3131

32+
import java.util.regex.Pattern;
3233
import java.util.stream.Stream;
3334

3435
import static org.openrewrite.gradle.Assertions.buildGradle;
@@ -537,7 +538,6 @@ void test() {
537538
void assertjMavenDependencyAddedWithTestScope() {
538539
rewriteRun(
539540
mavenProject("project",
540-
//language=java
541541
srcTestJava(java(JAVA_BEFORE, JAVA_AFTER)),
542542
//language=xml
543543
pomXml("""
@@ -555,7 +555,8 @@ void assertjMavenDependencyAddedWithTestScope() {
555555
</dependency>
556556
</dependencies>
557557
</project>
558-
""", """
558+
""",
559+
sourceSpecs -> sourceSpecs.after(after -> """
559560
<project>
560561
<modelVersion>4.0.0</modelVersion>
561562
<groupId>com.example</groupId>
@@ -565,7 +566,7 @@ void assertjMavenDependencyAddedWithTestScope() {
565566
<dependency>
566567
<groupId>org.assertj</groupId>
567568
<artifactId>assertj-core</artifactId>
568-
<version>3.24.2</version>
569+
<version>%s</version>
569570
<scope>test</scope>
570571
</dependency>
571572
<dependency>
@@ -576,17 +577,17 @@ void assertjMavenDependencyAddedWithTestScope() {
576577
</dependency>
577578
</dependencies>
578579
</project>
579-
""")));
580+
""".formatted(Pattern.compile("<version>(3\\.2.*)</version>").matcher(after).results().findFirst().orElseThrow().group(1))))
581+
)
582+
);
580583
}
581584

582585
@Test
583586
void assertjGradleDependencyAddedWithTestScope() {
584587
rewriteRun(
585588
spec -> spec.beforeRecipe(withToolingApi()),
586589
mavenProject("project",
587-
//language=java
588590
srcTestJava(java(JAVA_BEFORE, JAVA_AFTER)),
589-
//language=groovy
590591
buildGradle("""
591592
plugins {
592593
id "java-library"
@@ -599,7 +600,8 @@ void assertjGradleDependencyAddedWithTestScope() {
599600
dependencies {
600601
testImplementation "org.hamcrest:hamcrest:2.2"
601602
}
602-
""", """
603+
""",
604+
sourceSpecs -> sourceSpecs.after(after -> """
603605
plugins {
604606
id "java-library"
605607
}
@@ -609,10 +611,15 @@ void assertjGradleDependencyAddedWithTestScope() {
609611
}
610612
611613
dependencies {
612-
testImplementation "org.assertj:assertj-core:3.24.2"
614+
testImplementation "org.assertj:%s"
613615
testImplementation "org.hamcrest:hamcrest:2.2"
614616
}
615-
""")));
617+
"""
618+
.formatted(Pattern.compile("(assertj-core:[^\"]*)").matcher(after).results().findFirst().orElseThrow().group(1))
619+
)
620+
)
621+
)
622+
);
616623
}
617624
}
618625

0 commit comments

Comments
 (0)