Skip to content

fix wrong type parameter in AbstractValidationAssert.containsInvalidSame() #258

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
pivovarit merged 1 commit into from
Feb 24, 2026
Merged

fix wrong type parameter in AbstractValidationAssert.containsInvalidSame() #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/org/assertj/vavr/api/AbstractValidationAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public SELF containsInvalid(INVALID expectedErrorValue) {
*/
public SELF containsValidSame(VALID expectedValue) {
assertIsValid();
checkNotNull(expectedValue);
if (actual.get() != expectedValue)
throwAssertionError(shouldContainValidSame(actual, expectedValue));
return myself;
Expand All @@ -122,7 +123,7 @@ public SELF containsValidSame(VALID expectedValue) {
* @param expectedErrorValue the expected value inside the {@link io.vavr.control.Validation}.
* @return this assertion object.
*/
public SELF containsInvalidSame(VALID expectedErrorValue) {
public SELF containsInvalidSame(INVALID expectedErrorValue) {
assertIsInvalid();
checkNotNull(expectedErrorValue);
if (actual.getError() != expectedErrorValue)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/assertj/vavr/api/ValidationShouldContain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static <INVALID, VALID> ValidationShouldContain shouldContainValidSame(Validatio
* @param <VALID> type of the value in the case of the valid {@link Validation}.
* @return an error message factory
*/
static <INVALID, VALID> ValidationShouldContain shouldContainInvalidSame(Validation<INVALID, VALID> validation, VALID expectedErrorValue) {
static <INVALID, VALID> ValidationShouldContain shouldContainInvalidSame(Validation<INVALID, VALID> validation, INVALID expectedErrorValue) {
return validation.isInvalid() ?
new ValidationShouldContain(EXPECTING_TO_CONTAIN_SAME, validation, expectedErrorValue) :
shouldContainButIsValid(validation, expectedErrorValue);
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/org/assertj/vavr/api/ValidationAssert_containsValidSame_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ void should_fail_when_validation_is_null() {
.hasMessage(actualIsNull());
}

@Test
void should_fail_if_expected_value_is_null() {
assertThatThrownBy(
() -> assertThat(Validation.valid("something")).containsValidSame(null)
)
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("The expected value should not be <null>.");
}

@Test
void should_pass_if_validation_contains_same_instance_as_valid_value() {
final String value = "something";
Expand Down