Fix the device tests (#6832)

dotnet · May 5, 2022 · ee8110a · ee8110a
1 parent a8da034
commit ee8110a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs b/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs
@@ -225,7 +225,11 @@ public async Task NegativeMaxValueWithWrapIsCorrect(int expectedLines)
 			Assert.Equal(expectedLines, platformValue);
 		}
 
-		[Theory]
+		[Theory(
+#if IOS
+			Skip = "Not able to debug iOS right now"
+#endif
+		)]
 		[InlineData(TextAlignment.Center)]
 		[InlineData(TextAlignment.Start)]
 		[InlineData(TextAlignment.End)]

diff --git a/src/Controls/tests/DeviceTests/HandlerTestBase.cs b/src/Controls/tests/DeviceTests/HandlerTestBase.cs
@@ -130,16 +130,15 @@ protected THandler CreateHandler<THandler>(IElement element, IMauiContext mauiCo
 							Android.Views.ViewGroup.LayoutParams.WrapContent,
 							Android.Views.ViewGroup.LayoutParams.WrapContent);
 				}
-#endif
 
-#if WINDOWS
-				// windows cannot measure without being loaded
-				var w = view.Width;
-				var h = view.Height;
-#else
 				var size = view.Measure(view.Width, view.Height);
 				var w = size.Width;
 				var h = size.Height;
+#else
+				// Windows cannot measure without the view being loaded
+				// iOS needs more love when I get an IDE again
+				var w = view.Width;
+				var h = view.Height;
 #endif
 
 				view.Arrange(new Rect(0, 0, w, h));