diff --git a/SharepointToolbox.Tests/ViewModels/FeatureViewModelBaseTests.cs b/SharepointToolbox.Tests/ViewModels/FeatureViewModelBaseTests.cs index 64bcc36..764afbb 100644 --- a/SharepointToolbox.Tests/ViewModels/FeatureViewModelBaseTests.cs +++ b/SharepointToolbox.Tests/ViewModels/FeatureViewModelBaseTests.cs @@ -1,3 +1,4 @@ +using System.Globalization; using Microsoft.Extensions.Logging.Abstractions; using SharepointToolbox.Core.Models; using SharepointToolbox.ViewModels; @@ -61,23 +62,33 @@ public class FeatureViewModelBaseTests [Fact] public async Task CancelCommand_DuringOperation_SetsStatusMessageToCancelled() { - var vm = new TestViewModel(); - var started = new TaskCompletionSource(); - - vm.OperationFunc = async (ct, p) => + // Ensure EN culture so TranslationSource resolves "Operation cancelled" + var prev = CultureInfo.CurrentUICulture; + CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("en"); + try { - started.SetResult(true); - await Task.Delay(5000, ct); // Will be cancelled - }; + var vm = new TestViewModel(); + var started = new TaskCompletionSource(); - var runTask = vm.RunCommand.ExecuteAsync(null); - await started.Task; + vm.OperationFunc = async (ct, p) => + { + started.SetResult(true); + await Task.Delay(5000, ct); // Will be cancelled + }; - vm.CancelCommand.Execute(null); - await runTask; + var runTask = vm.RunCommand.ExecuteAsync(null); + await started.Task; - Assert.Contains("cancel", vm.StatusMessage, StringComparison.OrdinalIgnoreCase); - Assert.False(vm.IsRunning); + vm.CancelCommand.Execute(null); + await runTask; + + Assert.Contains("cancel", vm.StatusMessage, StringComparison.OrdinalIgnoreCase); + Assert.False(vm.IsRunning); + } + finally + { + CultureInfo.CurrentUICulture = prev; + } } [Fact] diff --git a/SharepointToolbox/MainWindow.xaml b/SharepointToolbox/MainWindow.xaml index 8598300..365c74d 100644 --- a/SharepointToolbox/MainWindow.xaml +++ b/SharepointToolbox/MainWindow.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:loc="clr-namespace:SharepointToolbox.Localization" - xmlns:controls="clr-namespace:SharepointToolbox.Views.Controls" + xmlns:views="clr-namespace:SharepointToolbox.Views.Tabs" mc:Ignorable="d" Title="{Binding Source={x:Static loc:TranslationSource.Instance}, Path=[app.title]}" @@ -39,7 +39,7 @@ Background="Black" Foreground="LimeGreen" FontFamily="Consolas" FontSize="11" /> - + diff --git a/SharepointToolbox/Views/Controls/FeatureTabBase.xaml b/SharepointToolbox/Views/Controls/FeatureTabBase.xaml deleted file mode 100644 index 16780e2..0000000 --- a/SharepointToolbox/Views/Controls/FeatureTabBase.xaml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - -