Skip to content

Use flexible version assertions in ChangeDependencyGroupIdAndArtifactId tests #6799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jenson3210 merged 3 commits into from
Feb 23, 2026
Merged

Use flexible version assertions in ChangeDependencyGroupIdAndArtifactId tests #6799

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec393ec
Use flexible version assertions in ChangeDependencyGroupIdAndArtifact…
Jenson3210 Feb 23, 2026
c45e701
Simplify to assertThat(actual).containsPattern().actual() style
Jenson3210 Feb 23, 2026
1b25cb0
Merge branch 'main' into fix-dependency-gavid-test-versions
timtebeek Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 103 additions & 81 deletions ...e-maven/src/test/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
import org.openrewrite.test.RewriteTest;
import org.openrewrite.test.SourceSpec;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.openrewrite.java.Assertions.mavenProject;
import static org.openrewrite.maven.Assertions.pomXml;
Expand Down Expand Up @@ -3329,33 +3333,39 @@ void versionNotDroppedWhenDependencyExcludedByOtherDependency() {
</dependencies>
</project>
""",
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.2.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>2.21.0</version>
</dependency>
</dependencies>
</project>
"""
spec -> spec.after(after -> {
Matcher matcher = Pattern.compile("jackson-jakarta-rs-json-provider</artifactId>\\s*<version>(.+)</version>").matcher(after);
assertThat(matcher.find()).isTrue();
String version = matcher.group(1);
assertThat(version).matches("2\\.\\d+\\.\\d+");
Comment thread
timtebeek marked this conversation as resolved.
Outdated
return """
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.2.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>%s</version>
</dependency>
</dependencies>
</project>
""".formatted(version);
})
)
);
}
Expand Down Expand Up @@ -3405,33 +3415,39 @@ void versionNotDroppedWhenTransitiveDependencyHasManagedVersion() {
</dependencies>
</project>
""",
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>2.2.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>2.21.0</version>
</dependency>
</dependencies>
</project>
"""
spec -> spec.after(after -> {
Matcher matcher = Pattern.compile("jackson-jakarta-rs-json-provider</artifactId>\\s*<version>(.+)</version>").matcher(after);
assertThat(matcher.find()).isTrue();
String version = matcher.group(1);
assertThat(version).matches("2\\.\\d+\\.\\d+");
return """
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>2.2.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>%s</version>
</dependency>
</dependencies>
</project>
""".formatted(version);
})
)
);
}
Expand Down Expand Up @@ -3574,33 +3590,39 @@ void exclusionUpdatedWhenDependencyGroupIdChanges() {
</dependencies>
</project>
""",
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>2.2.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>2.21.0</version>
</dependency>
</dependencies>
</project>
"""
spec -> spec.after(after -> {
Matcher matcher = Pattern.compile("jackson-jakarta-rs-json-provider</artifactId>\\s*<version>(.+)</version>").matcher(after);
assertThat(matcher.find()).isTrue();
String version = matcher.group(1);
assertThat(version).matches("2\\.\\d+\\.\\d+");
return """
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>2.2.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>%s</version>
</dependency>
</dependencies>
</project>
""".formatted(version);
})
)
);
}
Expand Down
⚡