Merge branch 'master' into bgomes/macRelease

.github/workflows/dotnet-desktop.yml

@@ -53,6 +53,9 @@ jobs:
     - name: Build
       run: dotnet build -p:ContinuousIntegrationBuild=True --configuration ${{ env.configuration }} --no-restore
 
+    - name: Test
+      run: dotnet test --no-build --configuration Release --verbosity normal
+
     - name: Publish
       run: dotnet publish --no-build --configuration ${{ env.configuration }}
 

ColorKraken.Tests/ColorKraken.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Moq.AutoMock" Version="3.5.0" />
-    <PackageReference Include="xunit" Version="2.6.5" />
+    <PackageReference Include="xunit" Version="2.6.6" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

ColorKraken.Tests/MainWindowViewModelTests.cs

@@ -100,7 +100,7 @@ public void OpenThemeFolderCommand_StartsExplorerProcess()
     }
 
     [Fact]
-    public void OnReceive_BrushUpdatedMessage_UpdatesTheme()
+    public async void OnReceive_BrushUpdatedMessage_UpdatesTheme()
     {
         //Arrange
         AutoMocker mocker = new();
@@ -112,11 +112,16 @@ public void OnReceive_BrushUpdatedMessage_UpdatesTheme()
 
         Mock<IThemeManager> themeManager = mocker.GetMock<IThemeManager>();
         themeManager.Setup(x => x.SaveTheme(selectedTheme, It.IsAny<IEnumerable<ThemeCategory>>()));
+        themeManager.Setup(x => x.GetCategories(It.IsAny<Theme>())).ReturnsAsyncEnumerable();
         EditorViewModel vm = mocker.CreateInstance<EditorViewModel>();
 
+        var categoriesSet = vm.WatchPropertyChanges<List<ThemeCategory>?>(nameof(EditorViewModel.ThemeCategories));
         vm.SelectedTheme = selectedTheme;
-        var color = new ThemeColor("Testcolor", messenger) { Value = "new" };
-        var message = new BrushUpdated(color, "old" );
+
+        await categoriesSet.WaitForChange();
+
+        var color = new ThemeColor("TestColor", messenger) { Value = "new" };
+        var message = new BrushUpdated(color, "old");
 
         //Act
         messenger.Send(message);

ColorKraken.Tests/PropertyChangedHelper.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace ColorKraken.Tests;
+
+/// <summary>
+/// Based on https://intellitect.com/blog/making-unit-testing-easier/
+/// </summary>
+public static class PropertyChangedHelper
+{
+    public static IPropertyChanges<T> WatchPropertyChanges<T>(this INotifyPropertyChanged propertyChanged, string propertyName)
+    {
+        if (propertyChanged == null) throw new ArgumentNullException(nameof(propertyChanged));
+        if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
+
+        return new PropertyChangedEnumerable<T>(propertyChanged, propertyName);
+    }
+
+    private class PropertyChangedEnumerable<T> : IPropertyChanges<T>
+    {
+        private readonly List<T> _values = [];
+        private readonly Func<T> _getPropertyValue;
+        private readonly string _propertyName;
+        private readonly List<(Func<T, bool>, TaskCompletionSource)> _waitHandles = [];
+
+        public PropertyChangedEnumerable(INotifyPropertyChanged propertyChanged, string propertyName)
+        {
+            _propertyName = propertyName;
+
+            const BindingFlags flags = BindingFlags.Instance | BindingFlags.GetProperty | BindingFlags.Public;
+            var propertyInfo = propertyChanged.GetType().GetProperty(propertyName, flags) 
+                ?? throw new ArgumentException($"Could not find public property getter for {propertyName} on {propertyChanged.GetType().FullName}");
+            var instance = Expression.Constant(propertyChanged);
+            var propertyExpression = Expression.Property(instance, propertyInfo);
+            _getPropertyValue = Expression.Lambda<Func<T>>(propertyExpression).Compile();
+
+            propertyChanged.PropertyChanged += OnPropertyChanged;
+        }
+
+        private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (string.Equals(_propertyName, e.PropertyName, StringComparison.Ordinal))
+            {
+                var value = _getPropertyValue();
+                _values.Add(value);
+                _waitHandles.ForEach(t =>
+                    {
+                        if (t.Item1(value)) t.Item2.SetResult();
+                    });
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return _values.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public Task WaitForChange(CancellationToken token)
+        {
+            return WaitFor(x => true, token);
+        }
+
+        public Task WaitFor(Func<T, bool> predicate, CancellationToken token)
+        {
+            TaskCompletionSource tcs = new();
+            _waitHandles.Add((predicate, tcs));
+            return tcs.Task;
+        }
+    }
+}
+
+public interface IPropertyChanges<out T> : IEnumerable<T>
+{
+    Task WaitForChange(CancellationToken token = default);
+    Task WaitFor(Func<T, bool> predicate, CancellationToken token = default);
+}

ColorKraken/ColorKraken.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Icon.ico</ApplicationIcon>

ColorKraken/Configuration/TolerantSource.cs

@@ -41,7 +41,7 @@ public bool TryGet(string key, out string? value)
             }
         }
 
-        public void Set(string key, string value)
+        public void Set(string key, string? value)
         {
             try
             {
@@ -73,7 +73,7 @@ public void Load()
             { }
         }
 
-        public IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string parentPath)
+        public IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string? parentPath)
         {
             try
             {
@@ -82,7 +82,7 @@ public IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string
             }
             catch (Exception)
             {
-                return Array.Empty<string>();
+                return [];
             }
         }
     }
@@ -95,9 +95,14 @@ private class EmptyChangeToken : IChangeToken
 
         public bool ActiveChangeCallbacks => false;
 
-        public IDisposable? RegisterChangeCallback(Action<object> callback, object state)
+        public IDisposable RegisterChangeCallback(Action<object?> callback, object? state)
         {
-            return null;
+            return new EmptyDisposable();
         }
     }
+
+    private sealed class EmptyDisposable : IDisposable
+    {
+        public void Dispose() { }
+    }
 }

ColorKraken/DownloadViewModel.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Json;
-using System.Security.Policy;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using System.Windows.Data;
@@ -16,10 +15,9 @@
 
 namespace ColorKraken;
 
-[ObservableObject]
-public partial class DownloadViewModel
+public partial class DownloadViewModel : ObservableObject
 {
-    public ObservableCollection<ThemeItem> Items { get; } = new();
+    public ObservableCollection<ThemeItem> Items { get; } = [];
 
     private HttpClient HttpClient { get; }
     private IThemeManager ThemeManager { get; }

ColorKraken/MainWindowViewModel.cs

@@ -7,8 +7,7 @@
 
 namespace ColorKraken;
 
-[ObservableObject]
-public partial class MainWindowViewModel : IRecipient<ShowError>
+public partial class MainWindowViewModel : ObservableObject, IRecipient<ShowError>
 {
     public ISnackbarMessageQueue MessageQueue { get; }