[tests] Fix FontManagerTest.RegisterFontDescriptors_WithCallback to be a bit more lax. Fixes #6690. (#21348)

This way we can actually run the test.

Fixes https://github.com/xamarin/xamarin-macios/issues/6690.
This commit is contained in:
Rolf Bjarne Kvinge 2024-10-03 11:14:31 +02:00 коммит произвёл GitHub
Родитель 260b12a99d
Коммит 2a3b250aba
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
1 изменённых файлов: 20 добавлений и 9 удалений

Просмотреть файл

@ -188,7 +188,6 @@ namespace MonoTouchFixtures.CoreText {
Assert.Throws<ArgumentException> (() => CTFontManager.UnregisterFontDescriptors (new CTFontDescriptor [] { null }, CTFontManagerScope.Process, null), "null element"); Assert.Throws<ArgumentException> (() => CTFontManager.UnregisterFontDescriptors (new CTFontDescriptor [] { null }, CTFontManagerScope.Process, null), "null element");
} }
#if !__WATCHOS__
[Test] [Test]
public void RegisterFontDescriptors_NoCallback () public void RegisterFontDescriptors_NoCallback ()
{ {
@ -205,11 +204,6 @@ namespace MonoTouchFixtures.CoreText {
} }
} }
#if __TVOS__
[Ignore ("Fails on tvOS with undocumented error code 'The operation couldnt be completed. (com.apple.CoreText.CTFontManagerErrorDomain error 500.'")]
#elif __IOS__
[Ignore ("https://github.com/xamarin/xamarin-macios/issues/6690. This began failing for no aparent reason in iOS 13 Beta 5. Check back with GM.")]
#endif
[Test] [Test]
public void RegisterFontDescriptors_WithCallback () public void RegisterFontDescriptors_WithCallback ()
{ {
@ -220,13 +214,30 @@ namespace MonoTouchFixtures.CoreText {
StyleName = "Bold", StyleName = "Bold",
Size = 16.0f Size = 16.0f
}; };
Exception? ex = null;
using (CTFontDescriptor fd = new CTFontDescriptor (fda)) { using (CTFontDescriptor fd = new CTFontDescriptor (fda)) {
var array = new [] { fd }; var array = new [] { fd };
CTFontManager.RegisterFontDescriptors (array, CTFontManagerScope.Process, true, SuccessDone); CTFontManager.RegisterFontDescriptors (array, CTFontManagerScope.Process, true, (NSError [] errors, bool done) => {
CTFontManager.UnregisterFontDescriptors (array, CTFontManagerScope.Process, SuccessDone); try {
Assert.True (done, "done: RegisterFontDescriptors");
} catch (Exception e) {
ex = e;
}
return true;
});
Assert.That (ex, Is.Null.Or.Not.Null, "RegisterFontDescriptors");
CTFontManager.UnregisterFontDescriptors (array, CTFontManagerScope.Process, (NSError [] errors, bool done) => {
try {
Assert.True (done, "done: UnregisterFontDescriptors");
} catch (Exception e) {
ex = e;
}
return true;
});
Assert.That (ex, Is.Null.Or.Not.Null, "UnregisterFontDescriptors");
} }
} }
#endif
[Test] [Test]
public void GetFontsNullUrl () public void GetFontsNullUrl ()