MAUI: Added unit tests shared with Windows.

skst · skst · commit 11af9a7217f5 · 2024-03-03T22:37:21.000-06:00
diff --git a/CalculateX.MAUI.sln b/CalculateX.MAUI.sln
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathExpressions", "MAUI.Sou
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathExpressions.UnitTests", "MAUI.Source\MathExpressions.UnitTests\MathExpressions.UnitTests.csproj", "{51B7C763-6C9B-477E-9056-CC348172AF7A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalculateX.UnitTests", "MAUI.Source\CalculateX.UnitTests\CalculateX.UnitTests.csproj", "{1255F73B-4EED-445C-B5DF-E13BE9C37C68}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -28,6 +30,9 @@ Global
 		{51B7C763-6C9B-477E-9056-CC348172AF7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{51B7C763-6C9B-477E-9056-CC348172AF7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51B7C763-6C9B-477E-9056-CC348172AF7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1255F73B-4EED-445C-B5DF-E13BE9C37C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1255F73B-4EED-445C-B5DF-E13BE9C37C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1255F73B-4EED-445C-B5DF-E13BE9C37C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MAUI.Source/CalculateX.UnitTests/CalculateX.UnitTests.csproj b/MAUI.Source/CalculateX.UnitTests/CalculateX.UnitTests.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+<!--
+	Need to run on Windows, so must build for Windows.
+	But then how to distinguish between building WPF version and Android version.
+	Looks like we might need Windows-specific and Android-specific unit test files.
+-->
+		<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>$(DefineConstants);MAUI_UNITTESTS</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\Shared.Source\CalculateX.UnitTests\**" />
+    <Compile Include="..\..\Windows.Source\CalculateX.UnitTests\*.cs" />
+    <Compile Include="..\..\MAUI.Source\CalculateX\Shared\Numbers.cs" LinkBase="Shared" />
+    <Compile Include="..\..\MAUI.Source\CalculateX\Models\*.cs" LinkBase="Models" />
+    <Compile Include="..\..\MAUI.Source\CalculateX\ViewModels\*.cs" Link="ViewModels\%(RecursiveDir)%(FileName)%(Extension)" />
+    <!-- <Compile Include="..\..\MAUI.Source\CalculateX\Views\AboutPage.xaml.cs" LinkBase="Views" /> -->
+    <!-- <Compile Include="..\..\MAUI.Source\CalculateX\Views\VariablesPage.xaml.cs" LinkBase="Views" /> -->
+    <!-- <Compile Include="..\..\MAUI.Source\CalculateX\Views\WorkspacePage.xaml.cs" LinkBase="Views" /> -->
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MathExpressions\MathExpressions.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/MAUI.Source/CalculateX/ViewModels/WorkspaceViewModel.cs b/MAUI.Source/CalculateX/ViewModels/WorkspaceViewModel.cs
@@ -169,6 +169,7 @@ private async Task RenameWorkspaceAsync()
 
 	private async Task VariablesWorkspaceAsync()
 	{
+#if !MAUI_UNITTESTS
 		// Navigate to page that displays the variables from this workspace
 		await Shell.Current.GoToAsync(nameof(Views.VariablesPage),
 			new Dictionary<string, object>()
@@ -178,10 +179,13 @@ await Shell.Current.GoToAsync(nameof(Views.VariablesPage),
 					_workspace.Variables
 				}
 			});
+#endif
 	}
 
 	private async Task Help()
 	{
+#if !MAUI_UNITTESTS
 		await Shell.Current.GoToAsync(nameof(Views.HelpPage));
+#endif
 	}
 }
diff --git a/MAUI.Source/CalculateX/ViewModels/WorkspacesViewModel.cs b/MAUI.Source/CalculateX/ViewModels/WorkspacesViewModel.cs
@@ -54,7 +54,9 @@ private void AddWorkspace()
 
 	private async Task About()
 	{
+#if !MAUI_UNITTESTS
 		await Shell.Current.GoToAsync(nameof(Views.AboutPage));
+#endif
 	}
 
 	public void SaveWorkspaces() => _workspaces.SaveWorkspaces(_selectedWorkspaceID);
@@ -94,6 +96,7 @@ public async Task SelectWorkspaceAsync(WorkspaceViewModel? workspaceVM)
 
 		_selectedWorkspaceID = workspaceVM.ID;
 
+#if !MAUI_UNITTESTS
 		// Should navigate to "NotePage?ItemId=path\on\device\XYZ.notes.txt"
 		//Shell.Current.GoToAsync($"{nameof(Views.WorkspacePage)}?select={workspace.ID}");
 		await Shell.Current.GoToAsync(nameof(Views.WorkspacePage),
@@ -104,6 +107,7 @@ await Shell.Current.GoToAsync(nameof(Views.WorkspacePage),
 					TheWorkspaceViewModels.First(workspaceView => workspaceView.ID == workspaceVM.ID)
 				}
 			});
