Skip to content

Commit 0abe800

Browse files
Jenson3210Jenson3210
authored
Use version patterns in ChangeDependencyGroupIdAndArtifactId tests (#6856)
Replace hardcoded version 2.2.43 with regex pattern assertions in 4 tests that resolve swagger-annotations to the latest 2.2.x version. This prevents test failures when new swagger-annotations versions are released.
1 parent 60d28f9 commit 0abe800

1 file changed

Lines changed: 20 additions & 104 deletions

File tree

‎rewrite-maven/src/test/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.java‎

Lines changed: 20 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -2352,20 +2352,10 @@ void changeVersionPropertyInParentPomSimple() {
23522352
</modules>
23532353
</project>
23542354
""",
2355-
"""
2356-
<project>
2357-
<groupId>com.mycompany.app</groupId>
2358-
<artifactId>parent-project</artifactId>
2359-
<version>1</version>
2360-
<properties>
2361-
<version.swagger>2.2.43</version.swagger>
2362-
</properties>
2363-
<modules>
2364-
<module>sub-project</module>
2365-
</modules>
2366-
</project>
2367-
""",
2368-
spec -> spec.path("pom.xml")
2355+
spec -> spec.path("pom.xml").after(actual -> assertThat(actual)
2356+
.containsPattern("<version\\.swagger>2\\.2\\.\\d+</version\\.swagger>")
2357+
.doesNotContain("<version.swagger>1.5.16</version.swagger>")
2358+
.actual())
23692359
),
23702360
mavenProject("sub-project",
23712361
//language=xml
@@ -2390,27 +2380,10 @@ void changeVersionPropertyInParentPomSimple() {
23902380
</dependencies>
23912381
</project>
23922382
""",
2393-
"""
2394-
<project>
2395-
<groupId>com.mycompany.app</groupId>
2396-
<artifactId>sub-project</artifactId>
2397-
<version>1</version>
2398-
<parent>
2399-
<groupId>com.mycompany.app</groupId>
2400-
<artifactId>parent-project</artifactId>
2401-
<version>1</version>
2402-
<relativePath>../pom.xml</relativePath>
2403-
</parent>
2404-
<dependencies>
2405-
<dependency>
2406-
<groupId>io.swagger.core.v3</groupId>
2407-
<artifactId>swagger-annotations</artifactId>
2408-
<version>${version.swagger}</version>
2409-
</dependency>
2410-
</dependencies>
2411-
</project>
2412-
""",
2413-
spec -> spec.path("sub-project/pom.xml")
2383+
spec -> spec.path("sub-project/pom.xml").after(actual -> assertThat(actual)
2384+
.containsPattern("<groupId>io\\.swagger\\.core\\.v3</groupId>\\s*<artifactId>swagger-annotations</artifactId>\\s*<version>\\$\\{version\\.swagger}</version>")
2385+
.doesNotContain("<groupId>io.swagger</groupId>")
2386+
.actual())
24142387
)
24152388
)
24162389
)
@@ -2480,32 +2453,10 @@ void sharedPropertyInParentPomLeavesPropertyUnchangedAndInlinesVersion() {
24802453
</dependencies>
24812454
</project>
24822455
""",
2483-
"""
2484-
<project>
2485-
<groupId>com.mycompany.app</groupId>
2486-
<artifactId>sub-project</artifactId>
2487-
<version>1</version>
2488-
<parent>
2489-
<groupId>com.mycompany.app</groupId>
2490-
<artifactId>parent-project</artifactId>
2491-
<version>1</version>
2492-
<relativePath>../pom.xml</relativePath>
2493-
</parent>
2494-
<dependencies>
2495-
<dependency>
2496-
<groupId>io.swagger.core.v3</groupId>
2497-
<artifactId>swagger-annotations</artifactId>
2498-
<version>2.2.43</version>
2499-
</dependency>
2500-
<dependency>
2501-
<groupId>io.swagger</groupId>
2502-
<artifactId>swagger-models</artifactId>
2503-
<version>${version.swagger}</version>
2504-
</dependency>
2505-
</dependencies>
2506-
</project>
2507-
""",
2508-
spec -> spec.path("sub-project/pom.xml")
2456+
spec -> spec.path("sub-project/pom.xml").after(actual -> assertThat(actual)
2457+
.containsPattern("<groupId>io\\.swagger\\.core\\.v3</groupId>\\s*<artifactId>swagger-annotations</artifactId>\\s*<version>2\\.2\\.\\d+</version>")
2458+
.containsPattern("<groupId>io\\.swagger</groupId>\\s*<artifactId>swagger-models</artifactId>\\s*<version>\\$\\{version\\.swagger}</version>")
2459+
.actual())
25092460
)
25102461
)
25112462
)
@@ -2570,27 +2521,10 @@ void sharedPropertyInParentPomUsedByDifferentChildrenLeavesPropertyUnchanged() {
25702521
</dependencies>
25712522
</project>
25722523
""",
2573-
"""
2574-
<project>
2575-
<groupId>com.mycompany.app</groupId>
2576-
<artifactId>child-a</artifactId>
2577-
<version>1</version>
2578-
<parent>
2579-
<groupId>com.mycompany.app</groupId>
2580-
<artifactId>parent-project</artifactId>
2581-
<version>1</version>
2582-
<relativePath>../pom.xml</relativePath>
2583-
</parent>
2584-
<dependencies>
2585-
<dependency>
2586-
<groupId>io.swagger.core.v3</groupId>
2587-
<artifactId>swagger-annotations</artifactId>
2588-
<version>2.2.43</version>
2589-
</dependency>
2590-
</dependencies>
2591-
</project>
2592-
""",
2593-
spec -> spec.path("child-a/pom.xml")
2524+
spec -> spec.path("child-a/pom.xml").after(actual -> assertThat(actual)
2525+
.containsPattern("<groupId>io\\.swagger\\.core\\.v3</groupId>\\s*<artifactId>swagger-annotations</artifactId>\\s*<version>2\\.2\\.\\d+</version>")
2526+
.doesNotContain("<version>${version.swagger}</version>")
2527+
.actual())
25942528
)
25952529
),
25962530
mavenProject("child-b",
@@ -2664,28 +2598,10 @@ void childRedefinesPropertyUsedNonConflictinglyInlinesVersionInParent() {
26642598
</dependencies>
26652599
</project>
26662600
""",
2667-
//language=xml
2668-
"""
2669-
<project>
2670-
<groupId>com.mycompany.app</groupId>
2671-
<artifactId>parent-project</artifactId>
2672-
<version>1</version>
2673-
<properties>
2674-
<version.swagger>1.5.16</version.swagger>
2675-
</properties>
2676-
<modules>
2677-
<module>sub-project</module>
2678-
</modules>
2679-
<dependencies>
2680-
<dependency>
2681-
<groupId>io.swagger.core.v3</groupId>
2682-
<artifactId>swagger-annotations</artifactId>
2683-
<version>2.2.43</version>
2684-
</dependency>
2685-
</dependencies>
2686-
</project>
2687-
""",
2688-
spec -> spec.path("pom.xml")
2601+
spec -> spec.path("pom.xml").after(actual -> assertThat(actual)
2602+
.containsPattern("<groupId>io\\.swagger\\.core\\.v3</groupId>\\s*<artifactId>swagger-annotations</artifactId>\\s*<version>2\\.2\\.\\d+</version>")
2603+
.contains("<version.swagger>1.5.16</version.swagger>")
2604+
.actual())
26892605
),
26902606
mavenProject("sub-project",
26912607
pomXml(

0 commit comments

Comments
 (0)
⚡