Browse Source

Fix nullability issues.

pull/10869/head
Steven Kirk 4 years ago
parent
commit
6dc5eddfeb
  1. 18
      tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs

18
tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs

@ -15,6 +15,8 @@ using Avalonia.UnitTests;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Xunit; using Xunit;
#nullable enable
namespace Avalonia.Controls.UnitTests namespace Avalonia.Controls.UnitTests
{ {
public class VirtualizingStackPanelTests public class VirtualizingStackPanelTests
@ -483,10 +485,10 @@ namespace Avalonia.Controls.UnitTests
int firstIndex, int firstIndex,
int count) int count)
{ {
Assert.All(target.GetRealizedContainers(), x => Assert.Same(target, x.VisualParent)); Assert.All(target.GetRealizedContainers()!, x => Assert.Same(target, x.VisualParent));
Assert.All(target.GetRealizedContainers(), x => Assert.Same(itemsControl, x.Parent)); Assert.All(target.GetRealizedContainers()!, x => Assert.Same(itemsControl, x.Parent));
var childIndexes = target.GetRealizedContainers()? var childIndexes = target.GetRealizedContainers()!
.Select(x => itemsControl.IndexFromContainer(x)) .Select(x => itemsControl.IndexFromContainer(x))
.Where(x => x >= 0) .Where(x => x >= 0)
.OrderBy(x => x) .OrderBy(x => x)
@ -500,11 +502,11 @@ namespace Avalonia.Controls.UnitTests
int firstIndex, int firstIndex,
int count) int count)
{ {
Assert.All(target.GetRealizedContainers(), x => Assert.IsType<TContainer>(x)); Assert.All(target.GetRealizedContainers()!, x => Assert.IsType<TContainer>(x));
Assert.All(target.GetRealizedContainers(), x => Assert.Same(target, x.VisualParent)); Assert.All(target.GetRealizedContainers()!, x => Assert.Same(target, x.VisualParent));
Assert.All(target.GetRealizedContainers(), x => Assert.Same(itemsControl, x.Parent)); Assert.All(target.GetRealizedContainers()!, x => Assert.Same(itemsControl, x.Parent));
var childIndexes = target.GetRealizedContainers()? var childIndexes = target.GetRealizedContainers()!
.Select(x => itemsControl.IndexFromContainer(x)) .Select(x => itemsControl.IndexFromContainer(x))
.Where(x => x >= 0) .Where(x => x >= 0)
.OrderBy(x => x) .OrderBy(x => x)
@ -536,7 +538,7 @@ namespace Avalonia.Controls.UnitTests
{ {
ItemsSource = items, ItemsSource = items,
Template = new FuncControlTemplate<ItemsControl>((_, _) => scroll), Template = new FuncControlTemplate<ItemsControl>((_, _) => scroll),
ItemsPanel = new FuncTemplate<Panel>(() => target), ItemsPanel = new FuncTemplate<Panel?>(() => target),
}; };
if (useItemTemplate) if (useItemTemplate)

Loading…
Cancel
Save