Browse Source

Merge pull request #1198 from jp2masa/warnings

Fixed Assert.Null warnings
pull/1202/head
Jeremy Koritzinsky 9 years ago
committed by GitHub
parent
commit
8360938dee
  1. 2
      tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
  2. 2
      tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
  3. 4
      tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
  4. 2
      tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
  5. 8
      tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
  6. 2
      tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
  7. 2
      tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs
  8. 4
      tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs

2
tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs

@ -187,7 +187,7 @@ namespace Avalonia.Base.UnitTests
source.OnNext(45); source.OnNext(45);
Assert.Equal(null, target.Foo); Assert.Null(target.Foo);
} }
[Fact] [Fact]

2
tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs

@ -66,7 +66,7 @@ namespace Avalonia.Controls.UnitTests.Generators
target.Dematerialize(1, 1); target.Dematerialize(1, 1);
Assert.Equal(containers[0].ContainerControl, target.ContainerFromIndex(0)); Assert.Equal(containers[0].ContainerControl, target.ContainerFromIndex(0));
Assert.Equal(null, target.ContainerFromIndex(1)); Assert.Null(target.ContainerFromIndex(1));
Assert.Equal(containers[2].ContainerControl, target.ContainerFromIndex(2)); Assert.Equal(containers[2].ContainerControl, target.ContainerFromIndex(2));
} }

4
tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs

@ -107,7 +107,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
target.Content = child; target.Content = child;
target.Content = null; target.Content = null;
Assert.Equal(null, child.GetLogicalParent()); Assert.Null(child.GetLogicalParent());
Assert.Empty(target.GetLogicalChildren()); Assert.Empty(target.GetLogicalChildren());
} }
@ -120,7 +120,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
target.Content = child; target.Content = child;
target.Content = null; target.Content = null;
Assert.Equal(null, child.GetVisualParent()); Assert.Null(child.GetVisualParent());
Assert.Empty(target.GetVisualChildren()); Assert.Empty(target.GetVisualChildren());
} }

2
tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs

@ -191,7 +191,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
target.Content = "bar"; target.Content = "bar";
target.UpdateChild(); target.UpdateChild();
Assert.Equal(null, foo.Parent); Assert.Null(foo.Parent);
logicalChildren = target.GetLogicalChildren(); logicalChildren = target.GetLogicalChildren();

8
tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

@ -171,7 +171,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.SelectedItem = new Item(); target.SelectedItem = new Item();
Assert.Equal(null, target.SelectedItem); Assert.Null(target.SelectedItem);
Assert.Equal(-1, target.SelectedIndex); Assert.Equal(-1, target.SelectedIndex);
} }
@ -278,7 +278,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.Items = null; target.Items = null;
Assert.Equal(null, target.SelectedItem); Assert.Null(target.SelectedItem);
Assert.Equal(-1, target.SelectedIndex); Assert.Equal(-1, target.SelectedIndex);
} }
@ -305,7 +305,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
items.RemoveAt(1); items.RemoveAt(1);
Assert.Equal(null, target.SelectedItem); Assert.Null(target.SelectedItem);
Assert.Equal(-1, target.SelectedIndex); Assert.Equal(-1, target.SelectedIndex);
} }
@ -334,7 +334,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
items.Clear(); items.Clear();
Assert.Equal(null, target.SelectedItem); Assert.Null(target.SelectedItem);
Assert.Equal(-1, target.SelectedIndex); Assert.Equal(-1, target.SelectedIndex);
} }

2
tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs

@ -76,7 +76,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.SelectedItems = new AvaloniaList<object>(); target.SelectedItems = new AvaloniaList<object>();
Assert.Equal(-1, target.SelectedIndex); Assert.Equal(-1, target.SelectedIndex);
Assert.Equal(null, target.SelectedItem); Assert.Null(target.SelectedItem);
} }
[Fact] [Fact]

2
tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs

@ -117,7 +117,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
}; };
target.Bind(TextBox.TextProperty, binding); target.Bind(TextBox.TextProperty, binding);
Assert.Equal(null, target.Text); Assert.Null(target.Text);
} }
[Fact] [Fact]

4
tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs

@ -63,7 +63,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Templates
{ {
var selector = new MemberSelector() { MemberName = "StringValue" }; var selector = new MemberSelector() { MemberName = "StringValue" };
Assert.Equal(null, selector.Select(null)); Assert.Null(selector.Select(null));
} }
[Fact] [Fact]
@ -73,7 +73,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Templates
var data = new Item() { StringValue = "Value1" }; var data = new Item() { StringValue = "Value1" };
Assert.Same(null, selector.Select(data)); Assert.Null(selector.Select(data));
} }
[Fact] [Fact]

Loading…
Cancel
Save