Skip to content

Commit 4d44cfb

Browse files
linkdotnetegil
linkdotnet
authored and
egil
committed
fix: Fix tests for net9
1 parent f022007 commit 4d44cfb

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

‎src/bunit.generators/bunit.generators.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</ItemGroup>
7171

7272
<ItemGroup>
73-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
73+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
7474
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
7575
<PrivateAssets>all</PrivateAssets>
7676
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/bunit.template/template/Company.BlazorTests1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="bunit" Version="#{RELEASE_VERSION}#" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2121
<PackageReference Include="coverlet.collector" Version="6.0.0">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>

‎tests/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ItemGroup>
2626
<PackageReference Include="AutoFixture" Version="4.18.1" />
2727
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2929
<PackageReference Include="NSubstitute" Version="5.1.0" />
3030
<PackageReference Include="Shouldly" Version="4.2.1" />
3131
<PackageReference Include="coverlet.msbuild" Version="6.0.2" PrivateAssets="All" />

‎tests/bunit.generators.tests/bunit.generators.tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1717
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
1818
<PackageReference Include="Verify.SourceGenerators" Version="2.4.0" />
19-
<PackageReference Include="Verify.Xunit" Version="26.2.0" />
19+
<PackageReference Include="Verify.Xunit" Version="26.4.4" />
2020
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
2121
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
2222
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />

‎tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@ namespace Bunit.JSInterop.ComponentSupport;
1111

1212
public class VirtualizeJSRuntimeInvocationHandlerTest : TestContext
1313
{
14-
public static readonly IEnumerable<object[]> ItemsInCollection = new object[][]
15-
{
16-
new object[] { 0 }, new object[] { 7 }, new object[] { 30 }, new object[] { 60 }, new object[] { 100 }, new object[] { 300 }, new object[] { 500 },
17-
};
14+
public static readonly IEnumerable<object[]> ItemsInCollection =
15+
[
16+
[0], [7], [30], [60], [100], [300], [500],
17+
];
1818

1919
[Theory(DisplayName = "Can render component using <Virtualize Items> with ChildContent")]
2020
[MemberData(nameof(ItemsInCollection))]
2121
public void Test001(int itemsInDataSource)
2222
{
2323
var cut = RenderComponent<Virtualize<string>>(ps => ps
2424
.Add(p => p.Items, CreateItems(itemsInDataSource))
25+
#if NET9_0_OR_GREATER
26+
.Add(p => p.MaxItemCount, itemsInDataSource)
27+
#endif
2528
.Add(p => p.ChildContent, item => $"<p>{item}</p>"));
2629

2730
cut.FindAll("p").Count.ShouldBe(itemsInDataSource);
@@ -33,6 +36,9 @@ public void Test002(int itemsInDataSource)
3336
{
3437
var cut = RenderComponent<Virtualize<string>>(ps => ps
3538
.Add(p => p.Items, CreateItems(itemsInDataSource))
39+
#if NET9_0_OR_GREATER
40+
.Add(p => p.MaxItemCount, itemsInDataSource)
41+
#endif
3642
.Add(p => p.ItemContent, item => $"<p>{item}</p>"));
3743

3844
cut.FindAll("p").Count.ShouldBe(itemsInDataSource);
@@ -44,6 +50,9 @@ public void Test010(int itemsInDataSource)
4450
{
4551
var cut = RenderComponent<Virtualize<string>>(ps => ps
4652
.Add(p => p.ItemsProvider, CreateItemsProvider(itemsInDataSource))
53+
#if NET9_0_OR_GREATER
54+
.Add(p => p.MaxItemCount, itemsInDataSource)
55+
#endif
4756
.Add(p => p.ChildContent, item => $"<p>{item}</p>"));
4857

4958
cut.FindAll("p").Count.ShouldBe(itemsInDataSource);
@@ -55,6 +64,9 @@ public void Test011(int itemsInDataSource)
5564
{
5665
var cut = RenderComponent<Virtualize<string>>(ps => ps
5766
.Add(p => p.ItemsProvider, CreateItemsProvider(itemsInDataSource))
67+
#if NET9_0_OR_GREATER
68+
.Add(p => p.MaxItemCount, itemsInDataSource)
69+
#endif
5870
.Add(p => p.ItemContent, item => $"<p>{item}</p>"));
5971

6072
cut.FindAll("p").Count.ShouldBe(itemsInDataSource);
@@ -63,12 +75,8 @@ public void Test011(int itemsInDataSource)
6375
public static readonly IEnumerable<object[]> ItemCountItemSizeOverscanCount =
6476
ItemsInCollection.Select(x => new object[][]
6577
{
66-
new object[] { x[0], 1, 3 },
67-
new object[] { x[0], 1_000_000, 3 },
68-
new object[] { x[0], 50, 1 },
69-
new object[] { x[0], 50, 1_000_000 },
70-
new object[] { x[0], 1, 1 },
71-
new object[] { x[0], 1_000_000, 1_000_000 },
78+
[x[0], 1, 3], [x[0], 1_000_000, 3], [x[0], 50, 1], [x[0], 50, 1_000_000], [x[0], 1, 1], [x[0], 1_000_000, 1_000_000
79+
],
7280
}).SelectMany(x => x);
7381

7482
[Theory(DisplayName = "Can render component using <Virtualize Items> and different ItemSize and OverscanCount")]
@@ -79,6 +87,9 @@ public void Test030(int itemsInDataSource, float itemSize, int overscanCount)
7987
.Add(p => p.ItemsProvider, CreateItemsProvider(itemsInDataSource))
8088
.Add(p => p.ItemContent, item => $"<p>{item}</p>")
8189
.Add(p => p.ItemSize, itemSize)
90+
#if NET9_0_OR_GREATER
91+
.Add(p => p.MaxItemCount, itemsInDataSource)
92+
#endif
8293
.Add(p => p.OverscanCount, overscanCount));
8394

8495
cut.FindAll("p").Count.ShouldBe(itemsInDataSource);
@@ -91,6 +102,9 @@ public void Test040(int itemsInDataSource)
91102
var cut = RenderComponent<Virtualize<string>>(ps => ps
92103
.Add(p => p.ItemsProvider, _ => ValueTask.FromResult(new ItemsProviderResult<string>(Array.Empty<string>(), itemsInDataSource)))
93104
.Add(p => p.ItemContent, item => @$"<p class=""item"">{item}</p>")
105+
#if NET9_0_OR_GREATER
106+
.Add(p => p.MaxItemCount, itemsInDataSource)
107+
#endif
94108
.Add(p => p.Placeholder, _ => @"<p class=""placeholder"" />"));
95109

96110
cut.FindAll(".placeholder").Count.ShouldBe(itemsInDataSource);

0 commit comments

Comments
 (0)