Attach And Run iOS / catalyst (#19571)

dotnet · Jan 2, 2024 · 61ca414 · 61ca414
1 parent 3944004
commit 61ca414
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs
@@ -83,9 +83,15 @@ public async virtual Task SettingSemanticDescriptionMakesElementAccessible()
 		{
 			var view = new TStub();
 			MockAccessibilityExpectations(view);
-
 			view.Semantics.Description = "Test";
-			var important = await GetValueAsync(view, handler => view.IsAccessibilityElement());
+
+			#if IOS || MACCATALYST
+			bool attachAndRun = true;
+			#else
+			bool attachAndRun = false;
+			#endif
+
+			var important = await GetValueAsync(view, handler => view.IsAccessibilityElement(), attachAndRun);
 
 			Assert.True(important);
 		}
@@ -96,8 +102,14 @@ public async virtual Task SettingSemanticHintMakesElementAccessible()
 			var view = new TStub();
 			MockAccessibilityExpectations(view);
 
+			#if IOS || MACCATALYST
+			bool attachAndRun = true;
+			#else
+			bool attachAndRun = false;
+			#endif
+
 			view.Semantics.Hint = "Test";
-			var important = await GetValueAsync(view, handler => view.IsAccessibilityElement());
+			var important = await GetValueAsync(view, handler => view.IsAccessibilityElement(), attachAndRun);
 
 			Assert.True(important);
 		}
@@ -134,7 +146,13 @@ public async Task SetSemanticHeading()
 			var view = new TStub();
 			view.Semantics.HeadingLevel = SemanticHeadingLevel.Level1;
 
-			var id = await GetValueAsync(view, handler => GetSemanticHeading(handler));
+			#if IOS || MACCATALYST
+			bool attachAndRun = true;
+			#else
+			bool attachAndRun = false;
+			#endif
+
+			var id = await GetValueAsync(view, handler => GetSemanticHeading(handler), attachAndRun);
 			Assert.Equal(view.Semantics.HeadingLevel, id);
 		}
 

diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasementOfT.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasementOfT.cs
@@ -56,12 +56,19 @@ protected Task<THandler> CreateHandlerAsync(IView view)
 			});
 		}
 
-		protected Task<TValue> GetValueAsync<TValue>(IView view, Func<THandler, TValue> func)
+		protected Task<TValue> GetValueAsync<TValue>(IView view, Func<THandler, TValue> func, bool attachAndRun = false)
 		{
-			return InvokeOnMainThreadAsync(() =>
+			return InvokeOnMainThreadAsync<TValue>(() =>
 			{
-				var handler = CreateHandler(view);
-				return func(handler);
+				if (attachAndRun)
+				{
+					return AttachAndRun(view, func);
+				}
+				else
+				{
+					THandler handler = CreateHandler(view);
+					return Task.FromResult(func(handler));
+				}
 			});
 		}