Skip to content

fix: handle null in dictionary HasValue #750

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
vbreuss merged 2 commits into from
Sep 3, 2025
Merged

fix: handle null in dictionary HasValue #750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4ce5f7
fix: handle `null` in dictionary `HasValue`
vbreuss Sep 3, 2025
0eebc2b
Fix review comment
vbreuss Sep 3, 2025
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
4 changes: 3 additions & 1 deletion Source/aweXpect/That/Collections/ThatDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ namespace aweXpect;
public static partial class ThatDictionary
{
internal static bool ContainsValue<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TValue value)
=> dictionary.Any(x => value?.Equals(x.Value) == true);
=> value is null
? dictionary.Any(x => x.Value is null)
: dictionary.Any(x => value.Equals(x.Value));
}
4 changes: 3 additions & 1 deletion Source/aweXpect/That/Collections/ThatReadOnlyDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ namespace aweXpect;
public static partial class ThatReadOnlyDictionary
{
internal static bool ContainsValue<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> dictionary, TValue value)
=> dictionary.Any(x => value?.Equals(x.Value) == true);
=> value is null
? dictionary.Any(x => x.Value is null)
: dictionary.Any(x => value.Equals(x.Value));
}
34 changes: 34 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatDictionary.ContainsValue.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,40 @@ public sealed class ContainsValue
{
public sealed class Tests
{
[Fact]
public async Task WhenNullValueDoesNotExist_ShouldFail()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).ContainsValue(null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
contains value <null>,
but it contained only [
41,
42,
43
]

Dictionary:
{[1] = 41, [2] = 42, [3] = 43}
""");
}

[Fact]
public async Task WhenNullValueExists_ShouldSucceed()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, null, 43,]);

async Task Act()
=> await That(subject).ContainsValue(null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
37 changes: 37 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatDictionary.ContainsValues.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ async Task Act()
await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenAllValuesExists_WithNull_ShouldSucceed()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [null, 42, 43,]);

async Task Act()
=> await That(subject).ContainsValues(42, null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenOneValueIsMissing_ShouldFail()
{
Expand All @@ -44,6 +55,32 @@ ] in [
""");
}

[Fact]
public async Task WhenOneValueIsMissing_WithNull_ShouldFail()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).ContainsValues(42, null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
contains values [42, <null>],
but it did not contain [
<null>
] in [
41,
42,
43
]

Dictionary:
{[1] = 41, [2] = 42, [3] = 43}
""");
}


Comment thread
vbreuss marked this conversation as resolved.
Outdated
[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
30 changes: 30 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatDictionary.DoesNotContainValue.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,36 @@ public sealed class DoesNotContainValue
{
public sealed class Tests
{
[Fact]
public async Task WhenNullValueDoesNotExist_ShouldSucceed()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValue(null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenNullValueExists_ShouldFail()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, null, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValue(null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
does not contain value <null>,
but it did

Dictionary:
{[1] = 41, [2] = <null>, [3] = 43}
""");
}

[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
32 changes: 32 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatDictionary.DoesNotContainValues.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ async Task Act()
await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenAllValuesDoNotExist_WithNull_ShouldSucceed()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValues(2, null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenAtLeastOneValueExists_ShouldFail()
{
Expand All @@ -40,6 +51,27 @@ but it did contain [
""");
}

[Fact]
public async Task WhenAtLeastOneValueExists_WithNull_ShouldFail()
{
IDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [null, 42, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValues(2, null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
does not contain values [2, <null>],
but it did contain [
<null>
]

Dictionary:
{[1] = <null>, [2] = 42, [3] = 43}
""");
}

[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
33 changes: 33 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatReadOnlyDictionary.ContainsValue.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,39 @@ public sealed class ContainsValue
{
public sealed class Tests
{
[Fact]
public async Task WhenNullValueDoesNotExist_ShouldFail()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).ContainsValue(null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
contains value <null>,
but it contained only [
41,
42,
43
]

Dictionary:
{[1] = 41, [2] = 42, [3] = 43}
""");
}

[Fact]
public async Task WhenNullValueExists_ShouldSucceed()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, null, 43,]);

async Task Act()
=> await That(subject).ContainsValue(null);

await That(Act).DoesNotThrow();
}
[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
36 changes: 36 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatReadOnlyDictionary.ContainsValues.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ async Task Act()
await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenAllValuesExists_WithNull_ShouldSucceed()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [null, 42, 43,]);

async Task Act()
=> await That(subject).ContainsValues(42, null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenOneValueIsMissing_ShouldFail()
{
Expand All @@ -45,6 +56,31 @@ ] in [
""");
}

[Fact]
public async Task WhenOneValueIsMissing_WithNull_ShouldFail()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).ContainsValues(42, null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
contains values [42, <null>],
but it did not contain [
<null>
] in [
41,
42,
43
]

Dictionary:
{[1] = 41, [2] = 42, [3] = 43}
""");
}

[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
30 changes: 30 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatReadOnlyDictionary.DoesNotContainValue.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,36 @@ public sealed class DoesNotContainValue
{
public sealed class Tests
{
[Fact]
public async Task WhenNullValueDoesNotExist_ShouldSucceed()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValue(null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenNullValueExists_ShouldFail()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, null, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValue(null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
does not contain value <null>,
but it did

Dictionary:
{[1] = 41, [2] = <null>, [3] = 43}
""");
}

[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
32 changes: 32 additions & 0 deletions Tests/aweXpect.Tests/Collections/ThatReadOnlyDictionary.DoesNotContainValues.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ async Task Act()
await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenAllValuesDoNotExist_WithNull_ShouldSucceed()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [41, 42, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValues(2, null);

await That(Act).DoesNotThrow();
}

[Fact]
public async Task WhenAtLeastOneValueExists_ShouldFail()
{
Expand All @@ -41,6 +52,27 @@ but it did contain [
""");
}

[Fact]
public async Task WhenAtLeastOneValueExists_WithNull_ShouldFail()
{
IReadOnlyDictionary<int, int?> subject = ToDictionary<int, int?>([1, 2, 3,], [null, 42, 43,]);

async Task Act()
=> await That(subject).DoesNotContainValues(2, null);

await That(Act).Throws<XunitException>()
.WithMessage("""
Expected that subject
does not contain values [2, <null>],
but it did contain [
<null>
]

Dictionary:
{[1] = <null>, [2] = 42, [3] = 43}
""");
}

[Fact]
public async Task WhenSubjectIsNull_ShouldFail()
{
Expand Down
Loading