Budget surplus widget fix

.gitignore

@@ -115,3 +115,6 @@ UpgradeLog*.XML
 /Rees.TangyFruitMapper/project.lock.json
 .idea
 *.zip
+BudgetAnalyser.Engine.UnitTest/codecoverage
+codecoverage
+coverage.json

BudgetAnalyser.Encryption/BudgetAnalyser.Encryption.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConfuzzleCore" Version="3.0.1" />
+    <PackageReference Include="ConfuzzleCore" Version="3.0.2" />
     <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
     <PackageReference Include="Rees.TangyFruitMapper" Version="2.0.0" />
   </ItemGroup>

BudgetAnalyser.Engine.UnitTest/BudgetAnalyser.Engine.UnitTest.csproj

@@ -51,7 +51,7 @@
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="Portable.Xaml" Version="0.26.0" />
-    <PackageReference Include="Rees.UnitTestUtilities" Version="2.0.1" />
+    <PackageReference Include="Rees.UnitTestUtilities" Version="2.0.3" />
   </ItemGroup>
 
   <ItemGroup>

BudgetAnalyser.Engine.UnitTest/Helper/BudgetModelHelper.cs

@@ -1,60 +1,67 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using BudgetAnalyser.Engine.Budget;
+using BudgetAnalyser.Engine.Budget;
 