+#endif
 	}
 
 	private string FormWorkspaceName()
diff --git a/Windows.Source/CalculateX.UnitTests/Windows.WorkspaceViewModel.cs b/Windows.Source/CalculateX.UnitTests/Windows.WorkspaceViewModel.cs
@@ -33,17 +33,27 @@ public void TestConstructorDefault()
 	{
 		ViewModels.WorkspaceViewModel vm = new();
 		Assert.IsTrue(vm.CanCloseTab);
+#if !MAUI_UNITTESTS
 		Assert.AreEqual("Designer", vm.Name);
+#else
+		Assert.AreEqual("temporary", vm.Name);
+#endif
 	}
 
 	[TestMethod]
 	public void TestConstructorCanCloseTab()
 	{
+#if !MAUI_UNITTESTS
 		Assert.ThrowsException<ArgumentException>(() => new ViewModels.WorkspaceViewModel(canCloseTab: true));
 
 		ViewModels.WorkspaceViewModel vm = new(canCloseTab: false);
 		Assert.IsFalse(vm.CanCloseTab);
 		Assert.AreEqual("+", vm.Name);
+#else
+		ViewModels.WorkspaceViewModel vm = new();
+		Assert.IsTrue(vm.CanCloseTab);
+		Assert.AreEqual("temporary", vm.Name);
+#endif
 	}
 
 	[TestMethod]
@@ -69,7 +79,11 @@ public void TestInput()
 
 		vm.EvaluateCommand.Execute(null);
 
+#if !MAUI_UNITTESTS
 		vm.ClearInput();
+#else
+		vm.Input = string.Empty;
+#endif
 		Assert.AreEqual(string.Empty, vm.Input);
 	}
 
@@ -92,6 +106,7 @@ public void TestInsertTextAtCursor()
 		Assert.AreEqual(10, vm.InsertTextAtCursor(insertText, vm.Input.Length - insertText.Length, insertText.Length));
 	}
 
+#if !MAUI_UNITTESTS
 	[TestMethod]
 	public void TestHelp()
 	{
@@ -124,4 +139,5 @@ public void TestClearHistory()
 		vm.ClearHistoryCommand.Execute(null);
 		Assert.IsFalse(vm.ClearHistoryCommand.CanExecute(null));
 	}
+#endif
 }
diff --git a/Windows.Source/CalculateX.UnitTests/Windows.Workspaces.cs b/Windows.Source/CalculateX.UnitTests/Windows.Workspaces.cs
@@ -124,7 +124,11 @@ public void TestManagement()
 
 		Assert.AreEqual(3, newWorkspaces.TheWorkspaces.Count);
 		Assert.AreEqual(3, workspace3.Variables.Count);
+#if !MAUI_UNITTESTS
 		Assert.AreEqual(workspace2.ID, newWorkspaces.LoadedSelectedWorkspaceID);
+#else
+		Assert.AreEqual(workspace2.ID, newWorkspaces.SelectedWorkspaceID);
+#endif
 
 		Assert.IsNotNull(newWorkspaces.TheWorkspaces.SingleOrDefault(w => w.ID == workspace1.ID));
 		Assert.IsNotNull(newWorkspaces.TheWorkspaces.SingleOrDefault(w => w.ID == workspace2.ID));
