Proj structure

.github/workflows/Release.yml

@@ -24,6 +24,8 @@ env:
   PROJECT: 'Text-Grab'
   PROJECT_PATH: 'Text-Grab/Text-Grab.csproj'
   TEST_PATH: 'Tests/Tests.csproj'
+  TEST_CORE_PATH: 'Tests.Core/Tests.Core.csproj'
+  TEST_CORE_WINDOWS_PATH: 'Tests.Core.Windows/Tests.Core.Windows.csproj'
   BUILD_X64: 'bld/x64'
   BUILD_X64_SC: 'bld/x64/Text-Grab-Self-Contained'
   BUILD_ARM64: 'bld/arm64'
@@ -50,6 +52,14 @@ jobs:
       - name: Install dependencies
         run: dotnet restore ${{ env.PROJECT_PATH }}
 
+      # The pure tier runs first: it needs no display and finishes in about a second, so a
+      # logic regression fails the job before the slow WPF/STA suite starts.
+      - name: Run Core tests
+        run: dotnet test --project ${{ env.TEST_CORE_PATH }}
+
+      - name: Run Core.Windows tests
+        run: dotnet test --project ${{ env.TEST_CORE_WINDOWS_PATH }} -r win-x64
+
       - name: Run tests
         run: dotnet test --project ${{ env.TEST_PATH }} -r win-x64
 

.github/workflows/buildDev.yml

@@ -12,6 +12,8 @@ concurrency:
 env:
   PROJECT_PATH: "Text-Grab/Text-Grab.csproj"
   TEST_PATH: "Tests/Tests.csproj"
+  TEST_CORE_PATH: "Tests.Core/Tests.Core.csproj"
+  TEST_CORE_WINDOWS_PATH: "Tests.Core.Windows/Tests.Core.Windows.csproj"
   # Unlock token for the Windows AI language model (a Limited Access Feature). Absent secrets
   # leave the properties empty, which just builds without on-device text AI rather than failing.
   LAF_TOKEN: ${{ secrets.LAF_TOKEN }}
@@ -30,6 +32,12 @@ jobs:
         run: dotnet restore ${{ env.PROJECT_PATH }}
       - name: Build
         run: dotnet build ${{ env.PROJECT_PATH }} -p:EnableMsixTooling=true
+      # The pure tier runs first: it needs no display and finishes in about a second, so a
+      # logic regression fails the job before the slow WPF/STA suite starts.
+      - name: Test Core
+        run: dotnet test --project ${{ env.TEST_CORE_PATH }}
+      - name: Test Core.Windows
+        run: dotnet test --project ${{ env.TEST_CORE_WINDOWS_PATH }} -r win-x64
       - name: Test
         run: dotnet test --project ${{ env.TEST_PATH }} -r win-x64
 

Tests/BarcodeUtilitiesTests.cs → Tests.Core.Windows/BarcodeUtilitiesTests.cs

@@ -5,12 +5,14 @@
 using Text_Grab;
 using Text_Grab.Models;
 using Text_Grab.Utilities;
-using UnitsNet;
 using Windows.Storage.Streams;
-using static System.Net.Mime.MediaTypeNames;
 
-namespace Tests;
+namespace Text_Grab.Tests.Core.Windows;
 
+// Headless half of the original Tests/BarcodeUtilitiesTests.cs (batch 7a). ReadTestSingleQRCode
+// stayed behind as Tests/BarcodeUtilitiesImageTests.cs: it is [WpfFact]-tagged, and Xunit.StaFact
+// cannot be referenced here (it pulls in WindowsBase, which TierBoundaryTests bans). This half has
+// 3 methods against that one's 1, so it kept the original name.
 public class BarcodeUtilitiesTests
 {
     [Fact]
@@ -47,20 +49,6 @@ public void TryToReadBarcodes_WithTwoQrCodes_ReturnsTwoResults()
         Assert.Contains(results, r => r.RawOutput == "https://example.org");
     }
 