-namespace BudgetAnalyser.Engine.UnitTest.Helper
+namespace BudgetAnalyser.Engine.UnitTest.Helper;
+
+public static class BudgetModelHelper
 {
-    public static class BudgetModelHelper
+    public static void Output(this IBudgetCurrencyContext instance, IReesTestOutput? outputWriter = null)
     {
-        public static void Output(this IBudgetCurrencyContext instance)
+        var writer = NonNullableOutputWriter(outputWriter);
+        writer.WriteLine(string.Empty);
+        writer.WriteLine("******************************* BUDGET OUTPUT ********************************");
+        writer.WriteLine(
+            $"Budget Currency Context: {instance.FileName} Budget Name: {instance.Model.Name} Effective From: {instance.Model.EffectiveFrom:d} Effective Until: {instance.EffectiveUntil:d}");
+        if (instance.BudgetActive)
         {
-            Debug.WriteLine(string.Empty);
-            Debug.WriteLine($"Budget Currency Context: {instance.FileName} Budget Name: {instance.Model.Name} Effective From: {instance.Model.EffectiveFrom:d} Effective Until: {instance.EffectiveUntil:d}");
-            if (instance.BudgetActive)
-            {
-                Debug.WriteLine("Budget is ACTIVE.");
-            }
-            else if (instance.BudgetArchived)
-            {
-                Debug.WriteLine("Budget is ARCHIVED.");
-            }
-            else if (instance.BudgetInFuture)
-            {
-                Debug.WriteLine("Budget is FUTURE.");
-            }
-            instance.Model.Output(false);
+            writer.WriteLine("{0} Budget is ACTIVE.", instance.Model.BudgetCycle);
+        }
+        else if (instance.BudgetArchived)
+        {
+            writer.WriteLine("{0} Budget is ARCHIVED.", instance.Model.BudgetCycle);
+        }
+        else if (instance.BudgetInFuture)
+        {
+            writer.WriteLine("{0} Budget is FUTURE.", instance.Model.BudgetCycle);
         }
 
-        public static void Output(this BudgetModel instance, bool includeTitle = true)
+        instance.Model.Output(false, writer);
+    }
+
+    public static void Output(this BudgetModel instance, bool includeTitle = true, IReesTestOutput? outputWriter = null)
+    {
+        var writer = NonNullableOutputWriter(outputWriter);
+        if (includeTitle)
+        {
+            writer.WriteLine(string.Empty);
+            writer.WriteLine($"Budget Model: '{instance.Name}' EffectiveFrom: {instance.EffectiveFrom}");
+        }
+
+        writer.WriteLine(@"    Incomes                      Expenses");
+        writer.WriteLine(@"    ==================================================================");
+        var incomeIndex = 0;
+        var incomeArray = instance.Incomes.ToArray();
+        foreach (var expense in instance.Expenses)
         {
-            if (includeTitle)
+            if (incomeIndex <= incomeArray.GetUpperBound(0))
             {
-                Debug.WriteLine(string.Empty);
-                Debug.WriteLine($"Budget Model: '{instance.Name}' EffectiveFrom: {instance.EffectiveFrom}");
+                writer.Write($"    {incomeArray[incomeIndex].Bucket.Code,-10} {incomeArray[incomeIndex].Amount:F2}");
+                writer.WriteLine($"           {expense.Bucket.Code,-10} {expense.Amount:F2}");
+                incomeIndex++;
             }
-            Debug.WriteLine(@"    Incomes                      Expenses");
-            Debug.WriteLine(@"    ==================================================================");
-            var incomeIndex = 0;
-            var incomeArray = instance.Incomes.ToArray();
-            foreach (var expense in instance.Expenses)
+            else
             {
-                if (incomeIndex <= incomeArray.GetUpperBound(0))
-                {
-                    Debug.Write($"    {incomeArray[incomeIndex].Bucket.Code.PadRight(10)} {incomeArray[incomeIndex].Amount:F2}");
-                    Debug.WriteLine($"           {expense.Bucket.Code.PadRight(10)} {expense.Amount:F2}");
-                    incomeIndex++;
-                }
-                else
-                {
-                    Debug.WriteLine($"                                 {expense.Bucket.Code.PadRight(10)} {expense.Amount:F2}");
-                }
+                writer.WriteLine($"                                 {expense.Bucket.Code,-10} {expense.Amount:F2}");
             }
-
-            Debug.WriteLine(@"    ------------------------------------------------------------------");
-            Debug.WriteLine($"    Total Income: {instance.Incomes.Sum(i => i.Amount):F2}        Total Expenses: {instance.Expenses.Sum(e => e.Amount):F2}");
-            Debug.WriteLine($"    Surplus: {instance.Surplus:F2}");
-            Debug.WriteLine(@"======================================================================");
         }
+
+        writer.WriteLine(@"    ------------------------------------------------------------------");
+        writer.WriteLine($"    Total Income: {instance.Incomes.Sum(i => i.Amount):F2}        Total Expenses: {instance.Expenses.Sum(e => e.Amount):F2}");
+        writer.WriteLine($"    Surplus: {instance.Surplus:F2}");
+        writer.WriteLine(@"======================================================================");
+    }
+
+    private static IReesTestOutput NonNullableOutputWriter(IReesTestOutput? outputWriter)
+    {
+        return outputWriter ?? new DebugTestOutput();
     }
 }

BudgetAnalyser.Engine.UnitTest/Helper/DebugTestOutput.cs

@@ -0,0 +1,26 @@
+using System.Diagnostics;
+
+namespace BudgetAnalyser.Engine.UnitTest.Helper;
+
+public class DebugTestOutput : IReesTestOutput
+{
+    public void Write(string text)
+    {
+        Debug.Write(text);
+    }
+
+    public void Write(string template, params object[] args)
+    {
+        Debug.Write(string.Format(template, args));
+    }
+
+    public void WriteLine(string line)
+    {
+        Debug.WriteLine(line);
+    }
+
+    public void WriteLine(string template, params object[] args)
+    {
+        Debug.WriteLine(template, args);
+    }
+}

BudgetAnalyser.Engine.UnitTest/Helper/IReesTestOutput.cs

@@ -0,0 +1,9 @@
+namespace BudgetAnalyser.Engine.UnitTest.Helper;
+
+public interface IReesTestOutput
+{
+    void Write(string text);
+    void Write(string template, params object[] args);
+    void WriteLine(string line);
+    void WriteLine(string template, params object[] args);
+}