Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

fix(nav): make tests build with the collapsible sidebar and add tests

adnan-bhaldar2ef60e1e5cde
diff --git a/src/Filee.App/Views/MainWindow.axaml b/src/Filee.App/Views/MainWindow.axaml
index 70c619ce..be53bc76 100644
--- a/src/Filee.App/Views/MainWindow.axaml
+++ b/src/Filee.App/Views/MainWindow.axaml
@@ -87,7 +87,8 @@
<ListBox.ItemTemplate>
<DataTemplate x:DataType="vm:NavItem">
<!-- Fills the whole row, so the tooltip (collapsed only) shows anywhere on it -->
- <Border Background="Transparent" Padding="12,9" ToolTip.Tip="{Binding Tip}" ToolTip.Placement="Right">
+ <Border Background="Transparent" Padding="12,9" ToolTip.Tip="{Binding Tip}" ToolTip.Placement="Right"
+ AutomationProperties.Name="{Binding Title}">
<StackPanel Classes="navitem" Orientation="Horizontal" Spacing="12">
<PathIcon Classes="navicon" Width="17" Height="17" Data="{Binding Icon}" />
<TextBlock Text="{Binding Title}" VerticalAlignment="Center" IsVisible="{Binding ShowTitle}" />
diff --git a/tests/Filee.App.Tests/AutomationNameTests.cs b/tests/Filee.App.Tests/AutomationNameTests.cs
index e79333aa..894af70b 100644
--- a/tests/Filee.App.Tests/AutomationNameTests.cs
+++ b/tests/Filee.App.Tests/AutomationNameTests.cs
@@ -36,7 +36,7 @@ public class AutomationNameTests
store.Settings.WatchFolders.Add(rule);
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate(page);
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -66,7 +66,7 @@ public class AutomationNameTests
store.Settings.WatchFolders.Add(rule);
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("watch");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -85,6 +85,37 @@ public class AutomationNameTests
}
}
+ [AvaloniaFact]
+ public void A_collapsed_navigation_names_every_item_by_its_title_for_the_tooltip_and_screen_readers()
+ {
+ TestServices.EnsureInitialized("en");
+ using var dir = new TempNavDirectory();
+ var store = new UserDataStore(dir.Path);
+ store.Load();
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), store);
+ vm.IsNavCollapsed = true;
+ var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
+ window.Show();
+ RenderTests.Pump();
+
+ // The row that carries the tooltip is the item template's Border, one per navigation item.
+ var rows = window.GetVisualDescendants().OfType<Border>().Where(b => b.DataContext is NavItem && ToolTip.GetTip(b) is not null).ToList();
+ Assert.Equal(vm.Items.Count, rows.Count);
+ foreach (var row in rows)
+ {
+ var item = (NavItem)row.DataContext!;
+ Assert.False(string.IsNullOrWhiteSpace(item.Title));
+ Assert.Equal(item.Title, ToolTip.GetTip(row));
+ Assert.Equal(item.Title, AutomationProperties.GetName(row));
+ }
+
+ // Expanded, the title is on screen, so there is no tooltip repeating it.
+ vm.IsNavCollapsed = false;
+ RenderTests.Pump();
+ Assert.All(vm.Items, i => Assert.Null(i.Tip));
+ window.Close();
+ }
+
private static bool NeedsName(Control c) => c switch
{
ToggleSwitch t => t.Content is null,
@@ -96,3 +127,16 @@ public class AutomationNameTests
_ => false,
};
}
+
+/// <summary>A throwaway data folder, so a test that changes settings never touches the real ones.</summary>
+internal sealed class TempNavDirectory : IDisposable
+{
+ public string Path { get; } = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "filee-nav-" + Guid.NewGuid().ToString("N"));
+
+ public TempNavDirectory() => Directory.CreateDirectory(Path);
+
+ public void Dispose()
+ {
+ try { Directory.Delete(Path, recursive: true); } catch (IOException) { }
+ }
+}
diff --git a/tests/Filee.App.Tests/BrowserDropTests.cs b/tests/Filee.App.Tests/BrowserDropTests.cs
index c7c44b51..429b2cba 100644
--- a/tests/Filee.App.Tests/BrowserDropTests.cs
+++ b/tests/Filee.App.Tests/BrowserDropTests.cs
@@ -261,7 +261,7 @@ public class BrowserDropTests
public void A_picture_dropped_on_the_drop_zone_opens_the_donut_for_it_and_closing_lets_it_go()
{
TestServices.EnsureInitialized("en");
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("home");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -303,7 +303,7 @@ public class BrowserDropTests
TestServices.EnsureInitialized(language);
var store = AppHost.Get<UserDataStore>();
var loc = AppHost.Get<Filee.Core.Localization.ILocalizer>();
- var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("general");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
diff --git a/tests/Filee.App.Tests/CloseActionTests.cs b/tests/Filee.App.Tests/CloseActionTests.cs
index 4c0ec09e..4502da96 100644
--- a/tests/Filee.App.Tests/CloseActionTests.cs
+++ b/tests/Filee.App.Tests/CloseActionTests.cs
@@ -33,7 +33,7 @@ public class CloseActionTests
private static MainWindow ShowMain()
{
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("general");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
diff --git a/tests/Filee.App.Tests/DonutFlipTests.cs b/tests/Filee.App.Tests/DonutFlipTests.cs
index e0b10544..d506eeae 100644
--- a/tests/Filee.App.Tests/DonutFlipTests.cs
+++ b/tests/Filee.App.Tests/DonutFlipTests.cs
@@ -524,7 +524,7 @@ public class DonutFlipTests
TestServices.EnsureInitialized();
Motion.Configure(false, () => false);
var originalBack = Images.BackPresetIds?.ToList();
- using var main = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var main = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
main.Navigate("toolbar");
var window = new MainWindow { DataContext = main, Width = 1080, Height = 1000 };
try
@@ -1234,7 +1234,7 @@ public class DonutFlipTests
{
if (dark)
theme.Apply(new ThemeSettings { Mode = ThemeMode.Dark }, language);
- using var main = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var main = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
main.Navigate("toolbar");
window = new MainWindow { DataContext = main, Width = 1080, Height = 1000 };
window.Show();
diff --git a/tests/Filee.App.Tests/DonutOpacityTests.cs b/tests/Filee.App.Tests/DonutOpacityTests.cs
index 3de6d8f2..1fcb6f75 100644
--- a/tests/Filee.App.Tests/DonutOpacityTests.cs
+++ b/tests/Filee.App.Tests/DonutOpacityTests.cs
@@ -29,7 +29,7 @@ public class DonutOpacityTests
try
{
store.Settings.Donut.Opacity = 0.96;
- var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("theme");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
diff --git a/tests/Filee.App.Tests/EnginesPageTests.cs b/tests/Filee.App.Tests/EnginesPageTests.cs
index bc6df23e..2070a0c6 100644
--- a/tests/Filee.App.Tests/EnginesPageTests.cs
+++ b/tests/Filee.App.Tests/EnginesPageTests.cs
@@ -60,7 +60,7 @@ public class EnginesPageTests
TestServices.EnsureInitialized("en");
var store = AppHost.Get<UserDataStore>();
var saved = store.Settings.EnginePriority.ToList();
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("engines");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -113,7 +113,7 @@ public class EnginesPageTests
public void Font_card_describes_fon_input_only()
{
TestServices.EnsureInitialized("en");
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("engines");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
diff --git a/tests/Filee.App.Tests/LocalizationResourceTests.cs b/tests/Filee.App.Tests/LocalizationResourceTests.cs
index 34e44fb9..9b555741 100644
--- a/tests/Filee.App.Tests/LocalizationResourceTests.cs
+++ b/tests/Filee.App.Tests/LocalizationResourceTests.cs
@@ -8,6 +8,7 @@ using Filee.App.Services;
using Filee.App.ViewModels;
using Filee.App.Views;
using Filee.Core.Localization;
+using Filee.Core.Settings;
namespace Filee.App.Tests;
@@ -33,7 +34,7 @@ public class LocalizationResourceTests
public void Arabic_mirrors_the_main_window_and_english_brings_it_back()
{
TestServices.EnsureInitialized("en");
- using var model = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var model = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
model.Navigate("general");
var window = new MainWindow { DataContext = model, Width = 1080, Height = 820 };
window.Show();
diff --git a/tests/Filee.App.Tests/NavCollapseTests.cs b/tests/Filee.App.Tests/NavCollapseTests.cs
new file mode 100644
index 00000000..5dcf4507
--- /dev/null
+++ b/tests/Filee.App.Tests/NavCollapseTests.cs
@@ -0,0 +1,60 @@
+// The main window's navigation can collapse to an icon rail, and Filee remembers how the user left it.
+
+using Avalonia.Headless.XUnit;
+using Filee.App.Services;
+using Filee.App.ViewModels;
+using Filee.Core.Localization;
+using Filee.Core.Settings;
+
+namespace Filee.App.Tests;
+
+public class NavCollapseTests
+{
+ private static MainWindowViewModel Create(UserDataStore store)
+ {
+ TestServices.EnsureInitialized("en");
+ return new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), store);
+ }
+
+ private static UserDataStore Open(string directory)
+ {
+ var store = new UserDataStore(directory);
+ store.Load();
+ return store;
+ }
+
+ [AvaloniaFact]
+ public void Collapsing_the_navigation_saves_it_and_a_new_window_starts_collapsed()
+ {
+ using var dir = new TempNavDirectory();
+ var store = Open(dir.Path);
+ using (var vm = Create(store))
+ {
+ Assert.False(vm.IsNavCollapsed);
+ vm.ToggleNavCommand.Execute(null);
+ Assert.True(vm.IsNavCollapsed);
+ Assert.All(vm.Items, i => Assert.True(i.Collapsed));
+ }
+ Assert.True(store.Settings.NavCollapsed);
+
+ // A fresh store reads the file back, as the next start of Filee does.
+ using var next = Create(Open(dir.Path));
+ Assert.True(next.IsNavCollapsed);
+ Assert.Equal(64, next.NavWidth);
+ Assert.All(next.Items, i => Assert.True(i.Collapsed));
+
+ next.ToggleNavCommand.Execute(null);
+ using var again = Create(Open(dir.Path));
+ Assert.False(again.IsNavCollapsed);
+ Assert.Equal(230, again.NavWidth);
+ }
+
+ [AvaloniaFact]
+ public void Settings_from_before_the_rail_start_expanded()
+ {
+ using var dir = new TempNavDirectory();
+ File.WriteAllText(Path.Combine(dir.Path, "settings.json"), "{}");
+ using var vm = Create(Open(dir.Path));
+ Assert.False(vm.IsNavCollapsed);
+ }
+}
diff --git a/tests/Filee.App.Tests/PortugueseLocalizationTests.cs b/tests/Filee.App.Tests/PortugueseLocalizationTests.cs
index d5a30e0a..28120ba9 100644
--- a/tests/Filee.App.Tests/PortugueseLocalizationTests.cs
+++ b/tests/Filee.App.Tests/PortugueseLocalizationTests.cs
@@ -11,6 +11,7 @@ using Filee.App.ViewModels;
using Filee.App.ViewModels.Pages;
using Filee.Core.Localization;
using Filee.Core.Presets;
+using Filee.Core.Settings;
namespace Filee.App.Tests;
@@ -206,7 +207,7 @@ public class PortugueseLocalizationTests
public void Descriptive_engine_names_are_localized_and_brands_are_preserved(string language)
{
TestServices.EnsureInitialized(language);
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
try
{
vm.Navigate("engines");
diff --git a/tests/Filee.App.Tests/PortugueseRenderTests.cs b/tests/Filee.App.Tests/PortugueseRenderTests.cs
index 677cee06..3acefb39 100644
--- a/tests/Filee.App.Tests/PortugueseRenderTests.cs
+++ b/tests/Filee.App.Tests/PortugueseRenderTests.cs
@@ -124,7 +124,7 @@ public class PortugueseRenderTests
{
TestServices.EnsureInitialized(language);
var loc = AppHost.Get<ILocalizer>();
- using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
var window = new MainWindow { DataContext = vm };
try
{
@@ -147,7 +147,7 @@ public class PortugueseRenderTests
{
TestServices.EnsureInitialized(language);
var loc = AppHost.Get<ILocalizer>();
- using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("presets");
var window = new MainWindow { DataContext = vm };
try
@@ -190,7 +190,7 @@ public class PortugueseRenderTests
var theme = AppHost.Get<ThemeService>();
var settings = AppHost.Get<UserDataStore>().Settings.Theme;
theme.Apply(new ThemeSettings { Mode = dark ? ThemeMode.Dark : ThemeMode.Light, ReduceMotion = true }, language);
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate(page);
var window = new MainWindow { DataContext = vm, Width = 820, Height = 820 };
try
@@ -249,7 +249,7 @@ public class PortugueseRenderTests
public void Editors_fit_at_the_default_window_width(string language, string page)
{
TestServices.EnsureInitialized(language);
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate(page);
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
try
diff --git a/tests/Filee.App.Tests/RecentConversionTests.cs b/tests/Filee.App.Tests/RecentConversionTests.cs
index 4d543382..f435d693 100644
--- a/tests/Filee.App.Tests/RecentConversionTests.cs
+++ b/tests/Filee.App.Tests/RecentConversionTests.cs
@@ -367,7 +367,7 @@ public class RecentConversionTests
newest.Undoable = [Stamp(photo)];
store.AddHistory(newest);
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("home");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
diff --git a/tests/Filee.App.Tests/RenderTests.cs b/tests/Filee.App.Tests/RenderTests.cs
index c9e7c653..aa53a41d 100644
--- a/tests/Filee.App.Tests/RenderTests.cs
+++ b/tests/Filee.App.Tests/RenderTests.cs
@@ -63,7 +63,7 @@ public class RenderTests
public void Main_window_pages_render(string page, string language)
{
TestServices.EnsureInitialized(language);
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate(page);
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -133,7 +133,7 @@ public class RenderTests
store.Settings.WatchFolders.Add(rule);
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("watch");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -186,7 +186,7 @@ public class RenderTests
};
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("watch");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 1000 };
window.Show();
@@ -243,7 +243,7 @@ public class RenderTests
store.Settings.WatchFolders.Add(rule);
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("watch");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 1500 };
window.Show();
@@ -339,7 +339,7 @@ public class RenderTests
store.AddHistory(entry);
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("home");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -387,7 +387,7 @@ public class RenderTests
store.History.AddRange(entries);
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("home");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -432,7 +432,7 @@ public class RenderTests
{
TestServices.EnsureInitialized("en");
var store = AppHost.Get<Filee.Core.Settings.UserDataStore>();
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("presets");
var page = (PresetsPageViewModel)vm.CurrentPage;
page.Search = "zzz";
@@ -459,7 +459,7 @@ public class RenderTests
TestServices.EnsureInitialized(language);
var store = AppHost.Get<Filee.Core.Settings.UserDataStore>();
var loc = AppHost.Get<Filee.Core.Localization.ILocalizer>();
- using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("presets");
var page = (PresetsPageViewModel)vm.CurrentPage;
Assert.Equal(["for-email", "for-discord", "for-whatsapp", "for-instagram"], page.PlacePresets.Select(p => p.Preset.Id));
@@ -526,7 +526,7 @@ public class RenderTests
var before = store.Settings.HistoryLimit;
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("general");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -567,7 +567,7 @@ public class RenderTests
package.ProgressDetail = "176 MB / 422 MB · 8.4 MB/s · 30초 남음";
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("engines");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 1400 };
window.Show();
@@ -599,7 +599,7 @@ public class RenderTests
var profiles = store.Profiles.Select(p => p.Clone()).ToList();
try
{
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("toolbar");
var page = (ToolbarPageViewModel)vm.CurrentPage!;
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
@@ -643,7 +643,7 @@ public class RenderTests
public void Dragging_a_preset_opens_a_gap_with_a_preview_slice()
{
TestServices.EnsureInitialized("ko");
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("toolbar");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -977,7 +977,7 @@ public class RenderTests
Save(window, $"window-sponsor-supporters-{language}.png");
window.Close();
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("about");
var main = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
main.Show();
@@ -1109,7 +1109,7 @@ public class RenderTests
TestServices.EnsureInitialized("en");
var theme = new ThemeSettings { Mode = ThemeMode.Dark, Accent = "#1D9E75", CornerRadius = 22 };
AppHost.Get<ThemeService>().Apply(theme, "en");
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("toolbar");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -1133,7 +1133,7 @@ public class RenderTests
try
{
service.Apply(dark, "en", custom);
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("theme");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
@@ -1740,7 +1740,7 @@ public class RenderTests
{
TestServices.EnsureInitialized(language);
var updates = AppHost.Get<UpdateService>();
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), updates);
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<Filee.Core.Localization.ILocalizer>(), updates, AppHost.Get<UserDataStore>());
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
Pump();
@@ -2571,7 +2571,7 @@ public class RenderTests
change(store.Profiles);
if (dark)
theme.Apply(new ThemeSettings { Mode = ThemeMode.Dark }, language);
- using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("toolbar");
window = new MainWindow { DataContext = vm, Width = 1080, Height = height };
window.Show();
diff --git a/tests/Filee.App.Tests/SelectionGuardTests.cs b/tests/Filee.App.Tests/SelectionGuardTests.cs
index 5ecc80da..63f3c2f8 100644
--- a/tests/Filee.App.Tests/SelectionGuardTests.cs
+++ b/tests/Filee.App.Tests/SelectionGuardTests.cs
@@ -139,7 +139,7 @@ public class SelectionGuardTests
public void Ctrl_clicking_the_open_page_in_the_navigation_keeps_it_open()
{
TestServices.EnsureInitialized("en");
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();
Pump();
@@ -233,7 +233,7 @@ public class SelectionGuardTests
AssertKeeps(editor, nameof(editor.AudioCodecChoice), () => editor.AudioCodecChoice, v => editor.AudioCodecChoice = v);
Assert.True(editor.Apply());
- var nav = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ var nav = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
AssertKeeps(nav, nameof(nav.SelectedItem), () => nav.SelectedItem, v => nav.SelectedItem = v);
var rename = new RenameToolViewModel("", "{name}", [new RenameStep()], [], (_, _, name) => name, loc);
diff --git a/tests/Filee.App.Tests/WhatsNewMedia.cs b/tests/Filee.App.Tests/WhatsNewMedia.cs
index 1d0fb71a..2b94cb43 100644
--- a/tests/Filee.App.Tests/WhatsNewMedia.cs
+++ b/tests/Filee.App.Tests/WhatsNewMedia.cs
@@ -445,7 +445,7 @@ public class WhatsNewMedia
store.Settings.Theme = new ThemeSettings { ReduceMotion = false, Mode = ThemeMode.Light };
store.Settings.Donut.Opacity = 1;
theme.Apply(store.Settings.Theme, AppHost.Get<ILocalizer>().Language);
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 608 };
try
{
@@ -553,7 +553,7 @@ public class WhatsNewMedia
{
TestServices.EnsureInitialized(language);
AppHost.Get<ThemeService>().Apply(new ThemeSettings { ReduceMotion = false, Mode = ThemeMode.Light }, language);
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("home");
var window = new MainWindow { DataContext = vm, Width = 960, Height = 540 };
window.Show();
@@ -589,7 +589,7 @@ public class WhatsNewMedia
var profiles = store.Profiles.Select(p => p.Clone()).ToList();
try
{
- var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, loc, AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("home");
var window = new MainWindow { DataContext = vm, Width = 960, Height = 540 };
window.Show();
diff --git a/tests/Filee.App.Tests/WhatsNewTests.cs b/tests/Filee.App.Tests/WhatsNewTests.cs
index b4d44e51..58acecb0 100644
--- a/tests/Filee.App.Tests/WhatsNewTests.cs
+++ b/tests/Filee.App.Tests/WhatsNewTests.cs
@@ -531,7 +531,7 @@ public class WhatsNewTests
try
{
service.CurrentVersion = new Version(2, 0, 3);
- var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());
+ var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>(), AppHost.Get<UserDataStore>());
vm.Navigate("about");
var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };
window.Show();