diff --git a/CHANGELOG.md b/CHANGELOG.md index 6feba82501..d87902a707 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `Fake.Core.SemVer` from 6.1.0 to 6.1.3 - Bumps `Bogus` from 35.6.0 to 35.6.1 - Bumps `Fake.Core.Environment` from 6.1.0 to 6.1.3 -- Bumps `FluentAssertions` from 6.12.0 to 7.0.0 +- Bumps `FluentAssertions` from 6.12.0 to 8.0.1 - Bumps `Microsoft.NET.Test.Sdk` from 17.11.0 to 17.12.0 - Bumps `Microsoft.TestPlatform.ObjectModel` from 17.11.0 to 17.12.0 - Bumps `BenchMarkDotNet` from 0.13.12 to 0.14.0 @@ -44,6 +44,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `NSwag.Core` from 14.1.0 to 14.2.0 - Bumps `Argu` from 6.2.4 to 6.2.5 - Bumps `SemanticVersioning` from 2.0.2 to 3.0.0 +- Bumps `FSharp.Data` from 6.4.0 to 6.4.1 ## [1.8.0] ### Added @@ -237,4 +238,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) [1.6.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...v1.6.0 [1.5.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.4.0...v1.5.0 [1.4.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.3.0...v1.4.0 -[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0 \ No newline at end of file +[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0 diff --git a/tests/Tests.Core/Tests.Core.csproj b/tests/Tests.Core/Tests.Core.csproj index c1426b76e8..2ce5b9657a 100644 --- a/tests/Tests.Core/Tests.Core.csproj +++ b/tests/Tests.Core/Tests.Core.csproj @@ -20,7 +20,7 @@ - + diff --git a/tests/Tests.Reproduce/GithubIssue2323.cs b/tests/Tests.Reproduce/GithubIssue2323.cs index 575e01defe..430e0b3dec 100644 --- a/tests/Tests.Reproduce/GithubIssue2323.cs +++ b/tests/Tests.Reproduce/GithubIssue2323.cs @@ -71,7 +71,7 @@ public void NestedInnerHitsShouldIncludedNestedProperty() hitMetadata.Nested.Should().NotBeNull(); hitMetadata.Nested.Field.Should().Be(new Field("tags")); - hitMetadata.Nested.Offset.Should().BeGreaterOrEqualTo(0); + hitMetadata.Nested.Offset.Should().BeGreaterThanOrEqualTo(0); } } } diff --git a/tests/Tests.Reproduce/GithubIssue3715.cs b/tests/Tests.Reproduce/GithubIssue3715.cs index 5369415254..d922bfb32d 100644 --- a/tests/Tests.Reproduce/GithubIssue3715.cs +++ b/tests/Tests.Reproduce/GithubIssue3715.cs @@ -667,7 +667,7 @@ private static void AssertExtendedStats(AggregateDictionary bucket, string name) { var extendedStatsAggregate = bucket.ExtendedStats(name); extendedStatsAggregate.Should().NotBeNull(); - extendedStatsAggregate.Count.Should().BeGreaterOrEqualTo(0); + extendedStatsAggregate.Count.Should().BeGreaterThanOrEqualTo(0); extendedStatsAggregate.StdDeviationBounds.Should().NotBeNull(); } diff --git a/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj b/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj index 6dbdc01cc4..48b022856c 100644 --- a/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj +++ b/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj @@ -32,7 +32,7 @@ - + diff --git a/tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs index 2f223425f2..c88b7d0851 100644 --- a/tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs @@ -148,7 +148,7 @@ protected override void ExpectResponse(ISearchResponse response) commits.Buckets.Should().NotBeNull(); foreach (var bucket in commits.Buckets) - bucket.Key.Should().BeGreaterOrEqualTo(HardBoundsMinimum).And.BeLessOrEqualTo(HardBoundsMaximum); + bucket.Key.Should().BeGreaterThanOrEqualTo(HardBoundsMinimum).And.BeLessThanOrEqualTo(HardBoundsMaximum); } } } diff --git a/tests/Tests/Aggregations/Bucket/RareTerms/RareTermsAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/RareTerms/RareTermsAggregationUsageTests.cs index f4d2904f81..a49abf644c 100644 --- a/tests/Tests/Aggregations/Bucket/RareTerms/RareTermsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Bucket/RareTerms/RareTermsAggregationUsageTests.cs @@ -99,7 +99,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in rareTerms.Buckets) { item.Key.Should().NotBeNullOrEmpty(); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } rareTerms.Meta.Should().NotBeNull().And.HaveCount(1); rareTerms.Meta["foo"].Should().Be("bar"); diff --git a/tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs index 81200eee23..671b08ed11 100644 --- a/tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs @@ -268,7 +268,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in commits.Buckets) { item.Key.Should().BeGreaterThan(0); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } } } diff --git a/tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs index 8f22ba4da0..d0bf7a6d7a 100644 --- a/tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs @@ -129,7 +129,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in states.Buckets) { item.Key.Should().NotBeNullOrEmpty(); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } states.Meta.Should().NotBeNull().And.HaveCount(1); states.Meta["foo"].Should().Be("bar"); @@ -225,7 +225,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in states.Buckets) { item.Key.Should().BeDefined(); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } states.Meta.Should().NotBeNull().And.HaveCount(1); states.Meta["foo"].Should().Be("bar"); @@ -321,7 +321,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in states.Buckets) { item.Key.Should().NotBeNullOrEmpty(); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } states.Meta.Should().NotBeNull().And.HaveCount(1); states.Meta["foo"].Should().Be("bar"); @@ -383,7 +383,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in commits.Buckets) { item.Key.Should().BeGreaterThan(0); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } } } @@ -438,7 +438,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in commits.Buckets) { item.Key.Should().BeGreaterThan(0); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); } commits.Buckets.Should().Contain(b => b.DocCountErrorUpperBound.HasValue); } @@ -504,7 +504,7 @@ protected override void ExpectResponse(ISearchResponse response) foreach (var item in commits.Buckets) { item.Key.Should().BeGreaterThan(0); - item.DocCount.Should().BeGreaterOrEqualTo(1); + item.DocCount.Should().BeGreaterThanOrEqualTo(1); var states = item.Terms("state"); states.Should().NotBeNull(); states.Buckets.Should().NotBeEmpty(); diff --git a/tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs b/tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs index 1d6e4af98d..92dd458bcb 100644 --- a/tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs @@ -122,7 +122,7 @@ protected override void ExpectResponse(ISearchResponse response) { var commits = item.Sum("commits"); commits.Should().NotBeNull(); - commits.Value.Should().BeGreaterOrEqualTo(500); + commits.Value.Should().BeGreaterThanOrEqualTo(500); } } } diff --git a/tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs b/tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs index 6dd24341e7..28093a2606 100644 --- a/tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs @@ -134,7 +134,7 @@ protected override void ExpectResponse(ISearchResponse response) var numberOfCommits = value.Value; if (Math.Abs(previousCommits - (-1)) > double.Epsilon) - numberOfCommits.Should().BeLessOrEqualTo(previousCommits); + numberOfCommits.Should().BeLessThanOrEqualTo(previousCommits); previousCommits = numberOfCommits; } diff --git a/tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs b/tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs index 0e3e150303..f318785d79 100644 --- a/tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs @@ -105,7 +105,7 @@ protected override void ExpectResponse(ISearchResponse response) maxCommits.Should().NotBeNull(); maxCommits.Value.Should().BeGreaterThan(0); maxCommits.Keys.Should().NotBeNull(); - maxCommits.Keys.Count.Should().BeGreaterOrEqualTo(1); + maxCommits.Keys.Count.Should().BeGreaterThanOrEqualTo(1); foreach (var key in maxCommits.Keys) key.Should().NotBeNull(); } diff --git a/tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs b/tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs index 8a6489f884..991896d29a 100644 --- a/tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs @@ -105,7 +105,7 @@ protected override void ExpectResponse(ISearchResponse response) minCommits.Should().NotBeNull(); minCommits.Value.Should().BeGreaterThan(0); minCommits.Keys.Should().NotBeNull(); - minCommits.Keys.Count.Should().BeGreaterOrEqualTo(1); + minCommits.Keys.Count.Should().BeGreaterThanOrEqualTo(1); foreach (var key in minCommits.Keys) key.Should().NotBeNullOrEmpty(); } diff --git a/tests/Tests/ClientConcepts/Connection/ConnectionReuseAndBalancing.cs b/tests/Tests/ClientConcepts/Connection/ConnectionReuseAndBalancing.cs index 0ad905bc99..6f4a57d782 100644 --- a/tests/Tests/ClientConcepts/Connection/ConnectionReuseAndBalancing.cs +++ b/tests/Tests/ClientConcepts/Connection/ConnectionReuseAndBalancing.cs @@ -89,7 +89,7 @@ private static void AssertHttpStats(IOpenSearchClient c, NodesStatsResponse r, i { node.Http.TotalOpened.Should().BeGreaterThan(2, "We want to see some concurrency"); var h = node.Http; - node.Http.CurrentOpen.Should().BeLessOrEqualTo(maxCurrentOpen, $"CurrentOpen exceed our connection limit {maxCurrent}"); + node.Http.CurrentOpen.Should().BeLessThanOrEqualTo(maxCurrentOpen, $"CurrentOpen exceed our connection limit {maxCurrent}"); string errorMessage; int iterationMax; @@ -109,7 +109,7 @@ private static void AssertHttpStats(IOpenSearchClient c, NodesStatsResponse r, i errorMessage = $"Expected some socket bleeding but iteration {i} exceeded iteration specific max {iterationMax} = (({maxCurrent} * {m}) / 2) + {leeWay}"; } - node.Http.TotalOpened.Should().BeLessOrEqualTo(iterationMax, errorMessage); + node.Http.TotalOpened.Should().BeLessThanOrEqualTo(iterationMax, errorMessage); if (i == -1) return; Console.WriteLine( diff --git a/tests/Tests/ClientConcepts/Troubleshooting/DeprecationLogging.doc.cs b/tests/Tests/ClientConcepts/Troubleshooting/DeprecationLogging.doc.cs index 1f92f67dea..84564db242 100644 --- a/tests/Tests/ClientConcepts/Troubleshooting/DeprecationLogging.doc.cs +++ b/tests/Tests/ClientConcepts/Troubleshooting/DeprecationLogging.doc.cs @@ -77,7 +77,7 @@ public void RequestWithMultipleWarning() var response = this.Client.Search(request); response.ApiCall.DeprecationWarnings.Should().NotBeNullOrEmpty(); - response.ApiCall.DeprecationWarnings.Should().HaveCountGreaterOrEqualTo(2); + response.ApiCall.DeprecationWarnings.Should().HaveCountGreaterThanOrEqualTo(2); response.DebugInformation.Should().Contain("Deprecated aggregation order key"); // <1> `DebugInformation` also contains the deprecation warnings } } diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs index 482219e652..0d4f2ec2c3 100644 --- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs +++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs @@ -61,10 +61,10 @@ protected override void ExpectResponse(ClusterHealthResponse response) response.ClusterName.Should().NotBeNullOrWhiteSpace(); response.Status.Should().NotBe(HealthStatus.Red); response.TimedOut.Should().BeFalse(); - response.NumberOfNodes.Should().BeGreaterOrEqualTo(1); - response.NumberOfDataNodes.Should().BeGreaterOrEqualTo(1); - response.ActivePrimaryShards.Should().BeGreaterOrEqualTo(1); - response.ActiveShards.Should().BeGreaterOrEqualTo(1); + response.NumberOfNodes.Should().BeGreaterThanOrEqualTo(1); + response.NumberOfDataNodes.Should().BeGreaterThanOrEqualTo(1); + response.ActivePrimaryShards.Should().BeGreaterThanOrEqualTo(1); + response.ActiveShards.Should().BeGreaterThanOrEqualTo(1); } } @@ -93,14 +93,14 @@ protected override void ExpectResponse(ClusterHealthResponse response) response.ClusterName.Should().NotBeNullOrWhiteSpace(); response.Status.Should().NotBe(HealthStatus.Red); response.TimedOut.Should().BeFalse(); - response.NumberOfNodes.Should().BeGreaterOrEqualTo(1); - response.NumberOfDataNodes.Should().BeGreaterOrEqualTo(1); - response.ActivePrimaryShards.Should().BeGreaterOrEqualTo(1); - response.ActiveShards.Should().BeGreaterOrEqualTo(1); + response.NumberOfNodes.Should().BeGreaterThanOrEqualTo(1); + response.NumberOfDataNodes.Should().BeGreaterThanOrEqualTo(1); + response.ActivePrimaryShards.Should().BeGreaterThanOrEqualTo(1); + response.ActiveShards.Should().BeGreaterThanOrEqualTo(1); response.ActiveShardsPercentAsNumber.Should().BePositive(); response.DelayedUnassignedShards.Should().Be(0); - response.NumberOfInFlightFetch.Should().BeGreaterOrEqualTo(0); - response.TaskMaxWaitTimeInQueueInMilliseconds.Should().BeGreaterOrEqualTo(0); + response.NumberOfInFlightFetch.Should().BeGreaterThanOrEqualTo(0); + response.TaskMaxWaitTimeInQueueInMilliseconds.Should().BeGreaterThanOrEqualTo(0); response.Indices.Should() .NotBeEmpty() diff --git a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs index 289ff0142a..a46865910d 100644 --- a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs +++ b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs @@ -71,9 +71,9 @@ protected void Assert(ClusterNodesStats nodes) nodes.Should().NotBeNull(); nodes.Count.Should().NotBeNull(); if (Cluster.ClusterConfiguration.Version < "2.0.0") - nodes.Count.Master.Should().BeGreaterOrEqualTo(1); + nodes.Count.Master.Should().BeGreaterThanOrEqualTo(1); else - nodes.Count.ClusterManager.Should().BeGreaterOrEqualTo(1); + nodes.Count.ClusterManager.Should().BeGreaterThanOrEqualTo(1); nodes.FileSystem.Should().NotBeNull(); nodes.FileSystem.AvailableInBytes.Should().BeGreaterThan(0); diff --git a/tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs b/tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs index ac84be15bb..024da90a00 100644 --- a/tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs +++ b/tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs @@ -132,8 +132,8 @@ protected void Assert(NodeJvmInfo jvm) jvm.GcCollectors.Should().NotBeEmpty(); jvm.MemoryPools.Should().NotBeEmpty(); jvm.Memory.Should().NotBeNull(); - jvm.Memory.DirectMaxInBytes.Should().BeGreaterOrEqualTo(0); - jvm.Memory.NonHeapMaxInBytes.Should().BeGreaterOrEqualTo(0); + jvm.Memory.DirectMaxInBytes.Should().BeGreaterThanOrEqualTo(0); + jvm.Memory.NonHeapMaxInBytes.Should().BeGreaterThanOrEqualTo(0); jvm.Memory.NonHeapInitInBytes.Should().BeGreaterThan(0); jvm.Memory.HeapMaxInBytes.Should().BeGreaterThan(0); jvm.Memory.HeapInitInBytes.Should().BeGreaterThan(0); @@ -145,7 +145,7 @@ protected void Assert(IReadOnlyDictionary pools) var pool = pools["fetch_shard_store"]; pool.KeepAlive.Should().NotBeNullOrWhiteSpace(); pool.Type.Should().Be("scaling"); - pool.QueueSize.Should().BeGreaterOrEqualTo(-1); + pool.QueueSize.Should().BeGreaterThanOrEqualTo(-1); // both should have a value for a scaling pool pool.Core.Should().HaveValue(); diff --git a/tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs b/tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs index e8c8c62f5e..f3f273b6e2 100644 --- a/tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs +++ b/tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs @@ -226,7 +226,7 @@ protected void Assert(NodeJvmStats jvm) jvm.Classes.Should().NotBeNull(); //jvm.Classes.CurrentLoadedCount.Should().BeGreaterThan(0); //jvm.Classes.TotalLoadedCount.Should().BeGreaterThan(0); - //jvm.Classes.TotalUnloadedCount.Should().BeGreaterOrEqualTo(0); + //jvm.Classes.TotalUnloadedCount.Should().BeGreaterThanOrEqualTo(0); jvm.GarbageCollection.Should().NotBeNull(); jvm.GarbageCollection.Collectors.Should().NotBeEmpty().And.ContainKey("young"); @@ -257,33 +257,33 @@ protected void Assert(NodeJvmStats jvm) protected void Assert(IndexingPressureStats indexingPressureStats) { - indexingPressureStats.Memory.LimitInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.LimitInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Limit.Should().NotBeNull(); - indexingPressureStats.Memory.Current.CombinedCoordinatingAndPrimaryInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Current.CombinedCoordinatingAndPrimaryInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Current.CombinedCoordinatingAndPrimary.Should().NotBeNull(); - indexingPressureStats.Memory.Current.CoordinatingInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Current.CoordinatingInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Current.Coordinating.Should().NotBeNull(); - indexingPressureStats.Memory.Current.PrimaryInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Current.PrimaryInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Current.Primary.Should().NotBeNull(); - indexingPressureStats.Memory.Current.ReplicaInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Current.ReplicaInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Current.Replica.Should().NotBeNull(); - indexingPressureStats.Memory.Current.AllInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Current.AllInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Current.All.Should().NotBeNull(); - indexingPressureStats.Memory.Total.CombinedCoordinatingAndPrimaryInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Total.CombinedCoordinatingAndPrimaryInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Total.CombinedCoordinatingAndPrimary.Should().NotBeNull(); - indexingPressureStats.Memory.Total.CoordinatingInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Total.CoordinatingInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Total.Coordinating.Should().NotBeNull(); - indexingPressureStats.Memory.Total.PrimaryInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Total.PrimaryInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Total.Primary.Should().NotBeNull(); - indexingPressureStats.Memory.Total.ReplicaInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Total.ReplicaInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Total.Replica.Should().NotBeNull(); - indexingPressureStats.Memory.Total.AllInBytes.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Total.AllInBytes.Should().BeGreaterThanOrEqualTo(0); //indexingPressureStats.Memory.Total.All.Should().NotBeNull(); - indexingPressureStats.Memory.Total.CoordinatingRejections.Should().BeGreaterOrEqualTo(0); - indexingPressureStats.Memory.Total.PrimaryRejections.Should().BeGreaterOrEqualTo(0); - indexingPressureStats.Memory.Total.ReplicaRejections.Should().BeGreaterOrEqualTo(0); + indexingPressureStats.Memory.Total.CoordinatingRejections.Should().BeGreaterThanOrEqualTo(0); + indexingPressureStats.Memory.Total.PrimaryRejections.Should().BeGreaterThanOrEqualTo(0); + indexingPressureStats.Memory.Total.ReplicaRejections.Should().BeGreaterThanOrEqualTo(0); } } } diff --git a/tests/Tests/Cluster/ReloadSecureSettings/ReloadSecureSettingsApiTests.cs b/tests/Tests/Cluster/ReloadSecureSettings/ReloadSecureSettingsApiTests.cs index 1c2ba74a0a..185f3138e4 100644 --- a/tests/Tests/Cluster/ReloadSecureSettings/ReloadSecureSettingsApiTests.cs +++ b/tests/Tests/Cluster/ReloadSecureSettings/ReloadSecureSettingsApiTests.cs @@ -57,8 +57,8 @@ protected override void ExpectResponse(ReloadSecureSettingsResponse response) { response.Nodes.Should().NotBeEmpty(); response.NodeStatistics.Should().NotBeNull(); - response.NodeStatistics.Total.Should().BeGreaterOrEqualTo(1); - response.NodeStatistics.Successful.Should().BeGreaterOrEqualTo(1); + response.NodeStatistics.Total.Should().BeGreaterThanOrEqualTo(1); + response.NodeStatistics.Successful.Should().BeGreaterThanOrEqualTo(1); response.ClusterName.Should().NotBeNullOrWhiteSpace(); } diff --git a/tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs b/tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs index d000c5e659..8e2917579a 100644 --- a/tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs +++ b/tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs @@ -77,7 +77,7 @@ protected override void ExpectResponse(ListTasksResponse response) taskExecutingNode.Name.Should().NotBeNullOrWhiteSpace(); taskExecutingNode.TransportAddress.Should().NotBeNullOrWhiteSpace(); taskExecutingNode.Tasks.Should().NotBeEmpty(); - taskExecutingNode.Tasks.Count().Should().BeGreaterOrEqualTo(2); + taskExecutingNode.Tasks.Count().Should().BeGreaterThanOrEqualTo(2); var task = taskExecutingNode.Tasks.Values.First(p => p.ParentTaskId != null); task.Action.Should().NotBeNullOrWhiteSpace(); @@ -163,7 +163,7 @@ protected override void ExpectResponse(ListTasksResponse response) taskExecutingNode.Name.Should().NotBeNullOrWhiteSpace(); taskExecutingNode.TransportAddress.Should().NotBeNullOrWhiteSpace(); taskExecutingNode.Tasks.Should().NotBeEmpty(); - taskExecutingNode.Tasks.Count().Should().BeGreaterOrEqualTo(1); + taskExecutingNode.Tasks.Count.Should().BeGreaterThanOrEqualTo(1); var task = taskExecutingNode.Tasks[_taskId]; task.Action.Should().NotBeNullOrWhiteSpace(); @@ -175,8 +175,8 @@ protected override void ExpectResponse(ListTasksResponse response) var status = task.Status; status.Should().NotBeNull(); - status.Total.Should().BeGreaterOrEqualTo(0); - status.Batches.Should().BeGreaterOrEqualTo(0); + status.Total.Should().BeGreaterThanOrEqualTo(0); + status.Batches.Should().BeGreaterThanOrEqualTo(0); } } } diff --git a/tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs b/tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs index 9852724368..fdd1b1847b 100644 --- a/tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs +++ b/tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs @@ -179,7 +179,7 @@ protected override void ExpectResponse(BulkResponse response) item.Shards.Should().NotBeNull(); item.Shards.Total.Should().BeGreaterThan(0); item.Shards.Successful.Should().BeGreaterThan(0); - item.SequenceNumber.Should().BeGreaterOrEqualTo(0); + item.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); item.PrimaryTerm.Should().BeGreaterThan(0); item.Result.Should().NotBeNullOrEmpty(); } diff --git a/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs b/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs index 2a62b2df42..c2777a4fcb 100644 --- a/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs +++ b/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs @@ -76,7 +76,7 @@ [I] public async Task SubscribeHitsOnError() b => { Interlocked.Increment(ref seenPages); - b.Page.Should().BeLessOrEqualTo(FailAfterPage - 1); + b.Page.Should().BeLessThanOrEqualTo(FailAfterPage - 1); }, e => { diff --git a/tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs b/tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs index feaab016eb..36fe5f918b 100644 --- a/tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs +++ b/tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs @@ -199,8 +199,8 @@ protected override void ExpectResponse(MultiGetResponse response) hit.Id.Should().NotBeNullOrWhiteSpace(); hit.Found.Should().BeTrue(); hit.Version.Should().Be(1); - hit.PrimaryTerm.Should().BeGreaterOrEqualTo(1); - hit.SequenceNumber.Should().BeGreaterOrEqualTo(0); + hit.PrimaryTerm.Should().BeGreaterThanOrEqualTo(1); + hit.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); hit.Source.ShouldAdhereToSourceSerializerWhenSet(); } } diff --git a/tests/Tests/Document/Single/Create/CreateApiTests.cs b/tests/Tests/Document/Single/Create/CreateApiTests.cs index d1fd07e0f8..99ff4e8414 100644 --- a/tests/Tests/Document/Single/Create/CreateApiTests.cs +++ b/tests/Tests/Document/Single/Create/CreateApiTests.cs @@ -134,7 +134,7 @@ public void CreateWithSameIndexTypeAndId() createResponse.Shards.Total.Should().BeGreaterThan(0); createResponse.Shards.Successful.Should().BeGreaterThan(0); createResponse.PrimaryTerm.Should().BeGreaterThan(0); - createResponse.SequenceNumber.Should().BeGreaterOrEqualTo(0); + createResponse.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); createResponse = Client.Create(project, f => f .Index(index) diff --git a/tests/Tests/Document/Single/Delete/DeleteApiTests.cs b/tests/Tests/Document/Single/Delete/DeleteApiTests.cs index 8d18a563d8..459939dc60 100644 --- a/tests/Tests/Document/Single/Delete/DeleteApiTests.cs +++ b/tests/Tests/Document/Single/Delete/DeleteApiTests.cs @@ -73,8 +73,8 @@ protected override void ExpectResponse(DeleteResponse response) response.ShouldBeValid(); response.Result.Should().Be(Result.Deleted); response.Shards.Should().NotBeNull(); - response.Shards.Total.Should().BeGreaterOrEqualTo(1); - response.Shards.Successful.Should().BeGreaterOrEqualTo(1); + response.Shards.Total.Should().BeGreaterThanOrEqualTo(1); + response.Shards.Successful.Should().BeGreaterThanOrEqualTo(1); response.PrimaryTerm.Should().BeGreaterThan(0); response.SequenceNumber.Should().BeGreaterThan(0); } @@ -113,8 +113,8 @@ protected override void ExpectResponse(DeleteResponse response) if (Cluster.ClusterConfiguration.Version < "2.0.0") response.Type.Should().Be("_doc"); response.Id.Should().Be(CallIsolatedValue); - response.Shards.Total.Should().BeGreaterOrEqualTo(1); - response.Shards.Successful.Should().BeGreaterOrEqualTo(1); + response.Shards.Total.Should().BeGreaterThanOrEqualTo(1); + response.Shards.Successful.Should().BeGreaterThanOrEqualTo(1); response.PrimaryTerm.Should().BeGreaterThan(0); response.SequenceNumber.Should().BeGreaterThan(0); } diff --git a/tests/Tests/Document/Single/DocumentCrudTests.cs b/tests/Tests/Document/Single/DocumentCrudTests.cs index 4ed3908c75..3646963fee 100644 --- a/tests/Tests/Document/Single/DocumentCrudTests.cs +++ b/tests/Tests/Document/Single/DocumentCrudTests.cs @@ -106,7 +106,7 @@ [I] protected async Task DocumentIsUpdated() => await AssertOnGetAfterUpdate(r = { r.Source.Should().NotBeNull(); r.Version.Should().BeGreaterThan(1); - r.SequenceNumber.Should().BeGreaterOrEqualTo(1); + r.SequenceNumber.Should().BeGreaterThanOrEqualTo(1); r.PrimaryTerm.Should().BeGreaterThan(0); r.Source.Description.Should().EndWith("updated"); }); diff --git a/tests/Tests/Document/Single/Get/GetApiTests.cs b/tests/Tests/Document/Single/Get/GetApiTests.cs index 36053471e3..28a7eb7ad5 100644 --- a/tests/Tests/Document/Single/Get/GetApiTests.cs +++ b/tests/Tests/Document/Single/Get/GetApiTests.cs @@ -75,8 +75,8 @@ protected override void ExpectResponse(GetResponse response) response.SequenceNumber.Should().HaveValue(); response.PrimaryTerm.Should().HaveValue(); response.Source.ShouldAdhereToSourceSerializerWhenSet(); - response.SequenceNumber.Should().BeGreaterOrEqualTo(0); - response.PrimaryTerm.Should().BeGreaterOrEqualTo(1); + response.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); + response.PrimaryTerm.Should().BeGreaterThanOrEqualTo(1); } } diff --git a/tests/Tests/Document/Single/Index/IndexApiTests.cs b/tests/Tests/Document/Single/Index/IndexApiTests.cs index 819e434efc..dbc190c334 100644 --- a/tests/Tests/Document/Single/Index/IndexApiTests.cs +++ b/tests/Tests/Document/Single/Index/IndexApiTests.cs @@ -159,9 +159,9 @@ public void Index() indexResult.Id.Should().Be(commitActivity.Id); indexResult.Version.Should().Be(1); indexResult.Shards.Should().NotBeNull(); - indexResult.Shards.Total.Should().BeGreaterOrEqualTo(1); - indexResult.Shards.Successful.Should().BeGreaterOrEqualTo(1); - indexResult.SequenceNumber.Should().BeGreaterOrEqualTo(0); + indexResult.Shards.Total.Should().BeGreaterThanOrEqualTo(1); + indexResult.Shards.Successful.Should().BeGreaterThanOrEqualTo(1); + indexResult.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); indexResult.PrimaryTerm.Should().BeGreaterThan(0); indexResult = Client.Index(commitActivity, f => f.Index(indexName)); @@ -213,9 +213,9 @@ public void Index() if (Cluster.ClusterConfiguration.Version < "2.0.0") indexResult.Type.Should().Be("_doc"); indexResult.Shards.Should().NotBeNull(); - indexResult.Shards.Total.Should().BeGreaterOrEqualTo(1); - indexResult.Shards.Successful.Should().BeGreaterOrEqualTo(1); - indexResult.SequenceNumber.Should().BeGreaterOrEqualTo(0); + indexResult.Shards.Total.Should().BeGreaterThanOrEqualTo(1); + indexResult.Shards.Successful.Should().BeGreaterThanOrEqualTo(1); + indexResult.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); indexResult.PrimaryTerm.Should().BeGreaterThan(0); var bulkResponse = Client.Bulk(b => b @@ -231,9 +231,9 @@ public void Index() item.IsValid.Should().BeTrue(); item.Status.Should().Be(201); item.Shards.Should().NotBeNull(); - item.Shards.Total.Should().BeGreaterOrEqualTo(1); - item.Shards.Successful.Should().BeGreaterOrEqualTo(1); - item.SequenceNumber.Should().BeGreaterOrEqualTo(0); + item.Shards.Total.Should().BeGreaterThanOrEqualTo(1); + item.Shards.Successful.Should().BeGreaterThanOrEqualTo(1); + item.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); item.PrimaryTerm.Should().BeGreaterThan(0); } } @@ -270,9 +270,9 @@ [I] public void Index() if (Cluster.ClusterConfiguration.Version < "2.0.0") indexResult.Type.Should().StartWith("_doc"); indexResult.Shards.Should().NotBeNull(); - indexResult.Shards.Total.Should().BeGreaterOrEqualTo(1); - indexResult.Shards.Successful.Should().BeGreaterOrEqualTo(1); - indexResult.SequenceNumber.Should().BeGreaterOrEqualTo(0); + indexResult.Shards.Total.Should().BeGreaterThanOrEqualTo(1); + indexResult.Shards.Successful.Should().BeGreaterThanOrEqualTo(1); + indexResult.SequenceNumber.Should().BeGreaterThanOrEqualTo(0); indexResult.PrimaryTerm.Should().BeGreaterThan(0); } } diff --git a/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs b/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs index 3cccc1072a..1e326fd285 100644 --- a/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs +++ b/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs @@ -177,7 +177,7 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal protected override void ExpectResponse(ExecutePainlessScriptResponse response) { response.ShouldBeValid(); - response.Result.Should().BeGreaterOrEqualTo(0); + response.Result.Should().BeGreaterThanOrEqualTo(0); } [SuppressMessage("ReSharper", "UnusedMember.Local")] diff --git a/tests/Tests/QueryDsl/Geo/GeoShape/GeoWKTTests.cs b/tests/Tests/QueryDsl/Geo/GeoShape/GeoWKTTests.cs index 6addfe26b0..7822293ee2 100644 --- a/tests/Tests/QueryDsl/Geo/GeoShape/GeoWKTTests.cs +++ b/tests/Tests/QueryDsl/Geo/GeoShape/GeoWKTTests.cs @@ -123,8 +123,8 @@ public void ReadMultiLineString() foreach (var lineString in multiLineString.Coordinates) foreach (var coordinate in lineString) { - coordinate.Latitude.Should().BeGreaterOrEqualTo(0).And.BeLessOrEqualTo(3); - coordinate.Longitude.Should().BeGreaterOrEqualTo(100).And.BeLessOrEqualTo(103); + coordinate.Latitude.Should().BeGreaterThanOrEqualTo(0).And.BeLessThanOrEqualTo(3); + coordinate.Longitude.Should().BeGreaterThanOrEqualTo(100).And.BeLessThanOrEqualTo(103); } } @@ -168,8 +168,8 @@ public void ReadPolygon() foreach (var ring in polygon.Coordinates) foreach (var coordinate in ring) { - coordinate.Latitude.Should().BeLessOrEqualTo(1.0); - coordinate.Longitude.Should().BeGreaterOrEqualTo(100.0); + coordinate.Latitude.Should().BeLessThanOrEqualTo(1.0); + coordinate.Longitude.Should().BeGreaterThanOrEqualTo(100.0); } } @@ -219,8 +219,8 @@ public void ReadMultiPolygon() ring.Should().HaveCount(5); foreach (var coordinate in ring) { - coordinate.Latitude.Should().BeLessOrEqualTo(3.0).And.BeGreaterOrEqualTo(0); - coordinate.Longitude.Should().BeGreaterOrEqualTo(100.0).And.BeLessOrEqualTo(103.0); + coordinate.Latitude.Should().BeLessThanOrEqualTo(3.0).And.BeGreaterThanOrEqualTo(0); + coordinate.Longitude.Should().BeGreaterThanOrEqualTo(100.0).And.BeLessThanOrEqualTo(103.0); } } } diff --git a/tests/Tests/Search/Hits/HitsSerializationTests.cs b/tests/Tests/Search/Hits/HitsSerializationTests.cs index 8057306cda..cc0b477d13 100644 --- a/tests/Tests/Search/Hits/HitsSerializationTests.cs +++ b/tests/Tests/Search/Hits/HitsSerializationTests.cs @@ -318,12 +318,12 @@ public void CanDeserializeNestedNestedTopHits() nestedIdentity.Should().NotBeNull(); nestedIdentity.Field.Should().NotBeNull(); - nestedIdentity.Offset.Should().BeGreaterOrEqualTo(0); + nestedIdentity.Offset.Should().BeGreaterThanOrEqualTo(0); var nestedNestedIdentity = nestedIdentity.Nested; nestedNestedIdentity.Should().NotBeNull(); nestedNestedIdentity.Field.Should().NotBeNull(); - nestedNestedIdentity.Offset.Should().BeGreaterOrEqualTo(0); + nestedNestedIdentity.Offset.Should().BeGreaterThanOrEqualTo(0); } } diff --git a/tests/Tests/Search/Request/ScriptFieldsUsageTests.cs b/tests/Tests/Search/Request/ScriptFieldsUsageTests.cs index e4db327944..324e492913 100644 --- a/tests/Tests/Search/Request/ScriptFieldsUsageTests.cs +++ b/tests/Tests/Search/Request/ScriptFieldsUsageTests.cs @@ -114,8 +114,8 @@ protected override void ExpectResponse(ISearchResponse response) { foreach (var fields in response.Fields) { - fields.Value("test1").Should().BeGreaterOrEqualTo(0); - fields.Value("test2").Should().BeGreaterOrEqualTo(0); + fields.Value("test1").Should().BeGreaterThanOrEqualTo(0); + fields.Value("test2").Should().BeGreaterThanOrEqualTo(0); } } }