From 50db0e315e2382a8a7142aa4b27862574e8af432 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 28 Jun 2022 22:20:45 +0200 Subject: [PATCH] [monotouch-test] Adjust a few tests according to new behavior. --- tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs | 6 +++--- tests/monotouch-test/UIKit/SimpleTextPrintFormatterTest.cs | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs b/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs index 7ebc962fca..6926f02131 100644 --- a/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs +++ b/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs @@ -451,7 +451,7 @@ namespace MonoTouchFixtures.CoreGraphics { using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb)) { var csl = cs.CreateLinearized (); Assert.NotNull (csl, "not null"); - Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1)); + Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1).Or.EqualTo ((nint) 2)); } } @@ -462,7 +462,7 @@ namespace MonoTouchFixtures.CoreGraphics { using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb)) { var csl = cs.CreateExtended (); Assert.NotNull (csl, "not null"); - Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1)); + Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1).Or.EqualTo ((nint) 2)); } } @@ -473,7 +473,7 @@ namespace MonoTouchFixtures.CoreGraphics { using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb)) { var csl = cs.CreateExtendedLinearized (); Assert.NotNull (csl, "not null"); - Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1)); + Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1).Or.EqualTo ((nint) 2)); } } diff --git a/tests/monotouch-test/UIKit/SimpleTextPrintFormatterTest.cs b/tests/monotouch-test/UIKit/SimpleTextPrintFormatterTest.cs index 3ea898a690..195783b2fd 100644 --- a/tests/monotouch-test/UIKit/SimpleTextPrintFormatterTest.cs +++ b/tests/monotouch-test/UIKit/SimpleTextPrintFormatterTest.cs @@ -62,7 +62,11 @@ namespace MonoTouchFixtures.UIKit { Assert.That (stpf.Color, Is.EqualTo (UIColor.Black), "Color"); Assert.That (stpf.TextAlignment, Is.EqualTo (UITextAlignment.Left), "TextAlignment"); } - Assert.NotNull (stpf.Font, "Font"); + if (TestRuntime.CheckXcodeVersion (14, 0)) { + Assert.Null (stpf.Font, "Font"); + } else { + Assert.NotNull (stpf.Font, "Font"); + } Assert.That (stpf.Text, Is.EqualTo ("Xamarin"), "Text"); } }