-    [WpfFact]
-    public void ReadTestSingleQRCode()
-    {
-        string expectedOutput = "This is a test of the QR Code system";
-        string testFilePath = FileUtilities.GetPathToLocalFile(@".\Images\QrCodeTestImage.png");
-
-        Bitmap testBmp = new(testFilePath);
-
-        List<OcrOutput> result = BarcodeUtilities.TryToReadBarcodes(testBmp);
-
-        Assert.Single(result);
-        Assert.Equal(expectedOutput, result[0].RawOutput);
-    }
-
     [Fact]
     public async Task GetBitmapFromIRandomAccessStream_ReturnsBitmapIndependentOfSourceStream()
     {
@@ -73,7 +61,7 @@ public async Task GetBitmapFromIRandomAccessStream_ReturnsBitmapIndependentOfSou
         using InMemoryRandomAccessStream randomAccessStream = new();
         _ = await randomAccessStream.WriteAsync(memoryStream.ToArray().AsBuffer());
 
-        Bitmap clonedBitmap = ImageMethods.GetBitmapFromIRandomAccessStream(randomAccessStream);
+        Bitmap clonedBitmap = BitmapUtilities.GetBitmapFromIRandomAccessStream(randomAccessStream);
 
         Assert.Equal(8, clonedBitmap.Width);
         Assert.Equal(8, clonedBitmap.Height);

Tests.Core.Windows/FakeTextGrabSettings.cs

@@ -0,0 +1,49 @@
+using System.Runtime.CompilerServices;
+using Text_Grab.Interfaces;
+using Text_Grab.Services;
+
+namespace Text_Grab.Tests.Core.Windows;
+
+/// <summary>
+/// Registers a <see cref="SettingsAccess"/> resolver for this test host. Tests.Core.Windows has
+/// no app assembly to supply one via a <c>[ModuleInitializer]</c> the way Tests does (see
+/// SettingsAccess.Current's remarks), so any moved test whose production code path reads settings
+/// - here, a handful of OcrTests methods that call into OcrUtilities.BuildTextFromOcrLines, which
+/// reads ParagraphDetection/RemoveFurigana/CorrectErrors/CorrectToLatin internally - would throw
+/// InvalidOperationException without one installed.
+///
+/// Every default below is copied from Text-Grab/Properties/Settings.settings's "(Default)"
+/// profile, so a moved test that depends on a default value (e.g. RemoveFurigana=true dropping
+/// furigana words) sees exactly what it saw running inside the app-hosted Tests project.
+/// </summary>
+internal static class TestSettingsInitializer
+{
+    [ModuleInitializer]
+    internal static void Register() => SettingsAccess.SetResolver(() => new FakeTextGrabSettings());
+}
+
+/// <summary>Minimal ITextGrabSettings double seeded with Settings.settings's shipped defaults.</summary>
+internal sealed class FakeTextGrabSettings : ITextGrabSettings
+{
+    public bool CorrectErrors { get; set; } = true;
+    public bool CorrectToLatin { get; set; } = true;
+    public bool OverrideAiArchCheck { get; set; }
+    public bool ParagraphDetection { get; set; } = true;
+    public bool RemoveFurigana { get; set; } = true;
+    public bool TryToReadBarcodes { get; set; } = true;
+    public bool HdrCaptureCorrection { get; set; }
+    public bool HdrBorderlessGranted { get; set; }
+    public bool UiAutomationEnabled { get; set; }
+    public bool WindowsAiDescriptionEnabled { get; set; }
+    public bool UiAutomationFallbackToOcr { get; set; } = true;
+    public bool UseTesseract { get; set; }
+    public string TesseractPath { get; set; } = string.Empty;
+    public string LastUsedLang { get; set; } = string.Empty;
+    public int TtsSpeakWordLimit { get; set; } = 100;
+    public string TtsVoiceName { get; set; } = string.Empty;
+    public double TtsSpeakingRate { get; set; } = 1;
+    public string AudioTranscriptionModel { get; set; } = "BaseMultilingual";
+    public bool EnableFileBackedManagedSettings { get; set; }
+
+    public void Save() { }
+}

Tests.Core.Windows/FileUtilitiesTests.cs

@@ -0,0 +1,36 @@
+using Text_Grab.Utilities;
+
+namespace Text_Grab.Tests.Core.Windows;
+
+// Pure half of the original Tests/FilesIoTests.cs (batch 7a): FileUtilities.GetVisualDocumentFilter
+// is Core.Windows-only and needs no app type. The rest of that file needed WPF or app-side members
+// and kept the FilesIoTests name in Tests; the IoUtilities-only tests moved separately to
+// Tests.Core/IoUtilitiesTests.cs.
+public class FileUtilitiesTests
+{
+    [Fact]
+    public void GetVisualDocumentFilter_IncludesPdfSupport()
+    {
+        string filter = FileUtilities.GetVisualDocumentFilter();
+
+        Assert.Contains("Image and PDF files|", filter);
+        Assert.Contains("PDF files|*.pdf", filter);
+        Assert.Contains("Image files|", filter);
+    }
+
+    // Joined FileUtilities in 7b once GrabFrameFileUtilities followed HistoryInfo to
+    // Core.Windows and GetOpenDocumentFilter() no longer needed the app-side
+    // OpenDocumentFilterUtilities split.
+    [Fact]
+    public void GetOpenDocumentFilter_IncludesVisualAndTextOptions()
+    {
+        string filter = FileUtilities.GetOpenDocumentFilter();
+
+        Assert.Contains("Supported documents|", filter);
+        Assert.Contains("Image and PDF files|", filter);
+        Assert.Contains("Spreadsheet documents|*.csv;*.tsv;*.tab", filter);
+        Assert.Contains("Markdown documents|*.md;*.markdown", filter);
+        Assert.Contains("Text documents (*.txt)|*.txt", filter);
+        Assert.Contains("All files (*.*)|*.*", filter);
+    }
+}

Tests/GrabFrameFileTests.cs → Tests.Core.Windows/GrabFrameFileTests.cs

@@ -2,13 +2,16 @@
 using System.IO;
 using System.IO.Compression;
 using System.Text.Json;
-using System.Windows;
 using Text_Grab;
 using Text_Grab.Models;
 using Text_Grab.Utilities;
 
-namespace Tests;
+namespace Text_Grab.Tests.Core.Windows;
 
+// Moved wholesale in 7b: GrabFrameFileUtilities followed HistoryInfo to Core.Windows once the
+// HistoryInfo blocker cleared (a8591aa), and every assertion here is against that headless pair
+// (GrabFrameFileUtilities, HistoryInfo/WordBorderInfo) with no WPF type in sight - the file had
+// an unused `using System.Windows;` from before that move, since dropped.
 public class GrabFrameFileTests
 {
     [Fact]
@@ -21,13 +24,13 @@ public async Task SaveAndLoad_RoundTripsMetadataWordBordersAndImage()
             new()
             {
                 Word = "Hello",
-                BorderRect = new Rect(1, 2, 30, 12),
+                BorderRect = new RectangleF(1, 2, 30, 12),
                 LineNumber = 0,
             },
             new()
             {
                 Word = "World",
-                BorderRect = new Rect(35, 2, 32, 12),
+                BorderRect = new RectangleF(35, 2, 32, 12),
                 LineNumber = 0,
             },
         ];
@@ -40,7 +43,7 @@ public async Task SaveAndLoad_RoundTripsMetadataWordBordersAndImage()
             IsTable = true,
             LanguageTag = "en-US",
             LanguageKind = LanguageKind.Global,
-            PositionRect = new Rect(100, 120, 400, 300),
+            PositionRect = new RectangleF(100, 120, 400, 300),
             WordBorderInfoJson = JsonSerializer.Serialize(wordBorders),
             ImageContent = new Bitmap(64, 48),
         };
@@ -60,7 +63,7 @@ public async Task SaveAndLoad_RoundTripsMetadataWordBordersAndImage()
             Assert.True(loaded.IsTable);
             Assert.Equal("en-US", loaded.LanguageTag);
             Assert.Equal(LanguageKind.Global, loaded.LanguageKind);
-            Assert.Equal(new Rect(100, 120, 400, 300), loaded.PositionRect);
+            Assert.Equal(new RectangleF(100, 120, 400, 300), loaded.PositionRect);
 
             Assert.NotNull(loaded.ImageContent);
             Assert.Equal(64, loaded.ImageContent!.Width);
@@ -91,7 +94,7 @@ public async Task SaveGrabFrameFileAsync_DoesNotMutateSuppliedInfo()
 
         string originalWordBordersJson = JsonSerializer.Serialize(new List<WordBorderInfo>
         {
-            new() { Word = "Hello", BorderRect = new Rect(1, 2, 30, 12), LineNumber = 0 },
+            new() { Word = "Hello", BorderRect = new RectangleF(1, 2, 30, 12), LineNumber = 0 },
         });
         Bitmap originalImage = new(64, 48);
 

Tests/HdrScreenCaptureTests.cs → Tests.Core.Windows/HdrScreenCaptureTests.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using Text_Grab.Utilities.Hdr;
 
-namespace Tests;
+namespace Text_Grab.Tests.Core.Windows;
 
 public class HdrScreenCaptureTests
 {

Tests/ImageChangeDetectorTests.cs → Tests.Core.Windows/ImageChangeDetectorTests.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using Text_Grab.Utilities;
 
-namespace Tests;
+namespace Text_Grab.Tests.Core.Windows;
 
 public class ImageChangeDetectorTests
 {

Tests/LanguageTests.cs → Tests.Core.Windows/LanguageTests.cs

@@ -2,7 +2,7 @@
 using Text_Grab;
 using Text_Grab.Models;
 
-namespace Tests;
+namespace Text_Grab.Tests.Core.Windows;
 
 public class LanguageTests
 {