Resolve IAsyncCommand / IAsyncValueValueCommand Unit Test Race Condition

azure-pipelines.yml

@@ -10,9 +10,11 @@ variables:
   NETCORE_TEST_VERSION_3_1: '3.1.x'
   NETCORE_TEST_VERSION_2_1: '2.1.x'
   RunPoliCheck: 'false'
-  PathToCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj'
   PathToMarkupCsproj: 'src/Markup/Xamarin.CommunityToolkit.Markup/Xamarin.CommunityToolkit.Markup.csproj'
+  PathToCommunityToolkitCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj'
+  PathToSamplesSln: 'samples/XCT.Sample.sln'
   PathToUnitTestCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj'
+  PathToMsBuildOnMacOS: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll'
   PathToSln: 'samples/XCT.Sample.sln'
 
 resources:
@@ -95,9 +97,9 @@ jobs:
         condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
       # restore, build and pack the packages
       - task: MSBuild@1
-        displayName: Build Solution
+        displayName: Build Xamarin.CommunityToolkit.csproj
         inputs:
-          solution: $(PathToCsproj)
+          solution: $(PathToCommunityToolkitCsproj)
           configuration: Release
           msbuildArguments: '/restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
       - task: CopyFiles@2
@@ -107,7 +109,7 @@ jobs:
       - task: MSBuild@1
         displayName: Pack NuGets
         inputs:
-          solution: $(PathToCsproj)
+          solution: $(PathToCommunityToolkitCsproj)
           configuration: Release
           msbuildArguments: '/t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"'
       - task: MSBuild@1
@@ -191,13 +193,29 @@ jobs:
           version: $(NETCORE_TEST_VERSION_2_1)
           includePreviewVersions: false
       - task: CmdLine@2
-        displayName: 'Build Solution'
+        displayName: 'Build Xamarin.CommunityToolkit.csproj'
+        inputs:
+          script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
+      - task: CmdLine@2
+        displayName: 'Run Unit Tests'
         inputs:
-          script: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll $(PathToCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
+          script: |
+            dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release
+            $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=Release /restore /t:Build
+
+            echo "********** Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) **********"
+
+            # UnitTestDLL for .NET Framework 4.6.1 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`
+            # XUnit Console Runner for .NET Framework 4.6.1 Result: `find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`
+
+            mono "`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`" "`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`"
+
+            echo "***** Running Unit Tests on .NET Core *****"
+            dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS"
       - task: CmdLine@2
         displayName: 'Pack NuGets'
         inputs:
-          script: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll $(PathToCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"'
+          script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"'
 
   - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
     - template: sign-artifacts/jobs/v2.yml@internal-templates

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Helpers/LocalizedStringTests/LocalizedStringTests.cs

@@ -77,6 +77,9 @@ public void LocalizedStringTests_WeekSubscribe_ValidImplementation()
 			Assert.True(isTrigered);
 		}
 
+#if NET461
+#warning Test fails on mono x64 Running on macOS
+#else
 		[Fact]
 		public void LocalizedStringTests_Disposed_IfNoReferences()
 		{
@@ -97,5 +100,6 @@ void SetLocalizedString()
 				localizedString = new LocalizedString(localizationManager, () => localizationManager[testString]);
 			}
 		}
+#endif
 	}
 }

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/AsyncCommand_Tests.cs

