[tests] CV 2 devicetests (#25078)

* [tests] Run Device tests with CV2 * Make sure to run on UI thread
dotnet · Oct 4, 2024 · cfef6a3 · cfef6a3
1 parent add2226
commit cfef6a3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs b/src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs
@@ -41,7 +41,10 @@ protected override void DisconnectHandler(UIView platformView)
 		{
 			ItemsView.ScrollToRequested -= ScrollToRequested;
 			_layout = null;
-			Controller?.DisposeItemsSource();
+			MauiContext?.GetDispatcher()?.Dispatch(() =>
+			{
+				Controller?.DisposeItemsSource();
+			});
 			base.DisconnectHandler(platformView);
 		}
 

diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewController2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewController2.cs
@@ -203,6 +203,7 @@ void Items.MauiCollectionView.ICustomMauiCollectionViewDelegate.MovedToWindow(UI
 				DetachingFromWindow();
 			}
 		}
+
 		internal void DisposeItemsSource()
 		{
 			ItemsSource?.Dispose();

diff --git a/src/Core/tests/DeviceTests.Shared/MauiProgramDefaults.cs b/src/Core/tests/DeviceTests.Shared/MauiProgramDefaults.cs
@@ -66,6 +66,16 @@ public static MauiApp CreateMauiApp(List<Assembly> testAssemblies)
 			{
 				RequiresUIContext = true,
 			});
+#endif
+
+#if IOS || MACCATALYST
+
+			appBuilder.ConfigureMauiHandlers(handlers =>
+				{
+					handlers.AddHandler<Microsoft.Maui.Controls.CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();
+					handlers.AddHandler<Microsoft.Maui.Controls.CarouselView, Microsoft.Maui.Controls.Handlers.Items2.CarouselViewHandler2>();
+				});
+
 #endif
 			appBuilder.UseVisualRunner();
-Original file line number
+Diff line change
@@ Expand Up @@
     				DetachingFromWindow();
     			}
     		}
     		internal void DisposeItemsSource()
     		{
     			ItemsSource?.Dispose();
@@ Expand Down @@