diff --git a/Windows.Source/CalculateX.UnitTests/Windows.WorkspacesViewModel.cs b/Windows.Source/CalculateX.UnitTests/Windows.WorkspacesViewModel.cs
diff --git a/Windows.Source/CalculateX/MainWindow.xaml b/Windows.Source/CalculateX/MainWindow.xaml
diff --git a/Windows.Source/CalculateX/ViewModels/WorkspacesViewModel.cs b/Windows.Source/CalculateX/ViewModels/WorkspacesViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ private async Task RenameWorkspaceAsync()`
`169`	`169`
`170`	`170`	`private async Task VariablesWorkspaceAsync()`
`171`	`171`	`{`
	`172`	`+#if !MAUI_UNITTESTS`
`172`	`173`	`// Navigate to page that displays the variables from this workspace`
`173`	`174`	`await Shell.Current.GoToAsync(nameof(Views.VariablesPage),`
`174`	`175`	`new Dictionary<string, object>()`
`@@ -178,10 +179,13 @@ await Shell.Current.GoToAsync(nameof(Views.VariablesPage),`
`178`	`179`	`_workspace.Variables`
`179`	`180`	`}`
`180`	`181`	`});`
	`182`	`+#endif`
`181`	`183`	`}`
`182`	`184`
`183`	`185`	`private async Task Help()`
`184`	`186`	`{`
	`187`	`+#if !MAUI_UNITTESTS`
`185`	`188`	`await Shell.Current.GoToAsync(nameof(Views.HelpPage));`
	`189`	`+#endif`
`186`	`190`	`}`
`187`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,9 @@ private void AddWorkspace()`
`54`	`54`
`55`	`55`	`private async Task About()`
`56`	`56`	`{`
	`57`	`+#if !MAUI_UNITTESTS`
`57`	`58`	`await Shell.Current.GoToAsync(nameof(Views.AboutPage));`
	`59`	`+#endif`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`public void SaveWorkspaces() => _workspaces.SaveWorkspaces(_selectedWorkspaceID);`
`@@ -94,6 +96,7 @@ public async Task SelectWorkspaceAsync(WorkspaceViewModel? workspaceVM)`
`94`	`96`
`95`	`97`	`_selectedWorkspaceID = workspaceVM.ID;`
`96`	`98`
	`99`	`+#if !MAUI_UNITTESTS`
`97`	`100`	`// Should navigate to "NotePage?ItemId=path\on\device\XYZ.notes.txt"`
`98`	`101`	`//Shell.Current.GoToAsync($"{nameof(Views.WorkspacePage)}?select={workspace.ID}");`
`99`	`102`	`await Shell.Current.GoToAsync(nameof(Views.WorkspacePage),`
`@@ -104,6 +107,7 @@ await Shell.Current.GoToAsync(nameof(Views.WorkspacePage),`
`104`	`107`	`TheWorkspaceViewModels.First(workspaceView => workspaceView.ID == workspaceVM.ID)`
`105`	`108`	`}`
`106`	`109`	`});`
	`110`	`+#endif`
`107`	`111`	`}`
`108`	`112`
`109`	`113`	`private string FormWorkspaceName()`
Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,27 @@ public void TestConstructorDefault()`
`33`	`33`	`{`
`34`	`34`	`ViewModels.WorkspaceViewModel vm = new();`
`35`	`35`	`Assert.IsTrue(vm.CanCloseTab);`
	`36`	`+#if !MAUI_UNITTESTS`
`36`	`37`	`Assert.AreEqual("Designer", vm.Name);`
	`38`	`+#else`
	`39`	`+ Assert.AreEqual("temporary", vm.Name);`
	`40`	`+#endif`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`[TestMethod]`
`40`	`44`	`public void TestConstructorCanCloseTab()`
`41`	`45`	`{`
	`46`	`+#if !MAUI_UNITTESTS`
`42`	`47`	`Assert.ThrowsException<ArgumentException>(() => new ViewModels.WorkspaceViewModel(canCloseTab: true));`
`43`	`48`
`44`	`49`	`ViewModels.WorkspaceViewModel vm = new(canCloseTab: false);`
`45`	`50`	`Assert.IsFalse(vm.CanCloseTab);`
`46`	`51`	`Assert.AreEqual("+", vm.Name);`
	`52`	`+#else`
	`53`	`+ ViewModels.WorkspaceViewModel vm = new();`
	`54`	`+ Assert.IsTrue(vm.CanCloseTab);`
	`55`	`+ Assert.AreEqual("temporary", vm.Name);`
	`56`	`+#endif`
`47`	`57`	`}`
`48`	`58`
`49`	`59`	`[TestMethod]`
`@@ -69,7 +79,11 @@ public void TestInput()`
`69`	`79`
`70`	`80`	`vm.EvaluateCommand.Execute(null);`
`71`	`81`
	`82`	`+#if !MAUI_UNITTESTS`
`72`	`83`	`vm.ClearInput();`
	`84`	`+#else`
	`85`	`+ vm.Input = string.Empty;`
	`86`	`+#endif`
`73`	`87`	`Assert.AreEqual(string.Empty, vm.Input);`
`74`	`88`	`}`
`75`	`89`
`@@ -92,6 +106,7 @@ public void TestInsertTextAtCursor()`
`92`	`106`	`Assert.AreEqual(10, vm.InsertTextAtCursor(insertText, vm.Input.Length - insertText.Length, insertText.Length));`
`93`	`107`	`}`
`94`	`108`
	`109`	`+#if !MAUI_UNITTESTS`
`95`	`110`	`[TestMethod]`
`96`	`111`	`public void TestHelp()`
`97`	`112`	`{`
`@@ -124,4 +139,5 @@ public void TestClearHistory()`
`124`	`139`	`vm.ClearHistoryCommand.Execute(null);`
`125`	`140`	`Assert.IsFalse(vm.ClearHistoryCommand.CanExecute(null));`
`126`	`141`	`}`
	`142`	`+#endif`
`127`	`143`	`}`