From de4b55f8ee6bbe6e284cfcb99257620fd4daaf6a Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Fri, 14 Oct 2022 17:16:42 +0200 Subject: [PATCH] feat(tests): Address rule CA1822 --- .../AvaloniaObjectTests_Binding.cs | 2 +- .../Core/ExpressionObserverTests_Lifetime.cs | 2 +- .../Core/ExpressionObserverTests_Property.cs | 2 +- .../Data/Core/ExpressionObserverTests_Task.cs | 2 +- .../Input/GesturesTests.cs | 2 +- .../Interactivity/InteractiveTests.cs | 2 +- ...ayoutableTests_EffectiveViewportChanged.cs | 12 +++--- .../Layout/NonVirtualizingStackLayoutTests.cs | 2 +- tests/Avalonia.Base.UnitTests/MatrixTests.cs | 4 +- .../Media/RectangleGeometryTests.cs | 2 +- .../RenderTests_Culling.cs | 2 +- .../Rendering/CompositorHitTestingTests.cs | 2 +- .../Rendering/DeferredRendererTests.cs | 2 +- .../DeferredRendererTests_HitTesting.cs | 2 +- .../ImmediateRendererTests_HitTesting.cs | 2 +- .../Styling/SelectorTests_Template.cs | 2 +- .../Styling/StyledElementTests_Resources.cs | 2 +- .../VisualExtensions_GetVisualsAt.cs | 2 +- .../WeakEventHandlerManagerTests.cs | 2 +- .../Avalonia.Base.UnitTests/WeakEventTests.cs | 2 +- .../ComboBoxTests.cs | 2 +- .../ContentControlTests.cs | 2 +- .../ContextMenuTests.cs | 2 +- .../DatePickerTests.cs | 2 +- .../FlyoutTests.cs | 6 +-- .../Generators/ItemContainerGeneratorTests.cs | 2 +- .../ItemContainerGeneratorTypedTests.cs | 2 +- .../Avalonia.Controls.UnitTests/GridTests.cs | 2 +- .../HeaderedItemsControlTests .cs | 2 +- .../Avalonia.Controls.UnitTests/ImageTests.cs | 2 +- .../ItemsControlTests.cs | 2 +- .../ListBoxTests.cs | 4 +- .../ListBoxTests_Multiple.cs | 2 +- .../ListBoxTests_Single.cs | 2 +- .../NumericUpDownTests.cs | 2 +- .../ContentPresenterTests_InTemplate.cs | 2 +- .../Primitives/PopupRootTests.cs | 2 +- .../Primitives/PopupTests.cs | 2 +- .../SelectingItemsControlTests_AutoSelect.cs | 2 +- .../SelectingItemsControlTests_Multiple.cs | 4 +- .../TabControlTests.cs | 8 ++-- .../TextBoxTests_DataValidation.cs | 2 +- .../TimePickerTests.cs | 2 +- .../TopLevelTests.cs | 2 +- .../TreeViewTests.cs | 12 +++--- .../UserControlTests.cs | 2 +- .../Utils/HotKeyManagerTests.cs | 2 +- .../ViewboxTests.cs | 2 +- .../WindowBaseTests.cs | 2 +- .../WindowTests.cs | 2 +- .../Data/BindingTests.cs | 2 +- .../Data/BindingTests_Self.cs | 2 +- .../Parsers/ExpressionNodeBuilderTests.cs | 6 +-- .../MarkupExtensions/BindingExtensionTests.cs | 12 +++--- .../DynamicResourceExtensionTests.cs | 4 +- .../MarkupExtensions/ResourceIncludeTests.cs | 6 +-- .../StaticResourceExtensionTests.cs | 4 +- .../Parsers/PropertyParserTests.cs | 38 +++++++++---------- .../StyleIncludeTests.cs | 4 +- .../Xaml/ResourceDictionaryTests.cs | 4 +- .../Xaml/XamlIlTests.cs | 4 +- .../TransitioningContentControlTest.cs | 2 +- .../Media/GeometryDrawingTests.cs | 2 +- .../Media/TextFormatting/TextLayoutTests.cs | 8 ++-- tests/Avalonia.RenderTests/TestBase.cs | 2 +- .../DrawingContextImplTests.cs | 2 +- 66 files changed, 119 insertions(+), 119 deletions(-) diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs index 6b4a6f89df..7c958ffe30 100644 --- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs +++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs @@ -889,7 +889,7 @@ namespace Avalonia.Base.UnitTests /// The type of the observable. /// The value. /// The observable. - private IObservable Single(T value) + private static IObservable Single(T value) { return Observable.Never().StartWith(value); } diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs index d496817147..435980bd9a 100644 --- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs +++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs @@ -104,7 +104,7 @@ namespace Avalonia.Base.UnitTests.Data.Core GC.KeepAlive(data); } - private Recorded> OnNext(long time, T value) + private static Recorded> OnNext(long time, T value) { return new Recorded>(time, Notification.CreateOnNext(value)); } diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs index a9c62a3c4a..3372d05849 100644 --- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs +++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs @@ -713,7 +713,7 @@ namespace Avalonia.Base.UnitTests.Data.Core { } - private Recorded> OnNext(long time, T value) + private static Recorded> OnNext(long time, T value) { return new Recorded>(time, Notification.CreateOnNext(value)); } diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs index ca564a6809..cf70a617bf 100644 --- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs +++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs @@ -143,7 +143,7 @@ namespace Avalonia.Base.UnitTests.Data.Core } } - private Task TaskFromException(Exception e) + private static Task TaskFromException(Exception e) { var tcs = new TaskCompletionSource(); tcs.SetException(e); diff --git a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs index 57ec00cb58..508eff5f9d 100644 --- a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs +++ b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs @@ -167,7 +167,7 @@ namespace Avalonia.Base.UnitTests.Input Assert.False(raised); } - private void AddHandlers( + private static void AddHandlers( Decorator decorator, Border border, IList result, diff --git a/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs index 1ca7e9bd49..47b0de4a29 100644 --- a/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs +++ b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs @@ -378,7 +378,7 @@ namespace Avalonia.Base.UnitTests.Interactivity Assert.Equal(new[] { "3", "2b", "1" }, invoked); } - private TestInteractive CreateTree( + private static TestInteractive CreateTree( RoutedEvent ev, EventHandler handler, RoutingStrategies handlerRoutes, diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs index a58d28004f..98a2d76b48 100644 --- a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs +++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs @@ -336,21 +336,21 @@ namespace Avalonia.Base.UnitTests.Layout }); } - private TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 }; + private static TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 }; - private Task ExecuteInitialLayoutPass(TestRoot root) + private static Task ExecuteInitialLayoutPass(TestRoot root) { root.LayoutManager.ExecuteInitialLayoutPass(); return Task.CompletedTask; } - private Task ExecuteLayoutPass(TestRoot root) + private static Task ExecuteLayoutPass(TestRoot root) { root.LayoutManager.ExecuteLayoutPass(); return Task.CompletedTask; } - private Task ExecuteScrollerLayoutPass( + private static Task ExecuteScrollerLayoutPass( TestRoot root, ScrollViewer scroller, Control target, @@ -365,7 +365,7 @@ namespace Avalonia.Base.UnitTests.Layout root.LayoutManager.ExecuteLayoutPass(); return Task.CompletedTask; } - private IControlTemplate ScrollViewerTemplate() + private static IControlTemplate ScrollViewerTemplate() { return new FuncControlTemplate((control, scope) => new Grid { @@ -415,7 +415,7 @@ namespace Avalonia.Base.UnitTests.Layout }); } - private void AssertArePixelEqual(Rect expected, Rect actual) + private static void AssertArePixelEqual(Rect expected, Rect actual) { var expectedRounded = new Rect((int)expected.X, (int)expected.Y, (int)expected.Width, (int)expected.Height); var actualRounded = new Rect((int)actual.X, (int)actual.Y, (int)actual.Width, (int)actual.Height); diff --git a/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs index 78cf63ed3f..7e4d0852b2 100644 --- a/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs +++ b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs @@ -310,7 +310,7 @@ namespace Avalonia.Base.UnitTests.Layout Assert.Equal(new Size(10, 10), arrangeSize); } - private NonVirtualizingLayoutContext CreateContext(Control[] children) + private static NonVirtualizingLayoutContext CreateContext(Control[] children) { return new TestLayoutContext(children); } diff --git a/tests/Avalonia.Base.UnitTests/MatrixTests.cs b/tests/Avalonia.Base.UnitTests/MatrixTests.cs index 99fe4685d7..d111c14258 100644 --- a/tests/Avalonia.Base.UnitTests/MatrixTests.cs +++ b/tests/Avalonia.Base.UnitTests/MatrixTests.cs @@ -19,7 +19,7 @@ public class MatrixTests /// /// The expected vector /// The actual transformed point - private void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual) + private static void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual) { double ReducePrecision(double input) => Math.Truncate(input * 10000); @@ -86,7 +86,7 @@ public class MatrixTests var matrix = Matrix.CreateSkew(30, 20); var point = new Point(1, 1); var actual = matrix.Transform(point); - + AssertCoordinatesEqualWithReducedPrecision(expected, actual); } } diff --git a/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs index 387b2f4a19..afe03461e8 100644 --- a/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs +++ b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs @@ -23,7 +23,7 @@ namespace Avalonia.Base.UnitTests.Media } } - private TestServices GetServices() + private static TestServices GetServices() { var context = Mock.Of(); var transformedGeometry = new Mock(); diff --git a/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs index c7421c5827..509d2451a9 100644 --- a/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs +++ b/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs @@ -179,7 +179,7 @@ namespace Avalonia.Base.UnitTests ImmediateRenderer.Render(control, ctx); } - private DrawingContext CreateDrawingContext() + private static DrawingContext CreateDrawingContext() { return new DrawingContext(Mock.Of()); } diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs index d83bb12aea..27faf1e13c 100644 --- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs +++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs @@ -460,7 +460,7 @@ public class CompositorHitTestingTests : CompositorTestsBase } } - private IDisposable TestApplication() + private static IDisposable TestApplication() { return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface); } diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs index c345b9a7ea..7f977103ce 100644 --- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs +++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs @@ -745,7 +745,7 @@ namespace Avalonia.Base.UnitTests.Rendering return target; } - private Mock GetLayerContext(DeferredRenderer renderer, IControl layerRoot) + private static Mock GetLayerContext(DeferredRenderer renderer, IControl layerRoot) { return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null)); } diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs index d3fdbb63db..bcc7c564f8 100644 --- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs +++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs @@ -569,7 +569,7 @@ namespace Avalonia.Base.UnitTests.Rendering } } - private IDisposable TestApplication() + private static IDisposable TestApplication() { return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface); } diff --git a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs index 1a9822e259..675db3657c 100644 --- a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs +++ b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs @@ -450,7 +450,7 @@ namespace Avalonia.Base.UnitTests.Rendering } } - private IDisposable TestApplication() + private static IDisposable TestApplication() { return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface); } diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs index 176fa07f19..9840923526 100644 --- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs +++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs @@ -151,7 +151,7 @@ namespace Avalonia.Base.UnitTests.Styling Assert.Equal(0, ((Classes)styleable.Object.Classes).ListenerCount); } - private void BuildVisualTree(Mock templatedControl) where T : class, IVisual + private static void BuildVisualTree(Mock templatedControl) where T : class, IVisual { templatedControl.Setup(x => x.VisualChildren).Returns(new Controls.Controls { diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs index 69d37d1c54..cf53058d0b 100644 --- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs +++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs @@ -198,7 +198,7 @@ namespace Avalonia.Base.UnitTests.Styling Assert.True(raised); } - private IControlTemplate ContentControlTemplate() + private static IControlTemplate ContentControlTemplate() { return new FuncControlTemplate((x, scope) => new ContentPresenter diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs index 1020a3a4d6..698656e6ae 100644 --- a/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs +++ b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs @@ -96,7 +96,7 @@ namespace Avalonia.Base.UnitTests.VisualTree } } - private IDisposable TestApplication() + private static IDisposable TestApplication() { return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface); } diff --git a/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs b/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs index 81b882308d..9274724c8c 100644 --- a/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs +++ b/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs @@ -79,7 +79,7 @@ namespace Avalonia.Base.UnitTests Assert.False(handled); } - private void AddCollectableSubscriber(EventSource source, string name, Action func) + private static void AddCollectableSubscriber(EventSource source, string name, Action func) { WeakEventHandlerManager.Subscribe(source, name, new Subscriber(func).OnEvent); } diff --git a/tests/Avalonia.Base.UnitTests/WeakEventTests.cs b/tests/Avalonia.Base.UnitTests/WeakEventTests.cs index 2663b4858f..4c9798ef09 100644 --- a/tests/Avalonia.Base.UnitTests/WeakEventTests.cs +++ b/tests/Avalonia.Base.UnitTests/WeakEventTests.cs @@ -67,7 +67,7 @@ namespace Avalonia.Base.UnitTests Assert.False(handled); } - private void AddSubscriber(EventSource source, Action func) + private static void AddSubscriber(EventSource source, Action func) { EventSource.WeakEv.Subscribe(source, new Subscriber(func)); } diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs index 21438543d5..b5df1c07ec 100644 --- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs @@ -181,7 +181,7 @@ namespace Avalonia.Controls.UnitTests Assert.False(((ILogical)rectangle).IsAttachedToLogicalTree); } - private FuncControlTemplate GetTemplate() + private static FuncControlTemplate GetTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs index 7cc0bae97f..7cfdd3e376 100644 --- a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs @@ -368,7 +368,7 @@ namespace Avalonia.Controls.UnitTests } } - private FuncControlTemplate GetTemplate() + private static FuncControlTemplate GetTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs index b63cbd286e..ca0197f9e6 100644 --- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs @@ -586,7 +586,7 @@ namespace Avalonia.Controls.UnitTests } } - private Window PreparedWindow(object content = null) + private static Window PreparedWindow(object content = null) { var renderer = new Mock(); var platform = AvaloniaLocator.Current.GetService(); diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs index 8271dde3f6..da5b769ea0 100644 --- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs +++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs @@ -207,7 +207,7 @@ namespace Avalonia.Controls.UnitTests standardCursorFactory: Mock.Of(), textShaperImpl: new MockTextShaperImpl()); - private IControlTemplate CreateTemplate() + private static IControlTemplate CreateTemplate() { return new FuncControlTemplate((control, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs index 776b4508c2..496b5bc1b6 100644 --- a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs +++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs @@ -555,7 +555,7 @@ namespace Avalonia.Controls.UnitTests } } - private IDisposable CreateServicesWithFocus() + private static IDisposable CreateServicesWithFocus() { return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform: new MockWindowingPlatform(null, @@ -567,7 +567,7 @@ namespace Avalonia.Controls.UnitTests keyboardDevice: () => new KeyboardDevice())); } - private Window PreparedWindow(object content = null) + private static Window PreparedWindow(object content = null) { var renderer = new Mock(); var platform = AvaloniaLocator.Current.GetService(); @@ -579,7 +579,7 @@ namespace Avalonia.Controls.UnitTests return w; } - private PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p) + private static PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p) { var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true); return new PointerPressedEventArgs( diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs index c5c7737f0d..8a053c2a91 100644 --- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs @@ -154,7 +154,7 @@ namespace Avalonia.Controls.UnitTests.Generators Assert.True(container != null, "The containers is not materialized."); } - private IList Materialize( + private static IList Materialize( IItemContainerGenerator generator, int index, string[] items) diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs index aab7c52f34..f63a764a21 100644 --- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs @@ -23,7 +23,7 @@ namespace Avalonia.Controls.UnitTests.Generators Assert.Equal(items, result); } - private IList Materialize( + private static IList Materialize( IItemContainerGenerator generator, int index, string[] items) diff --git a/tests/Avalonia.Controls.UnitTests/GridTests.cs b/tests/Avalonia.Controls.UnitTests/GridTests.cs index 4ffa526b85..b2d00929d8 100644 --- a/tests/Avalonia.Controls.UnitTests/GridTests.cs +++ b/tests/Avalonia.Controls.UnitTests/GridTests.cs @@ -28,7 +28,7 @@ namespace Avalonia.Controls.UnitTests (c.name, c.width, c.minWidth, ColumnDefinition.MaxWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); } - private Grid CreateGrid(params (string name, GridLength width, double minWidth, double maxWidth)[] columns) + private static Grid CreateGrid(params (string name, GridLength width, double minWidth, double maxWidth)[] columns) { var grid = new Grid(); foreach (var k in columns.Select(c => new ColumnDefinition diff --git a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs index 5c86e3e5a9..2cf4148fe3 100644 --- a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs +++ b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs @@ -58,7 +58,7 @@ namespace Avalonia.Controls.UnitTests Assert.Empty(target.GetLogicalChildren()); } - private FuncControlTemplate GetTemplate() + private static FuncControlTemplate GetTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/ImageTests.cs b/tests/Avalonia.Controls.UnitTests/ImageTests.cs index ad735cd088..47158f4811 100644 --- a/tests/Avalonia.Controls.UnitTests/ImageTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ImageTests.cs @@ -164,7 +164,7 @@ namespace Avalonia.Controls.UnitTests Assert.Equal(new Size(25, 100), target.Bounds.Size); } - private IBitmap CreateBitmap(int width, int height) + private static IBitmap CreateBitmap(int width, int height) { return Mock.Of(x => x.Size == new Size(width, height)); } diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs index f08653a4f8..55f9ad4f23 100644 --- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs @@ -747,7 +747,7 @@ namespace Avalonia.Controls.UnitTests public string Value { get; } } - private FuncControlTemplate GetTemplate() + private static FuncControlTemplate GetTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs index f6d96edb99..203df0aded 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs @@ -607,7 +607,7 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope)); } - private FuncControlTemplate ListBoxItemTemplate() + private static FuncControlTemplate ListBoxItemTemplate() { return new FuncControlTemplate((parent, scope) => new ContentPresenter @@ -618,7 +618,7 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope)); } - private FuncControlTemplate ScrollViewerTemplate() + private static FuncControlTemplate ScrollViewerTemplate() { return new FuncControlTemplate((parent, scope) => new Panel diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs index 7c7cdd08db..824d3ab979 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs +++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs @@ -107,7 +107,7 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope); } - private void ApplyTemplate(ListBox target) + private static void ApplyTemplate(ListBox target) { // Apply the template to the ListBox itself. target.ApplyTemplate(); diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs index bf516748cc..c9ae3625cc 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs +++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs @@ -286,7 +286,7 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope); } - private void ApplyTemplate(ListBox target) + private static void ApplyTemplate(ListBox target) { // Apply the template to the ListBox itself. target.ApplyTemplate(); diff --git a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs index 4cef7e4d05..dc47b19299 100644 --- a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs +++ b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs @@ -67,7 +67,7 @@ namespace Avalonia.Controls.UnitTests control.ApplyTemplate(); return control; } - private TextBox GetTextBox(NumericUpDown control) + private static TextBox GetTextBox(NumericUpDown control) { return control.GetTemplateChildren() .OfType() diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs index 6d20c72674..636c23dbab 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs @@ -376,7 +376,7 @@ namespace Avalonia.Controls.UnitTests.Presenters Assert.Equal("Canvas", textBlock.Text); } - (ContentPresenter presenter, ContentControl templatedParent) CreateTarget() + static (ContentPresenter presenter, ContentControl templatedParent) CreateTarget() { var templatedParent = new ContentControl { diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs index 6d3351d2b2..7e7e575fbe 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs @@ -325,7 +325,7 @@ namespace Avalonia.Controls.UnitTests.Primitives } } - private PopupRoot CreateTarget(TopLevel popupParent, IPopupImpl impl = null) + private static PopupRoot CreateTarget(TopLevel popupParent, IPopupImpl impl = null) { impl ??= popupParent.PlatformImpl.CreatePopup(); diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 5f91f2e2a1..100de7f4f6 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -1087,7 +1087,7 @@ namespace Avalonia.Controls.UnitTests.Primitives KeyModifiers.None); } - private Window PreparedWindow(object content = null) + private static Window PreparedWindow(object content = null) { var w = new Window { Content = content }; w.ApplyTemplate(); diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs index 7b7e651cc9..d8dbf0fbb9 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs @@ -118,7 +118,7 @@ namespace Avalonia.Controls.UnitTests.Primitives Assert.Equal(new[] { ":selected" }, target.Presenter.Panel.Children[0].Classes); } - private FuncControlTemplate Template() + private static FuncControlTemplate Template() { return new FuncControlTemplate((control, scope) => new ItemsPresenter diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs index 5d2f4e2a64..376c70baaa 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs @@ -1523,14 +1523,14 @@ namespace Avalonia.Controls.UnitTests.Primitives Assert.Equal(2, raised); } - private IEnumerable SelectedContainers(SelectingItemsControl target) + private static IEnumerable SelectedContainers(SelectingItemsControl target) { return target.Presenter.Panel.Children .Select((x, i) => x.Classes.Contains(":selected") ? i : -1) .Where(x => x != -1); } - private FuncControlTemplate Template() + private static FuncControlTemplate Template() { return new FuncControlTemplate((control, scope) => new ItemsPresenter diff --git a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs index c54d7efe61..f34bcbbafe 100644 --- a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs @@ -425,7 +425,7 @@ namespace Avalonia.Controls.UnitTests } } - private IControlTemplate TabControlTemplate() + private static IControlTemplate TabControlTemplate() { return new FuncControlTemplate((parent, scope) => new StackPanel @@ -448,7 +448,7 @@ namespace Avalonia.Controls.UnitTests }); } - private IControlTemplate TabItemTemplate() + private static IControlTemplate TabItemTemplate() { return new FuncControlTemplate((parent, scope) => new ContentPresenter @@ -459,14 +459,14 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope)); } - private void Prepare(TabControl target) + private static void Prepare(TabControl target) { ApplyTemplate(target); target.Measure(Size.Infinity); target.Arrange(new Rect(target.DesiredSize)); } - private void ApplyTemplate(TabControl target) + private static void ApplyTemplate(TabControl target) { target.ApplyTemplate(); diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs index 48cc365029..e6146fa918 100644 --- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs +++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs @@ -90,7 +90,7 @@ namespace Avalonia.Controls.UnitTests textShaperImpl: new MockTextShaperImpl(), fontManagerImpl: new MockFontManagerImpl()); - private IControlTemplate CreateTemplate() + private static IControlTemplate CreateTemplate() { return new FuncControlTemplate((control, scope) => new TextPresenter diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs index 1c2b49dc7d..a18168fc55 100644 --- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs @@ -103,7 +103,7 @@ namespace Avalonia.Controls.UnitTests standardCursorFactory: Mock.Of(), textShaperImpl: new MockTextShaperImpl()); - private IControlTemplate CreateTemplate() + private static IControlTemplate CreateTemplate() { return new FuncControlTemplate((control, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs index db6349cc5a..d63251c1f5 100644 --- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs @@ -307,7 +307,7 @@ namespace Avalonia.Controls.UnitTests } } - private FuncControlTemplate CreateTemplate() + private static FuncControlTemplate CreateTemplate() { return new FuncControlTemplate((x, scope) => new ContentPresenter diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs index 9cf21423a3..fb21acad9e 100644 --- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs @@ -1293,12 +1293,12 @@ namespace Avalonia.Controls.UnitTests }; } - private void CreateNodeDataTemplate(IControl control) + private static void CreateNodeDataTemplate(IControl control) { control.DataTemplates.Add(new TestTreeDataTemplate()); } - private IControlTemplate CreateTreeViewTemplate() + private static IControlTemplate CreateTreeViewTemplate() { return new FuncControlTemplate((parent, scope) => new ItemsPresenter { @@ -1307,7 +1307,7 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope)); } - private IControlTemplate CreateTreeViewItemTemplate() + private static IControlTemplate CreateTreeViewItemTemplate() { return new FuncControlTemplate((parent, scope) => new Panel { @@ -1327,7 +1327,7 @@ namespace Avalonia.Controls.UnitTests }); } - private void ExpandAll(TreeView tree) + private static void ExpandAll(TreeView tree) { foreach (var i in tree.ItemContainerGenerator.Containers) { @@ -1373,7 +1373,7 @@ namespace Avalonia.Controls.UnitTests _mouse.Click(container, modifiers: modifiers); } - private void AssertChildrenSelected(TreeView treeView, Node rootNode) + private static void AssertChildrenSelected(TreeView treeView, Node rootNode) { foreach (var child in rootNode.Children) { @@ -1383,7 +1383,7 @@ namespace Avalonia.Controls.UnitTests } } - private IDisposable Application() + private static IDisposable Application() { return UnitTestApplication.Start( TestServices.MockThreadingInterface.With( diff --git a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs index 3d1980b0eb..a014a61b30 100644 --- a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs @@ -35,7 +35,7 @@ namespace Avalonia.Controls.UnitTests } } - private FuncControlTemplate GetTemplate() + private static FuncControlTemplate GetTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs index e4d177f7ca..f14adc24c3 100644 --- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs @@ -321,7 +321,7 @@ namespace Avalonia.Controls.UnitTests.Utils return button; } - private FuncControlTemplate CreateWindowTemplate() + private static FuncControlTemplate CreateWindowTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs index 4ffd314857..f98a9f165d 100644 --- a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs @@ -207,7 +207,7 @@ namespace Avalonia.Controls.UnitTests Assert.Equal(new Size(200, 200), target.DesiredSize); } - private bool TryGetScale(Viewbox viewbox, out Vector scale) + private static bool TryGetScale(Viewbox viewbox, out Vector scale) { if (viewbox.InternalTransform is null) { diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs index 1b4214e0c7..8f9af52ed8 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs @@ -225,7 +225,7 @@ namespace Avalonia.Controls.UnitTests } } - private FuncControlTemplate CreateTemplate() + private static FuncControlTemplate CreateTemplate() { return new FuncControlTemplate((x, scope) => new ContentPresenter diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs index 0cdde445d5..bb8a683a60 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs @@ -1003,7 +1003,7 @@ namespace Avalonia.Controls.UnitTests } } - private IWindowImpl CreateImpl(Mock renderer) + private static IWindowImpl CreateImpl(Mock renderer) { return Mock.Of(x => x.RenderScaling == 1 && diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs index f4a4a2934f..53c186111d 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs @@ -123,7 +123,7 @@ namespace Avalonia.Markup.UnitTests.Data } [MethodImpl(MethodImplOptions.NoInlining)] - private WeakReference AssignValue(TestControl source, string val) + private static WeakReference AssignValue(TestControl source, string val) { var obj = new DummyObject(val); diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs index 344cd1d576..8122903039 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs @@ -43,7 +43,7 @@ namespace Avalonia.Markup.UnitTests.Data Assert.Equal("Goodbye cruel world :(", target.Text); } - private Mock CreateTarget( + private static Mock CreateTarget( ITemplatedControl templatedParent = null, string text = null) { diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs index 11036e472e..155afb2356 100644 --- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs @@ -152,7 +152,7 @@ namespace Avalonia.Markup.UnitTests.Parsers Assert.IsType(result[1]); } - private void AssertIsProperty(ExpressionNode node, string name) + private static void AssertIsProperty(ExpressionNode node, string name) { Assert.IsType(node); @@ -160,7 +160,7 @@ namespace Avalonia.Markup.UnitTests.Parsers Assert.Equal(name, p.PropertyName); } - private void AssertIsIndexer(ExpressionNode node, params string[] args) + private static void AssertIsIndexer(ExpressionNode node, params string[] args) { Assert.IsType(node); @@ -168,7 +168,7 @@ namespace Avalonia.Markup.UnitTests.Parsers Assert.Equal(e.Arguments.ToArray(), args); } - private List ToList((ExpressionNode node, SourceMode mode) parsed) + private static List ToList((ExpressionNode node, SourceMode mode) parsed) { var (node, _) = parsed; var result = new List(); diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs index 20ed22e84f..4a0db45ce6 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs @@ -17,7 +17,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions [Fact] public void BindingExtension_Binds_To_Source() { - using (StyledWindow()) + using (BindingExtensionTests.StyledWindow()) { var xaml = @" new Styles { - WindowStyle(), + BindingExtensionTests.WindowStyle(), }); return UnitTestApplication.Start(services); } - private Style WindowStyle() + private static Style WindowStyle() { return new Style(x => x.OfType()) { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs index 987725c314..4f323d8b2c 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs @@ -894,13 +894,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions assetLoader: new MockAssetLoader(assets), theme: () => new Styles { - WindowStyle(), + DynamicResourceExtensionTests.WindowStyle(), }); return UnitTestApplication.Start(services); } - private Style WindowStyle() + private static Style WindowStyle() { return new Style(x => x.OfType()) { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs index d8ecba36f5..9620cae901 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs @@ -20,7 +20,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions #ff506070 "; - using (StartWithResources(("test:include.xaml", includeXaml))) + using (StaticResourceExtensionTests.StartWithResources(("test:include.xaml", includeXaml))) { var xaml = @" "; - using (StartWithResources(("test:style.xaml", styleXaml))) + using (StaticResourceExtensionTests.StartWithResources(("test:style.xaml", styleXaml))) { var xaml = @" new Styles { - WindowStyle(), + StaticResourceExtensionTests.WindowStyle(), }); return UnitTestApplication.Start(services); } - private Style WindowStyle() + private static Style WindowStyle() { return new Style(x => x.OfType()) { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs index 2a4468a750..2fe8776d8b 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs @@ -14,7 +14,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); var reader = new CharacterReader("Foo".AsSpan()); - var (ns, owner, name) = target.Parse(reader); + var (ns, owner, name) = PropertyParser.Parse(reader); Assert.Null(ns); Assert.Null(owner); @@ -26,7 +26,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); var reader = new CharacterReader("Foo.Bar".AsSpan()); - var (ns, owner, name) = target.Parse(reader); + var (ns, owner, name) = PropertyParser.Parse(reader); Assert.Null(ns); Assert.Equal("Foo", owner); @@ -38,7 +38,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); var reader = new CharacterReader("foo:Bar.Baz".AsSpan()); - var (ns, owner, name) = target.Parse(reader); + var (ns, owner, name) = PropertyParser.Parse(reader); Assert.Equal("foo", ns); Assert.Equal("Bar", owner); @@ -50,7 +50,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); var reader = new CharacterReader("(Foo.Bar)".AsSpan()); - var (ns, owner, name) = target.Parse(reader); + var (ns, owner, name) = PropertyParser.Parse(reader); Assert.Null(ns); Assert.Equal("Foo", owner); @@ -62,7 +62,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); var reader = new CharacterReader("(foo:Bar.Baz)".AsSpan()); - var (ns, owner, name) = target.Parse(reader); + var (ns, owner, name) = PropertyParser.Parse(reader); Assert.Equal("foo", ns); Assert.Equal("Bar", owner); @@ -74,7 +74,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader(ReadOnlySpan.Empty))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader(ReadOnlySpan.Empty))); Assert.Equal(0, ex.Column); Assert.Equal("Expected property name.", ex.Message); } @@ -84,7 +84,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader(" ".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader(" ".AsSpan()))); Assert.Equal(0, ex.Column); Assert.Equal("Unexpected ' '.", ex.Message); } @@ -94,7 +94,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader(" Foo".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader(" Foo".AsSpan()))); Assert.Equal(0, ex.Column); Assert.Equal("Unexpected ' '.", ex.Message); } @@ -104,7 +104,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("Foo ".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("Foo ".AsSpan()))); Assert.Equal(3, ex.Column); Assert.Equal("Unexpected ' '.", ex.Message); } @@ -114,7 +114,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("123".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("123".AsSpan()))); Assert.Equal(0, ex.Column); Assert.Equal("Unexpected '1'.", ex.Message); } @@ -124,7 +124,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("Foo%".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("Foo%".AsSpan()))); Assert.Equal(3, ex.Column); Assert.Equal("Unexpected '%'.", ex.Message); } @@ -134,7 +134,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("Foo.123".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("Foo.123".AsSpan()))); Assert.Equal(4, ex.Column); Assert.Equal("Unexpected '1'.", ex.Message); } @@ -144,7 +144,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("Foo. Bar".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("Foo. Bar".AsSpan()))); Assert.Equal(4, ex.Column); Assert.Equal("Unexpected ' '.", ex.Message); } @@ -154,7 +154,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("Foo.Bar.Baz".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("Foo.Bar.Baz".AsSpan()))); Assert.Equal(8, ex.Column); Assert.Equal("Unexpected '.'.", ex.Message); } @@ -164,7 +164,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("foo:bar:Baz".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("foo:bar:Baz".AsSpan()))); Assert.Equal(8, ex.Column); Assert.Equal("Unexpected ':'.", ex.Message); } @@ -174,7 +174,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("(Foo)".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("(Foo)".AsSpan()))); Assert.Equal(1, ex.Column); Assert.Equal("Expected property owner.", ex.Message); } @@ -184,7 +184,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("(foo:Bar)".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("(foo:Bar)".AsSpan()))); Assert.Equal(1, ex.Column); Assert.Equal("Expected property owner.", ex.Message); } @@ -194,7 +194,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("(Foo.Bar".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("(Foo.Bar".AsSpan()))); Assert.Equal(8, ex.Column); Assert.Equal("Expected ')'.", ex.Message); } @@ -204,7 +204,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers { var target = new PropertyParser(); - var ex = Assert.Throws(() => target.Parse(new CharacterReader("Foo.Bar)".AsSpan()))); + var ex = Assert.Throws(() => PropertyParser.Parse(new CharacterReader("Foo.Bar)".AsSpan()))); Assert.Equal(7, ex.Column); Assert.Equal("Unexpected ')'.", ex.Message); } diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs index 239a109193..686e3d4157 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs @@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests "; - using (StartWithResources(("test:style.xaml", styleXaml))) + using (StyleIncludeTests.StartWithResources(("test:style.xaml", styleXaml))) { var xaml = @" new Styles { - WindowStyle(), + ResourceDictionaryTests.WindowStyle(), }); return UnitTestApplication.Start(services); } - private Style WindowStyle() + private static Style WindowStyle() { return new Style(x => x.OfType()) { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs index 77a4932ccc..b164f6c371 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs @@ -162,7 +162,7 @@ namespace Avalonia.Markup.Xaml.UnitTests } - void AssertThrows(Action callback, Func check) + static void AssertThrows(Action callback, Func check) { try { @@ -182,7 +182,7 @@ namespace Avalonia.Markup.Xaml.UnitTests public void Bug2570() { SomeStaticProperty = "123"; - AssertThrows(() => AvaloniaRuntimeXamlLoader + XamlIlTests.AssertThrows(() => AvaloniaRuntimeXamlLoader .Load(@" (child); } - private FuncControlTemplate GetTemplate() + private static FuncControlTemplate GetTemplate() { return new FuncControlTemplate((parent, scope) => { diff --git a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs index 06e46c1a06..f6e7ba0c48 100644 --- a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs +++ b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs @@ -17,7 +17,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media { } - private GeometryDrawing CreateGeometryDrawing() + private static GeometryDrawing CreateGeometryDrawing() { GeometryDrawing geometryDrawing = new GeometryDrawing(); EllipseGeometry ellipse = new EllipseGeometry(); diff --git a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs index b668f4d39e..f921d9fa64 100644 --- a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs +++ b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs @@ -39,7 +39,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media { } - private TextLayout Create(string text, + private static TextLayout Create(string text, string fontFamily, double fontSize, FontStyle fontStyle, @@ -56,7 +56,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media return formattedText; } - private TextLayout Create(string text, double fontSize) + private static TextLayout Create(string text, double fontSize) { return Create(text, FontName, fontSize, FontStyle.Normal, TextAlignment.Left, @@ -64,7 +64,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media -1); } - private TextLayout Create(string text, double fontSize, TextAlignment alignment, double widthConstraint) + private static TextLayout Create(string text, double fontSize, TextAlignment alignment, double widthConstraint) { return Create(text, FontName, fontSize, FontStyle.Normal, alignment, @@ -72,7 +72,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media widthConstraint); } - private TextLayout Create(string text, double fontSize, TextWrapping wrap, double widthConstraint) + private static TextLayout Create(string text, double fontSize, TextWrapping wrap, double widthConstraint) { return Create(text, FontName, fontSize, FontStyle.Normal, TextAlignment.Left, diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs index 4d6b313ffc..3f918e2a73 100644 --- a/tests/Avalonia.RenderTests/TestBase.cs +++ b/tests/Avalonia.RenderTests/TestBase.cs @@ -237,7 +237,7 @@ namespace Avalonia.Direct2D1.RenderTests return Math.Sqrt(meanSquaresError); } - private string GetTestsDirectory() + private static string GetTestsDirectory() { var path = Directory.GetCurrentDirectory(); diff --git a/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs b/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs index df0cc2fc1a..68595a2f57 100644 --- a/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs +++ b/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs @@ -21,7 +21,7 @@ namespace Avalonia.Skia.UnitTests target.DrawRectangle(Brushes.Black, new Pen(Brushes.Black, 0), new RoundedRect(new Rect(0, 0, 100, 100), new CornerRadius(4))); } - private DrawingContextImpl CreateTarget() + private static DrawingContextImpl CreateTarget() { var canvas = new SKCanvas(new SKBitmap(100, 100)); return (DrawingContextImpl)DrawingContextHelper.WrapSkiaCanvas(canvas, new Vector(96, 96));