made the code more test friendly

TinyStuff · Nov 17, 2022 · 9636f29 · 9636f29
1 parent 5d8ff0c
commit 9636f29
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/src/MAUI/TinyMvvm.Maui/TinyDispatcher.cs b/src/MAUI/TinyMvvm.Maui/TinyDispatcher.cs
@@ -0,0 +1,32 @@
+using System;
+namespace TinyMvvm.Maui;
+
+internal static class TinyDispatcher
+{
+    internal static void BeginInvokeOnMainThread(Action action)
+    {
+        //Run Task.Run instead, because MainThread is not supported during unit tests.
+        if (DeviceInfo.Platform == DevicePlatform.Unknown)
+        {
+            Task.Run(action);
+            return;
+        }
+
+        MainThread.BeginInvokeOnMainThread(action);
+    }
+
+    internal static bool IsMainThread
+    {
+        get
+        {
+            //Always return true, because MainThread is not supported during unit tests.
+            if (DeviceInfo.Platform == DevicePlatform.Unknown)
+            {
+                return true;
+            }
+
+            return MainThread.IsMainThread;
+        }
+    }
+}
+
diff --git a/src/MAUI/TinyMvvm.Maui/TinyView.cs b/src/MAUI/TinyMvvm.Maui/TinyView.cs
@@ -1,4 +1,6 @@
-namespace TinyMvvm;
+using TinyMvvm.Maui;
+
+namespace TinyMvvm;
 
 public abstract class TinyView : ContentPage
 {
@@ -28,13 +30,13 @@ async Task InternalInitialize()
                     }
                 }
 
-                if (MainThread.IsMainThread)
+                if (TinyDispatcher.IsMainThread)
                 {
                     await InternalInitialize();
                 }
                 else
                 {
-                    MainThread.BeginInvokeOnMainThread(async () => await InternalInitialize());
+                    TinyDispatcher.BeginInvokeOnMainThread(async () => await InternalInitialize());
                 }
             }
 
@@ -47,7 +49,7 @@ protected override void OnAppearing()
 
         if (BindingContext is ITinyViewModel viewModel)
         {
-            MainThread.BeginInvokeOnMainThread(async () =>
+            TinyDispatcher.BeginInvokeOnMainThread(async () =>
             {
                 await InternalLock.WaitAsync();
 
@@ -71,7 +73,7 @@ protected override void OnDisappearing()
 
         if (BindingContext is ITinyViewModel viewModel)
         {
-            MainThread.BeginInvokeOnMainThread(async () =>
+            TinyDispatcher.BeginInvokeOnMainThread(async () =>
             {
                 await InternalLock.WaitAsync();
 

diff --git a/src/MAUI/TinyMvvm.Maui/TinyViewModel.cs b/src/MAUI/TinyMvvm.Maui/TinyViewModel.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using TinyMvvm.Maui;
 
 namespace TinyMvvm;
 
@@ -42,7 +43,7 @@ public virtual Task OnAppearing()
 
         if (!hasAppeared)
         {
-            MainThread.BeginInvokeOnMainThread(async () => await OnFirstAppear());
+            TinyDispatcher.BeginInvokeOnMainThread(async () => await OnFirstAppear());
         }
 
         hasAppeared = true;
@@ -152,13 +153,13 @@ public async void ApplyQueryAttributes(IDictionary<string, object> query)
             QueryParameters = query;
         }
 
-        if (MainThread.IsMainThread)
+        if (TinyDispatcher.IsMainThread)
         {
             await OnParameterSet();
         }
         else
         {
-            MainThread.BeginInvokeOnMainThread(async () =>
+            TinyDispatcher.BeginInvokeOnMainThread(async () =>
             {
                 await OnParameterSet();
             });