From a298ff55f9baa86b622241ed67cdd4c57e89eb10 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 4 Mar 2023 15:24:12 +0000
Subject: [PATCH] clear dispatcher queue at the end of tests.

---
 tests/Avalonia.RenderTests/TestBase.cs           | 7 ++++++-
 tests/Avalonia.UnitTests/TestWithServicesBase.cs | 2 ++
 tests/Avalonia.UnitTests/UnitTestApplication.cs  | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index af4500e87f..84f44aa200 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Skia.RenderTests
 namespace Avalonia.Direct2D1.RenderTests
 #endif
 {
-    public class TestBase
+    public class TestBase : IDisposable
     {
 #if AVALONIA_SKIA
         private static string s_fontUri = "resm:Avalonia.Skia.RenderTests.Assets?assembly=Avalonia.Skia.RenderTests#Noto Mono";
@@ -282,5 +282,10 @@ namespace Avalonia.Direct2D1.RenderTests
                 });
             }
         }
+
+        public void Dispose()
+        {
+            Dispatcher.UIThread.RunJobs();
+        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/TestWithServicesBase.cs b/tests/Avalonia.UnitTests/TestWithServicesBase.cs
index bbd6c7427c..5d9e065d95 100644
--- a/tests/Avalonia.UnitTests/TestWithServicesBase.cs
+++ b/tests/Avalonia.UnitTests/TestWithServicesBase.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Avalonia.Threading;
 
 namespace Avalonia.UnitTests
 {
@@ -17,6 +18,7 @@ namespace Avalonia.UnitTests
 
         public void Dispose()
         {
+            Dispatcher.UIThread.RunJobs();
             _scope.Dispose();
         }
     }
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index 620f301565..c54308644f 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -46,6 +46,7 @@ namespace Avalonia.UnitTests
             Dispatcher.UIThread.UpdateServices();
             return Disposable.Create(() =>
             {
+                Dispatcher.UIThread.RunJobs();
                 scope.Dispose();
                 Dispatcher.UIThread.UpdateServices();
             });