From 37168e21bb7c99545ef3f4d83a2f008b494f1d20 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Mar 2023 16:27:44 +0100 Subject: [PATCH] Use EnterScope --- .../Avalonia.Skia.UnitTests/Media/FontManagerTests.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/Avalonia.Skia.UnitTests/Media/FontManagerTests.cs b/tests/Avalonia.Skia.UnitTests/Media/FontManagerTests.cs index c8bc550c50..37f275484a 100644 --- a/tests/Avalonia.Skia.UnitTests/Media/FontManagerTests.cs +++ b/tests/Avalonia.Skia.UnitTests/Media/FontManagerTests.cs @@ -105,13 +105,16 @@ namespace Avalonia.Skia.UnitTests.Media { using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface.With(fontManagerImpl: new FontManagerImpl()))) { - AvaloniaLocator.CurrentMutable.BindToSelf(new FontManagerOptions { DefaultFamilyName = s_fontUri }); + using (AvaloniaLocator.EnterScope()) + { + AvaloniaLocator.CurrentMutable.BindToSelf(new FontManagerOptions { DefaultFamilyName = s_fontUri }); - var result = FontManager.Current.TryGetGlyphTypeface(new Typeface(FontFamily.DefaultFontFamilyName), out var glyphTypeface); + var result = FontManager.Current.TryGetGlyphTypeface(new Typeface(FontFamily.DefaultFontFamilyName), out var glyphTypeface); - Assert.True(result); + Assert.True(result); - Assert.Equal("Noto Mono", glyphTypeface.FamilyName); + Assert.Equal("Noto Mono", glyphTypeface.FamilyName); + } } } }