From 5cc5b91930e96ea58468b7bac4a6e8e497aa2299 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 12 Nov 2017 01:38:28 +0100 Subject: [PATCH] Fix xunit warnings. --- .../AvaloniaPropertyTests.cs | 4 +- .../PriorityValueTests.cs | 4 +- .../CarouselTests.cs | 8 ++-- .../ControlTests.cs | 2 +- .../ItemsControlTests.cs | 6 +-- .../Presenters/CarouselPresenterTests.cs | 40 +++++++++---------- .../ContentPresenterTests_Standalone.cs | 6 +-- .../Presenters/ItemsPresenterTests.cs | 2 +- ...emsPresenterTests_Virtualization_Simple.cs | 2 +- .../Primitives/PopupTests.cs | 2 +- .../Primitives/ScrollBarTests.cs | 6 +-- .../TextBoxTests_DataValidation.cs | 8 ++-- .../FullLayoutTests.cs | 2 +- tests/Avalonia.LeakTests/ControlTests.cs | 4 +- .../Data/ExpressionObserverTests_Negation.cs | 10 ++--- .../Data/ExpressionObserverTests_Task.cs | 2 +- .../Data/BindingTests_Source.cs | 2 +- .../Xaml/BasicTests.cs | 12 +++--- .../Xaml/StyleTests.cs | 2 +- .../SelectorTests_Template.cs | 2 +- .../SceneGraph/SceneBuilderTests_Layers.cs | 8 ++-- .../Avalonia.Visuals.UnitTests/VisualTests.cs | 2 +- 22 files changed, 68 insertions(+), 68 deletions(-) diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs index 28d384fabd..2933893f7a 100644 --- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs +++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs @@ -113,8 +113,8 @@ namespace Avalonia.Base.UnitTests { var p1 = new TestProperty("p1", typeof(Class1)); - Assert.NotEqual(p1, null); - Assert.NotEqual(null, p1); + Assert.NotNull(p1); + Assert.NotNull(p1); Assert.False(p1 == null); Assert.False(null == p1); Assert.False(p1.Equals(null)); diff --git a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs index 7956f385e1..6ca1364f96 100644 --- a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs +++ b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs @@ -206,7 +206,7 @@ namespace Avalonia.Base.UnitTests Assert.Equal(2, target.GetBindings().Count()); disposable.Dispose(); - Assert.Equal(1, target.GetBindings().Count()); + Assert.Single(target.GetBindings()); } [Fact] @@ -248,7 +248,7 @@ namespace Avalonia.Base.UnitTests Assert.Equal(2, target.GetBindings().Count()); subject.OnCompleted(); - Assert.Equal(1, target.GetBindings().Count()); + Assert.Single(target.GetBindings()); } [Fact] diff --git a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs index e91ab02327..4ce83056c6 100644 --- a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs +++ b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs @@ -47,7 +47,7 @@ namespace Avalonia.Controls.UnitTests target.ApplyTemplate(); target.Presenter.ApplyTemplate(); - Assert.Equal(1, target.GetLogicalChildren().Count()); + Assert.Single(target.GetLogicalChildren()); var child = target.GetLogicalChildren().Single(); @@ -69,9 +69,9 @@ namespace Avalonia.Controls.UnitTests target.ApplyTemplate(); target.Presenter.ApplyTemplate(); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); + Assert.Single(target.ItemContainerGenerator.Containers); target.SelectedIndex = 1; - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); + Assert.Single(target.ItemContainerGenerator.Containers); } [Fact] @@ -88,7 +88,7 @@ namespace Avalonia.Controls.UnitTests target.ApplyTemplate(); target.Presenter.ApplyTemplate(); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); + Assert.Single(target.ItemContainerGenerator.Containers); target.SelectedIndex = 1; Assert.Equal(2, target.ItemContainerGenerator.Containers.Count()); } diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests.cs b/tests/Avalonia.Controls.UnitTests/ControlTests.cs index 3506a1606b..313c0b1253 100644 --- a/tests/Avalonia.Controls.UnitTests/ControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ControlTests.cs @@ -19,7 +19,7 @@ namespace Avalonia.Controls.UnitTests { var target = new Control(); - Assert.Equal(0, target.Classes.Count); + Assert.Empty(target.Classes); } [Fact] diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs index f01eecf647..50610cf595 100644 --- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs @@ -323,7 +323,7 @@ namespace Avalonia.Controls.UnitTests Template = GetTemplate(), }; - Assert.True(target.Classes.Contains(":empty")); + Assert.Contains(":empty", target.Classes); } [Fact] @@ -335,7 +335,7 @@ namespace Avalonia.Controls.UnitTests Items = new[] { 1, 2, 3 }, }; - Assert.False(target.Classes.Contains(":empty")); + Assert.DoesNotContain(":empty", target.Classes); } [Fact] @@ -349,7 +349,7 @@ namespace Avalonia.Controls.UnitTests target.Items = new int[0]; - Assert.True(target.Classes.Contains(":empty")); + Assert.Contains(":empty", target.Classes); } [Fact] diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs index 260c070406..a50fe852c3 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs @@ -91,9 +91,9 @@ namespace Avalonia.Controls.UnitTests.Presenters }; target.ApplyTemplate(); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); + Assert.Single(target.ItemContainerGenerator.Containers); target.SelectedIndex = 1; - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); + Assert.Single(target.ItemContainerGenerator.Containers); } [Fact] @@ -107,8 +107,8 @@ namespace Avalonia.Controls.UnitTests.Presenters }; target.ApplyTemplate(); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); target.SelectedIndex = 1; Assert.Equal(2, target.ItemContainerGenerator.Containers.Count()); Assert.Equal(2, target.Panel.Children.Count); @@ -134,24 +134,24 @@ namespace Avalonia.Controls.UnitTests.Presenters items.Add("foo"); target.SelectedIndex = 0; - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); items.Add("bar"); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); target.SelectedIndex = 1; Assert.Equal(2, target.ItemContainerGenerator.Containers.Count()); Assert.Equal(2, target.Panel.Children.Count); items.Remove(items[0]); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); items.Remove(items[0]); - Assert.Equal(0, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(0, target.Panel.Children.Count); + Assert.Empty(target.ItemContainerGenerator.Containers); + Assert.Empty(target.Panel.Children); } [Fact] @@ -171,12 +171,12 @@ namespace Avalonia.Controls.UnitTests.Presenters items.Add("foo"); target.SelectedIndex = 0; - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); items.Add("bar"); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); target.SelectedIndex = 1; Assert.Equal(2, target.ItemContainerGenerator.Containers.Count()); @@ -184,13 +184,13 @@ namespace Avalonia.Controls.UnitTests.Presenters Assert.Equal(0, target.ItemContainerGenerator.Containers.First().Index); items.Remove(items[0]); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.ItemContainerGenerator.Containers); + Assert.Single(target.Panel.Children); Assert.Equal(0, target.ItemContainerGenerator.Containers.First().Index); items.Remove(items[0]); - Assert.Equal(0, target.ItemContainerGenerator.Containers.Count()); - Assert.Equal(0, target.Panel.Children.Count); + Assert.Empty(target.ItemContainerGenerator.Containers); + Assert.Empty(target.Panel.Children); } private class TestItem : ContentControl diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs index 027e162877..6716456c78 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs @@ -42,7 +42,7 @@ namespace Avalonia.Controls.UnitTests.Presenters var logicalChildren = target.GetLogicalChildren(); - Assert.Equal(1, logicalChildren.Count()); + Assert.Single(logicalChildren); Assert.Equal(content, logicalChildren.First()); } @@ -190,7 +190,7 @@ namespace Avalonia.Controls.UnitTests.Presenters var logicalChildren = target.GetLogicalChildren(); - Assert.Equal(1, logicalChildren.Count()); + Assert.Single(logicalChildren); target.Content = "bar"; target.UpdateChild(); @@ -199,7 +199,7 @@ namespace Avalonia.Controls.UnitTests.Presenters logicalChildren = target.GetLogicalChildren(); - Assert.Equal(1, logicalChildren.Count()); + Assert.Single(logicalChildren); Assert.NotEqual(foo, logicalChildren.First()); } diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs index ef7e1062ec..048cdb2ccb 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs @@ -87,7 +87,7 @@ namespace Avalonia.Controls.UnitTests.Presenters target.ApplyTemplate(); items.RemoveAt(0); - Assert.Equal(1, target.Panel.Children.Count); + Assert.Single(target.Panel.Children); Assert.Equal("bar", ((ContentPresenter)target.Panel.Children[0]).Content); Assert.Equal("bar", ((ContentPresenter)target.ItemContainerGenerator.ContainerFromIndex(0)).Content); } diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs index 51433cc08e..80cc13ab78 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs @@ -704,7 +704,7 @@ namespace Avalonia.Controls.UnitTests.Presenters target.Measure(new Size(100, 100)); target.Arrange(new Rect(target.DesiredSize)); - Assert.Equal(0, target.Panel.Children.Count); + Assert.Empty(target.Panel.Children); items.AddRange(defaultItems.Select(s => s + " new")); diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 85a450e1dc..06b3202a83 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -194,7 +194,7 @@ namespace Avalonia.Controls.UnitTests.Primitives target.Open(); - Assert.Equal(1, target.PopupRoot.GetVisualChildren().Count()); + Assert.Single(target.PopupRoot.GetVisualChildren()); var templatedChild = target.PopupRoot.GetVisualChildren().Single(); Assert.IsType(templatedChild); diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs index 5b1ade9c47..0af4d791c7 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs @@ -24,7 +24,7 @@ namespace Avalonia.Controls.UnitTests.Primitives var track = (Track)target.GetTemplateChildren().First(x => x.Name == "track"); target.Value = 50; - Assert.Equal(track.Value, 50); + Assert.Equal(50, track.Value); } [Fact] @@ -39,7 +39,7 @@ namespace Avalonia.Controls.UnitTests.Primitives var track = (Track)target.GetTemplateChildren().First(x => x.Name == "track"); track.Value = 50; - Assert.Equal(target.Value, 50); + Assert.Equal(50, target.Value); } [Fact] @@ -56,7 +56,7 @@ namespace Avalonia.Controls.UnitTests.Primitives target.Value = 25; track.Value = 50; - Assert.Equal(target.Value, 50); + Assert.Equal(50, target.Value); } [Fact] diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs index ff3634b9fe..daf2715d84 100644 --- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs +++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs @@ -33,11 +33,11 @@ namespace Avalonia.Controls.UnitTests target.ApplyTemplate(); - Assert.False(target.Classes.Contains(":error")); + Assert.DoesNotContain(":error", target.Classes); target.Text = "20"; - Assert.True(target.Classes.Contains(":error")); + Assert.Contains(":error", target.Classes); target.Text = "1"; - Assert.False(target.Classes.Contains(":error")); + Assert.DoesNotContain(":error", target.Classes); } } @@ -57,7 +57,7 @@ namespace Avalonia.Controls.UnitTests Assert.Null(target.DataValidationErrors); target.Text = "20"; - Assert.Equal(1, target.DataValidationErrors.Count()); + Assert.Single(target.DataValidationErrors); Assert.IsType(target.DataValidationErrors.Single()); target.Text = "1"; Assert.Null(target.DataValidationErrors); diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs index 00d4af7e4d..1a07bdc7d1 100644 --- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs +++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs @@ -109,7 +109,7 @@ namespace Avalonia.Layout.UnitTests var presenters = scrollViewer.GetTemplateChildren().OfType().ToList(); Assert.Equal(2, scrollBars.Count); - Assert.Equal(1, presenters.Count); + Assert.Single(presenters); var presenter = presenters[0]; Assert.Equal(new Size(190, 190), presenter.Bounds.Size); diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs index 979127cd14..fe3ad59bb4 100644 --- a/tests/Avalonia.LeakTests/ControlTests.cs +++ b/tests/Avalonia.LeakTests/ControlTests.cs @@ -155,7 +155,7 @@ namespace Avalonia.LeakTests // template applied. LayoutManager.Instance.ExecuteInitialLayoutPass(window); Assert.IsType(window.Presenter.Child); - Assert.NotEqual(0, window.Presenter.Child.GetVisualChildren().Count()); + Assert.NotEmpty(window.Presenter.Child.GetVisualChildren()); // Clear the content and ensure the TextBox is removed. window.Content = null; @@ -290,7 +290,7 @@ namespace Avalonia.LeakTests // Do a layout and make sure that TreeViewItems get realized. LayoutManager.Instance.ExecuteInitialLayoutPass(window); - Assert.Equal(1, target.ItemContainerGenerator.Containers.Count()); + Assert.Single(target.ItemContainerGenerator.Containers); // Clear the content and ensure the TreeView is removed. window.Content = null; diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs index 6a23a24051..f4aa85c393 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs @@ -19,7 +19,7 @@ namespace Avalonia.Markup.UnitTests.Data var target = new ExpressionObserver(data, "!Foo"); var result = await target.Take(1); - Assert.Equal(false, result); + Assert.False((bool)result); GC.KeepAlive(data); } @@ -31,7 +31,7 @@ namespace Avalonia.Markup.UnitTests.Data var target = new ExpressionObserver(data, "!Foo"); var result = await target.Take(1); - Assert.Equal(true, result); + Assert.True((bool)result); GC.KeepAlive(data); } @@ -43,7 +43,7 @@ namespace Avalonia.Markup.UnitTests.Data var target = new ExpressionObserver(data, "!Foo"); var result = await target.Take(1); - Assert.Equal(false, result); + Assert.False((bool)result); GC.KeepAlive(data); } @@ -55,7 +55,7 @@ namespace Avalonia.Markup.UnitTests.Data var target = new ExpressionObserver(data, "!Foo"); var result = await target.Take(1); - Assert.Equal(true, result); + Assert.True((bool)result); GC.KeepAlive(data); } @@ -67,7 +67,7 @@ namespace Avalonia.Markup.UnitTests.Data var target = new ExpressionObserver(data, "!Foo"); var result = await target.Take(1); - Assert.Equal(false, result); + Assert.False((bool)result); GC.KeepAlive(data); } diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs index c251f4398a..87a8be045b 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs @@ -28,7 +28,7 @@ namespace Avalonia.Markup.UnitTests.Data tcs.SetResult("foo"); sync.ExecutePostedCallbacks(); - Assert.Equal(1, result.Count); + Assert.Single(result); Assert.IsType>(result[0]); GC.KeepAlive(data); diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs index c6006f3afb..1fbf8b679d 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs @@ -23,7 +23,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data target.Bind(TextBlock.TextProperty, binding); - Assert.Equal(target.Text, "foo"); + Assert.Equal("foo", target.Text); } public class Source : INotifyPropertyChanged diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs index ec6afb74ca..ffd666fe12 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs @@ -119,7 +119,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml var target = AvaloniaXamlLoader.Parse(xaml); - Assert.Equal(0, target.Children.Count); + Assert.Empty(target.Children); Assert.Equal("Foo", ToolTip.GetTip(target)); } @@ -377,7 +377,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml var styles = AvaloniaXamlLoader.Parse(xaml); - Assert.Equal(1, styles.Count); + Assert.Single(styles); var style = (Style)styles[0]; @@ -405,13 +405,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml var styles = AvaloniaXamlLoader.Parse(xaml); - Assert.Equal(1, styles.Count); + Assert.Single(styles); var style = (Style)styles[0]; var setters = style.Setters.Cast().ToArray(); - Assert.Equal(1, setters.Length); + Assert.Single(setters); Assert.Equal(TextBlock.FontSizeProperty, setters[0].Property); Assert.Equal(21.0, setters[0].Value); @@ -459,7 +459,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml "; var styles = AvaloniaXamlLoader.Parse(xaml); - Assert.Equal(1, styles.Count); + Assert.Single(styles); var style = (Style)styles[0]; @@ -688,7 +688,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml var style = AvaloniaXamlLoader.Parse