Skip to content
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

Fixed RootPathSegment GetHashCode implementation. #6501

Merged
merged 4 commits into from
Sep 1, 2023
Merged

Fixed RootPathSegment GetHashCode implementation. #6501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4251fe
Fixed RootPathSegment GetHashCode implementation
michaelstaib Sep 1, 2023
ff045c5
edits
michaelstaib Sep 1, 2023
3d99f69
Merge branch 'main' into mst/path-hash-code
michaelstaib Sep 1, 2023
fb64ddd
edits
michaelstaib Sep 1, 2023
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
16 changes: 7 additions & 9 deletions src/HotChocolate/Core/src/Abstractions/Path.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@ namespace HotChocolate;
/// </summary>
public abstract class Path : IEquatable<Path>
{
private readonly Path? _parent;

protected Path()
{
Parent = this;
_parent = null;
Length = 0;
}

protected Path(Path parent)
{
Parent = parent ?? throw new ArgumentNullException(nameof(parent));
_parent = parent ?? throw new ArgumentNullException(nameof(parent));
Length = parent.Length + 1;
}

/// <summary>
/// Gets the parent path segment.
/// </summary>
public Path Parent { get; }
public Path Parent => _parent!;

/// <summary>
/// Gets the count of segments this path contains.
Expand Down Expand Up @@ -238,11 +240,7 @@ public override bool Equals(Path? other)

/// <inheritdoc />
public override int GetHashCode()
{
// ReSharper disable NonReadonlyMemberInGetHashCode
return HashCode.Combine(Parent, Length);
// ReSharper restore NonReadonlyMemberInGetHashCode
}
=> 0;

public static RootPathSegment Instance { get; } = new();
}
Expand Down
13 changes: 13 additions & 0 deletions src/HotChocolate/Core/test/Abstractions.Tests/PathTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ namespace HotChocolate.Execution.Instrumentation;

public class PathExtensionsTests
{
[Fact]
public void GetHashCode_Test()
{
var path = Path.Root.Append("hero");
Assert.NotEqual(0, path.GetHashCode());
}

[Fact]
public void GetHashCode_Root_Test()
{
Assert.Equal(0, Path.Root.GetHashCode());
}

[Fact]
public void Path_ToString()
{
Expand Down
1 change: 1 addition & 0 deletions ...ableCoercionHelperTests.Error_When_Input_Field_Has_Different_Properties_Than_Defined.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "abc",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions .../VariableCoercionHelperTests.Error_When_PlainValue_Type_Does_Not_Match_Variable_Type.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "abc",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...ots__/VariableCoercionHelperTests.Error_When_Value_Type_Does_Not_Match_Variable_Type.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "abc",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
3 changes: 1 addition & 2 deletions src/HotChocolate/Core/test/Types.Tests/Types/InputParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,7 @@ public void OneOf_A_and_B_Are_Set()
new ObjectFieldNode("b", 123));

// act
void Fail()
=> parser.ParseLiteral(data, oneOfInput, Path.Root.Append("root"));
void Fail() => parser.ParseLiteral(data, oneOfInput, Path.Root.Append("root"));

// assert
Assert.Throws<SerializationException>(Fail).Errors.MatchSnapshot();
Expand Down
1 change: 1 addition & 0 deletions ...ate/Core/test/Types.Tests/Types/__snapshots__/InputParserTests.OneOf_A_and_B_Are_Set.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "root",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...est/Types.Tests/Types/__snapshots__/InputParserTests.OneOf_A_is_Null_and_B_has_Value.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "root",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions .../Validation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanArgQuery.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...ts/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanListCannotGoIntoBoolean.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanToBooleanInDirective.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...tion.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntCannotGoIntoBoolean.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...ts/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntNullableToIntWithinFragment.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...napshots__/AllVariableUsagesAreAllowedRuleTests.IntNullableToIntWithinNestedFragment.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...Validation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntToNullableInt.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...eUsagesAreAllowedRuleTests.IntToNullableIntFailsWhenVariableProvidesNullDefaultValue.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...alidation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.ListToNonNullList.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...napshots__/AllVariableUsagesAreAllowedRuleTests.NullableBooleanVariableAsListElement.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...alidation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringOverBoolean.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...s/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToElementIsNullableString.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ..._snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToNullableBooleanInDirective.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...idation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToStringArray.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...alidation.Tests/__snapshots__/ArgumentNamesRuleTests.DirectiveWithWrongArgsIsInvalid.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...st/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.DuplicateDirectiveArguments.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "fieldWithArg",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions ...e/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.InvalidDirectiveArgName.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -66,6 +67,7 @@
"Parent": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions .../Core/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.InvalidFieldArgName.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -60,6 +61,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions ...alidation.Tests/__snapshots__/ArgumentNamesRuleTests.ManyDuplicateDirectiveArguments.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "fieldWithArg",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -60,6 +61,7 @@
"Path": {
"Name": "fieldWithArg",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions ...dation.Tests/__snapshots__/ArgumentNamesRuleTests.MisspelledDirectiveArgsAreReported.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -59,6 +60,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions ...Validation.Tests/__snapshots__/ArgumentNamesRuleTests.MisspelledFieldArgsAreReported.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -60,6 +61,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions ...est/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.UnknownArgsAmongstKnowArgs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -60,6 +61,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
2 changes: 2 additions & 0 deletions ...te/Core/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.UnknownArgsDeeply.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down Expand Up @@ -60,6 +61,7 @@
"Path": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...re/test/Validation.Tests/__snapshots__/ArgumentUniquenessRuleTests.DuplicateArgument.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "arguments",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...eferAndStreamDirectiveLabelsAreUniqueTests.Label_Duplicate_On_Either_Stream_Or_Defer.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "b",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions .../__snapshots__/DeferAndStreamDirectiveLabelsAreUniqueTests.Label_Duplicate_On_Stream.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Path": {
"Name": "b",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
1 change: 1 addition & 0 deletions ...st/Validation.Tests/__snapshots__/DirectivesAreDefinedRuleTests.UnsupportedDirective.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Parent": {
"Name": "dog",
"Parent": {
"Parent": null,
"Length": 0,
"IsRoot": true
},
Expand Down
Loading