29
29
import org .openrewrite .test .RecipeSpec ;
30
30
import org .openrewrite .test .RewriteTest ;
31
31
32
+ import java .util .regex .Pattern ;
32
33
import java .util .stream .Stream ;
33
34
34
35
import static org .openrewrite .gradle .Assertions .buildGradle ;
@@ -537,7 +538,6 @@ void test() {
537
538
void assertjMavenDependencyAddedWithTestScope () {
538
539
rewriteRun (
539
540
mavenProject ("project" ,
540
- //language=java
541
541
srcTestJava (java (JAVA_BEFORE , JAVA_AFTER )),
542
542
//language=xml
543
543
pomXml ("""
@@ -555,7 +555,8 @@ void assertjMavenDependencyAddedWithTestScope() {
555
555
</dependency>
556
556
</dependencies>
557
557
</project>
558
- """ , """
558
+ """ ,
559
+ sourceSpecs -> sourceSpecs .after (after -> """
559
560
<project>
560
561
<modelVersion>4.0.0</modelVersion>
561
562
<groupId>com.example</groupId>
@@ -565,7 +566,7 @@ void assertjMavenDependencyAddedWithTestScope() {
565
566
<dependency>
566
567
<groupId>org.assertj</groupId>
567
568
<artifactId>assertj-core</artifactId>
568
- <version>3.24.2 </version>
569
+ <version>%s </version>
569
570
<scope>test</scope>
570
571
</dependency>
571
572
<dependency>
@@ -576,17 +577,17 @@ void assertjMavenDependencyAddedWithTestScope() {
576
577
</dependency>
577
578
</dependencies>
578
579
</project>
579
- """ )));
580
+ """ .formatted (Pattern .compile ("<version>(3\\ .2.*)</version>" ).matcher (after ).results ().findFirst ().orElseThrow ().group (1 ))))
581
+ )
582
+ );
580
583
}
581
584
582
585
@ Test
583
586
void assertjGradleDependencyAddedWithTestScope () {
584
587
rewriteRun (
585
588
spec -> spec .beforeRecipe (withToolingApi ()),
586
589
mavenProject ("project" ,
587
- //language=java
588
590
srcTestJava (java (JAVA_BEFORE , JAVA_AFTER )),
589
- //language=groovy
590
591
buildGradle ("""
591
592
plugins {
592
593
id "java-library"
@@ -599,7 +600,8 @@ void assertjGradleDependencyAddedWithTestScope() {
599
600
dependencies {
600
601
testImplementation "org.hamcrest:hamcrest:2.2"
601
602
}
602
- """ , """
603
+ """ ,
604
+ sourceSpecs -> sourceSpecs .after (after -> """
603
605
plugins {
604
606
id "java-library"
605
607
}
@@ -609,10 +611,15 @@ void assertjGradleDependencyAddedWithTestScope() {
609
611
}
610
612
611
613
dependencies {
612
- testImplementation "org.assertj:assertj-core:3.24.2 "
614
+ testImplementation "org.assertj:%s "
613
615
testImplementation "org.hamcrest:hamcrest:2.2"
614
616
}
615
- """ )));
617
+ """
618
+ .formatted (Pattern .compile ("(assertj-core:[^\" ]*)" ).matcher (after ).results ().findFirst ().orElseThrow ().group (1 ))
619
+ )
620
+ )
621
+ )
622
+ );
616
623
}
617
624
}
618
625
0 commit comments