This is an automated email from the ASF dual-hosted git repository. kenhuuu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 32ec7f97c0464cb015bdc7cf766a94e6fbb71210 Merge: f624e37394 4230c97f83 Author: Ken Hu <[email protected]> AuthorDate: Mon Oct 16 15:12:04 2023 -0700 Merge branch '3.6-dev' .../Gherkin/CommonSteps.cs | 12 ++++++++++ .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 1 + gremlin-go/driver/cucumber/cucumberSteps_test.go | 28 ++++++++++++++++++++++ gremlin-go/driver/cucumber/gremlin.go | 1 + .../test/cucumber/feature-steps.js | 1 + .../gremlin-javascript/test/cucumber/gremlin.js | 1 + gremlin-python/src/main/python/radish/gremlin.py | 1 + .../tinkerpop/gremlin/features/StepDefinition.java | 7 +++--- .../gremlin/test/features/filter/Dedup.feature | 17 +++++++++++++ 9 files changed, 65 insertions(+), 4 deletions(-) diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs index 8f8e3eaec1,29e6a1bea4..03c914b51a --- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs +++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs @@@ -286,8 -284,20 +286,20 @@@ namespace Gremlin.Net.IntegrationTest.G } Assert.True(expectedArrayContainsResultDictionary); } + else if (resultItem is HashSet<object> resultItemSet) + { + var expectedArrayContainsResultAsSet = false; + foreach (var expectedItem in expectedArray) + { + if (expectedItem is not HashSet<object> expectedItemSet) continue; + if (!expectedItemSet.SetEquals(resultItemSet)) continue; + expectedArrayContainsResultAsSet = true; + break; + } + Assert.True(expectedArrayContainsResultAsSet); + } else if (resultItem is double resultItemDouble && - expectedArray.Select(e => e.GetType()).Any(t => t == typeof(decimal))) + expectedArray.Select(e => e!.GetType()).Any(t => t == typeof(decimal))) { // Java seems to use BigDecimal by default sometimes where .NET uses double, but we only // care for the value not its type here. So we just convert these to decimal (equivalent
