From f1e4a6a50aa4d1bb3007da1b388256f4443241da Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 2 Jul 2020 16:30:56 +0200 Subject: [PATCH 1/2] Register a font manager. `DatePickerTests` are proving to be flaky, register the services that are reported missing when they fail. --- tests/Avalonia.Controls.UnitTests/DatePickerTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs index 7c95f02a7a..7bcb120850 100644 --- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs +++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs @@ -203,7 +203,9 @@ namespace Avalonia.Controls.UnitTests } private static TestServices Services => TestServices.MockThreadingInterface.With( - standardCursorFactory: Mock.Of()); + fontManagerImpl: new MockFontManagerImpl(), + standardCursorFactory: Mock.Of(), + textShaperImpl: new MockTextShaperImpl()); private IControlTemplate CreateTemplate() { From ccd5a9272531385558712fff7304a1910b1b57c6 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 2 Jul 2020 12:33:45 -0300 Subject: [PATCH 2/2] apply fix to timepicker tests also. --- tests/Avalonia.Controls.UnitTests/TimePickerTests.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs index c803b93364..682f0eaadb 100644 --- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs @@ -12,7 +12,7 @@ namespace Avalonia.Controls.UnitTests { public class TimePickerTests { - [Fact(Skip = "FIX ME ASAP")] + [Fact] public void SelectedTimeChanged_Should_Fire_When_SelectedTime_Set() { using (UnitTestApplication.Start(Services)) @@ -98,9 +98,10 @@ namespace Avalonia.Controls.UnitTests } } - private static TestServices Services => TestServices.MockThreadingInterface.With( - standardCursorFactory: Mock.Of()); + fontManagerImpl: new MockFontManagerImpl(), + standardCursorFactory: Mock.Of(), + textShaperImpl: new MockTextShaperImpl()); private IControlTemplate CreateTemplate() {