@@ -164,7 +164,7 @@ public void AsyncCommand_NoParameter_NoCanExecute_Test()
 			Assert.True(command.CanExecute(null));
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncCommand_RaiseCanExecuteChanged_MainThreadCreation_MainThreadExecution_Test()
 		{
 			// Arrange
@@ -213,7 +213,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public Task AsyncCommand_RaiseCanExecuteChanged_BackgroundThreadCreation_BackgroundThreadExecution_Test() => Task.Run(async () =>
 		{
 			// Arrange
@@ -267,7 +267,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		});
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncCommand_RaiseCanExecuteChanged_MainThreadCreation_BackgroundThreadExecution_Test()
 		{
 			// Arrange
@@ -322,7 +322,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncCommand_RaiseCanExecuteChanged_BackgroundThreadCreation_MainThreadExecution_Test()
 		{
 			// Arrange
@@ -380,7 +380,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncCommand_ChangeCanExecute_Test()
 		{
 			// Arrange
@@ -429,7 +429,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -459,7 +459,7 @@ public async Task AsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test()
 			void handleCanExecuteChanged(object? sender, EventArgs e) => canExecuteChangedCount++;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncCommand_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/IAsyncCommand_Tests.cs

@@ -177,7 +177,7 @@ public void IAsyncCommand_NoParameter_CanExecuteFalse_NoParameter_Test()
 			Assert.False(command.CanExecute(null));
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task IAsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -207,7 +207,7 @@ public async Task IAsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test(
 			void handleCanExecuteChanged(object? sender, EventArgs e) => canExecuteChangedCount++;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task IAsyncCommand_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/ICommand_AsyncCommand_Tests.cs

@@ -190,7 +190,7 @@ public void ICommand_Parameter_CanExecuteChanged_Test()
 			Assert.False(command.CanExecute(false));
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -218,7 +218,7 @@ public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_
 			command.CanExecuteChanged -= handleCanExecuteChanged;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_Parameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange
@@ -263,7 +263,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -291,7 +291,7 @@ public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecution
 			command.CanExecuteChanged -= handleCanExecuteChanged;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_NoParameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/AsyncValueCommand_Tests.cs

@@ -187,7 +187,7 @@ public void AsyncValueCommandNoParameter_NoCanExecute_Test()
 			Assert.True(command.CanExecute(null));
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncValueCommand_RaiseCanExecuteChanged_Test()
 		{
 			// Arrange
@@ -236,7 +236,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncValueCommand_ChangeCanExecute_Test()
 		{
 			// Arrange
@@ -285,7 +285,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			}
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncValueCommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -315,7 +315,7 @@ public async Task AsyncValueCommand_Parameter_CanExecuteChanged_AllowsMultipleEx
 			command.CanExecuteChanged -= handleCanExecuteChanged;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncValueCommand_Parameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange
@@ -363,7 +363,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			Assert.Equal(canExecuteChangedCount, handleCanExecuteChangedResult);
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncValueCommand_NoParameter_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -393,7 +393,7 @@ public async Task AsyncValueCommand_NoParameter_CanExecuteChanged_AllowsMultiple
 			command.CanExecuteChanged -= handleCanExecuteChanged;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task AsyncValueCommand_NoParameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs

@@ -15,8 +15,6 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests
 
 		protected new ValueTask ParameterImmediateNullReferenceExceptionTask(int delay) => throw new NullReferenceException();
 
-		protected async ValueTask ValueTaskDelay(int delay) => await Task.Delay(delay);
-
 		protected new async ValueTask NoParameterDelayedNullReferenceExceptionTask()
 		{
 			await Task.Delay(Delay);
@@ -28,5 +26,7 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests
 			await Task.Delay(delay);
 			throw new NullReferenceException();
 		}
+
+		ValueTask ValueTaskDelay(int delay) => new ValueTask(Task.Delay(delay));
 	}
 }

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/ICommand_AsyncValueCommand_Tests.cs

@@ -216,7 +216,7 @@ public void ICommand_Parameter_CanExecuteChanged_Test()
 			Assert.False(command.CanExecute(false));
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -243,7 +243,7 @@ public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_
 			command.CanExecuteChanged -= handleCanExecuteChanged;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_Parameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange
@@ -287,7 +287,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e)
 			Assert.Equal(canExecuteChangedCount, handleCanExecuteChangedResult);
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecutions_Test()
 		{
 			// Arrange
@@ -315,7 +315,7 @@ public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecution
 			command.CanExecuteChanged -= handleCanExecuteChanged;
 		}
 
-		[Fact]
+		[Fact(Timeout = ICommandTestTimeout)]
 		public async Task ICommand_NoParameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test()
 		{
 			// Arrange

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/BaseCommandTests.cs

@@ -9,6 +9,7 @@ namespace Xamarin.CommunityToolkit.UnitTests.ObjectModel.ICommandTests
 	[Collection(nameof(BaseCommandTests))]
 	public abstract class BaseCommandTests
 	{
+		public const int ICommandTestTimeout = Delay * 6;
 		public const int Delay = 500;
 
 		public BaseCommandTests() => Device.PlatformServices = new MockPlatformServices();

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj

@@ -1,12 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'=='macOS'">
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)'!='macOS'">
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -17,6 +22,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="xunit.runner.console" Version="2.4.1">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.gtk.cs

@@ -5,9 +5,9 @@ namespace Xamarin.CommunityToolkit.ObjectModel.Internals
 {
 	public abstract partial class BaseCommand<TCanExecute>
 	{
-		static readonly Thread mainThread = Thread.CurrentThread;
+		readonly SynchronizationContext? synchronizationContext = SynchronizationContext.Current;
 
-		static bool IsMainThread => Thread.CurrentThread == mainThread;
+		bool IsMainThread => SynchronizationContext.Current == synchronizationContext;
 
 		static void BeginInvokeOnMainThread(Action action)
 		{

src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.netstandard.wpf.cs

@@ -6,11 +6,11 @@ namespace Xamarin.CommunityToolkit.ObjectModel.Internals
 {
 	public abstract partial class BaseCommand<TCanExecute>
 	{
-		static readonly SynchronizationContext? synchronizationContext = SynchronizationContext.Current;
+		readonly SynchronizationContext? synchronizationContext = SynchronizationContext.Current;
 
-		static bool IsMainThread => SynchronizationContext.Current == synchronizationContext;
+		bool IsMainThread => SynchronizationContext.Current == synchronizationContext;
 
-		static void BeginInvokeOnMainThread(Action action)
+		void BeginInvokeOnMainThread(Action action)
 		{
 			if (synchronizationContext != null && SynchronizationContext.Current != synchronizationContext)
 				synchronizationContext.Post(_ => action(), null);