Skip to content

Commit

Permalink
[tests] Remove ignore for StringAttributesTests.SimpleAttributesTest. F…
Browse files Browse the repository at this point in the history
…ixes xamarin#18656.

Also remove a few unnecessary ifdefs.

Fixes xamarin#18656.
  • Loading branch information
rolfbjarne committed Sep 27, 2024
1 parent fc9d73b commit cda9d09
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions tests/monotouch-test/CoreText/StringAttributes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ public class StringAttributesTests {
[Test]
public void SimpleValuesSet ()
{
if (TestRuntime.CheckXcodeVersion (15, 0))
Assert.Ignore ("Test timeouts on Xcode 15 beta 4: https://github.com/xamarin/xamarin-macios/issues/18656");

var sa = new CTStringAttributes ();
sa.ForegroundColor = UIColor.Blue.CGColor;
sa.Font = new CTFont ("Georgia-BoldItalic", 24);
Expand All @@ -50,10 +47,8 @@ public void SimpleValuesSet ()
sa.TrackingAdjustment = 1.0f;

AdaptiveImageProvider? provider = null;
#if NET
if (TestRuntime.CheckXcodeVersion (16, 0))
sa.AdaptiveImageProvider = provider = new AdaptiveImageProvider ();
#endif

var size = new CGSize (300, 300);
UIGraphics.BeginImageContext (size);
Expand All @@ -67,7 +62,6 @@ public void SimpleValuesSet ()
textLine.Draw (gctx);
}

#if NET
if (TestRuntime.CheckXcodeVersion (16, 0))
Assert.AreEqual (0, provider!.Count, "AdaptiveImageProvider #0");

Expand All @@ -78,7 +72,6 @@ public void SimpleValuesSet ()

if (TestRuntime.CheckXcodeVersion (16, 0))
Assert.AreEqual (1, provider!.Count, "AdaptiveImageProvider #1");
#endif

UIGraphics.EndImageContext ();
}
Expand Down

0 comments on commit cda9d09

Please sign in to comment.