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

Bump xunit from 2.4.2 to 2.6.1 #416

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Bump xunit from 2.4.2 to 2.6.1 #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ec2695
Bump xunit from 2.4.2 to 2.6.1
dependabot[bot] Nov 6, 2023
2ddd580
Update changelog
dependabot[bot] Nov 6, 2023
9808b63
Replace usages of `Assert.True(false, msg)` with `Assert.Fail(msg)`
Xtansia Nov 6, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bumps `xunit.runner.visualstudio` from 2.5.0 to 2.5.3
- Bumps `Octokit` from 7.1.0 to 8.1.1
- Bumps `FSharp.Core` from 7.0.400 to 7.0.401
- Bumps `xunit` from 2.4.2 to 2.6.1

## [1.5.0]
### Fixed
Expand Down Expand Up @@ -110,4 +111,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
[Unreleased]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...main
[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
[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
2 changes: 1 addition & 1 deletion abstractions/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit" Version="2.6.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenSearch.OpenSearch.Ephemeral\OpenSearch.OpenSearch.Ephemeral.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests.Core/Tests.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ProjectReference Include="$(SolutionRoot)\tests\Tests.Domain\Tests.Domain.csproj" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.7.2" />

<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit" Version="2.6.1" />
<ProjectReference Include="$(SolutionRoot)\abstractions\src\OpenSearch.OpenSearch.Xunit\OpenSearch.OpenSearch.Xunit.csproj" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.134" />

Expand Down
8 changes: 4 additions & 4 deletions tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void ImplicitConversionFromMinAndMaxString()
autoExpandReplicas.MinReplicas.Should().Be(0);
autoExpandReplicas.MaxReplicas.Match(
i => i.Should().Be(5),
s => Assert.True(false, "expecting a match on integer"));
s => Assert.Fail("expecting a match on integer"));

autoExpandReplicas.ToString().Should().Be(minAndMax);
}
Expand All @@ -69,7 +69,7 @@ public void ImplicitConversionFromMinAndAllString()
autoExpandReplicas.Enabled.Should().BeTrue();
autoExpandReplicas.MinReplicas.Should().Be(0);
autoExpandReplicas.MaxReplicas.Match(
i => Assert.True(false, "expecting a match on string"),
i => Assert.Fail("expecting a match on string"),
s => s.Should().Be("all"));

autoExpandReplicas.ToString().Should().Be(minAndMax);
Expand All @@ -84,7 +84,7 @@ public void CreateWithMinAndMax()
autoExpandReplicas.MinReplicas.Should().Be(2);
autoExpandReplicas.MaxReplicas.Match(
i => i.Should().Be(3),
s => Assert.True(false, "expecting a match on integer"));
s => Assert.Fail("expecting a match on integer"));

autoExpandReplicas.ToString().Should().Be("2-3");
}
Expand All @@ -97,7 +97,7 @@ public void CreateWithMinAndAll()
autoExpandReplicas.Enabled.Should().BeTrue();
autoExpandReplicas.MinReplicas.Should().Be(0);
autoExpandReplicas.MaxReplicas.Match(
i => Assert.True(false, "expecting a match on string"),
i => Assert.Fail("expecting a match on string"),
s => s.Should().Be("all"));

autoExpandReplicas.ToString().Should().Be("0-all");
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected override void ExpectResponse(GetIndexSettingsResponse response)
index.Settings.AutoExpandReplicas.Should().NotBeNull();
index.Settings.AutoExpandReplicas.MinReplicas.Should().Be(0);
index.Settings.AutoExpandReplicas.MaxReplicas.Match(
i => { Assert.True(false, "expecting a string"); },
i => { Assert.Fail("expecting a string"); },
s => s.Should().Be("all"));
index.Settings.AutoExpandReplicas.ToString().Should().Be("0-all");
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests/Search/Request/HighlightingUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
}
}
else
Assert.True(false, $"highlights contains unexpected key {highlightField.Key}");
Assert.Fail($"highlights contains unexpected key {highlightField.Key}");
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests/Search/Request/HighlightingUsageTestsWithMaxAnalyzerOffset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ public HighlightingUsageTestsWithMaxAnalyzerOffset(ReadOnlyCluster cluster, Endp
};

protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s


.Query(q => q
.Match(m => m
.Field(f => f.Name.Suffix("standard"))
Expand Down Expand Up @@ -308,7 +308,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
}
}
else
Assert.True(false, $"highlights contains unexpected key {highlightField.Key}");
Assert.Fail($"highlights contains unexpected key {highlightField.Key}");
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/Tests/Search/Request/SourceFilteringUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ public void CanDeserializeBoolean()
falseCase.SourceFilter.Should().NotBeNull();
falseCase.SourceFilter.Match
(b => b.Should().BeFalse(),
f => Assert.True(false, "Expected bool but found ISourceFilter")
f => Assert.Fail("Expected bool but found ISourceFilter")
);

var trueCase = Expect("{ \"_source\": true }").DeserializesTo<WithSourceFilterProperty>();
trueCase.Should().NotBeNull();
trueCase.SourceFilter.Should().NotBeNull();
trueCase.SourceFilter.Match
(b => b.Should().BeTrue(),
f => Assert.True(false, "Expected bool but found ISourceFilter")
f => Assert.Fail("Expected bool but found ISourceFilter")
);
}

Expand All @@ -151,7 +151,7 @@ public void CanDeserializeArray()
var o = Expect("{ \"_source\": [\"obj.*\"] }").DeserializesTo<WithSourceFilterProperty>();
o.Should().NotBeNull();
o.SourceFilter.Match(
b => Assert.True(false, "Expected ISourceFilter but found bool"),
b => Assert.Fail("Expected ISourceFilter but found bool"),
f =>
{
f.Should().NotBeNull();
Expand All @@ -166,7 +166,7 @@ public void CanDeserializeString()
var o = Expect("{ \"_source\": \"obj.*\" }").DeserializesTo<WithSourceFilterProperty>();
o.Should().NotBeNull();
o.SourceFilter.Match(
b => Assert.True(false, "Expected ISourceFilter but found bool"),
b => Assert.Fail("Expected ISourceFilter but found bool"),
f =>
{
f.Should().NotBeNull();
Expand All @@ -181,7 +181,7 @@ public void CanDeserializeObject()
var o = Expect("{ \"_source\": { \"includes\": [\"obj.*\"], \"excludes\": [\"foo.*\"] } }").DeserializesTo<WithSourceFilterProperty>();
o.Should().NotBeNull();
o.SourceFilter.Match(
b => Assert.True(false, "Expected ISourceFilter but found bool"),
b => Assert.Fail("Expected ISourceFilter but found bool"),
f =>
{
f.Should().NotBeNull();
Expand Down
Loading