Fix build and tests

Author: mickael-menu

Package.swift

@@ -53,7 +53,10 @@ let package = Package(
         ),
         .testTarget(
             name: "ReadiumSharedTests",
-            dependencies: ["ReadiumShared"],
+            dependencies: [
+                "ReadiumShared",
+                "TestPublications",
+            ],
             path: "Tests/SharedTests",
             resources: [
                 .copy("Fixtures"),
@@ -174,5 +177,14 @@ let package = Package(
             dependencies: ["ReadiumInternal"],
             path: "Tests/InternalTests"
         ),
+
+        // Shared test publications used across multiple test targets.
+        .target(
+            name: "TestPublications",
+            path: "Tests/Publications",
+            resources: [
+                .copy("Publications"),
+            ]
+        ),
     ]
 )

Tests/NavigatorTests/UITests/NavigatorTestHost/FixtureList.swift

@@ -75,7 +75,7 @@ class FixtureListViewModel: ObservableObject {
             let epubURL = Bundle.main.url(
                 forResource: components[0],
                 withExtension: components[1],
-                subdirectory: "Fixtures"
+                subdirectory: "Publications"
             )
         else {
             throw FixtureError.notFound(fixture)
@@ -96,8 +96,8 @@ enum FixtureError: LocalizedError {
 
     var errorDescription: String? {
         switch self {
-        case .notFound:
-            return "Test EPUB fixture not found in bundle"
+        case let .notFound(fixture):
+            return "Test fixture \(fixture.filename) not found in bundle"
         }
     }
 }

Tests/NavigatorTests/UITests/NavigatorTestHost/ReaderView.swift

@@ -38,8 +38,8 @@ struct ReaderView: View {
     }
 }
 
-@MainActor final class ReaderViewModel: ObservableObject, @MainActor Identifiable {
-    var id: ObjectIdentifier { ObjectIdentifier(self) }
+@MainActor final class ReaderViewModel: ObservableObject, Identifiable {
+    nonisolated var id: ObjectIdentifier { ObjectIdentifier(self) }
 
     let navigator: VisualNavigator & UIViewController
 

Tests/NavigatorTests/UITests/project.yml

@@ -19,7 +19,7 @@ targets:
     deploymentTarget: 15.0
     sources:
       - path: NavigatorTestHost
-      - path: ../../Fixtures
+      - path: ../../Publications/Publications
         type: folder
         buildPhase: resources
     dependencies:

Tests/Fixtures/childrens-literature.epub …s/Publications/childrens-literature.epubTests/Fixtures/childrens-literature.epub renamed to Tests/Publications/Publications/childrens-literature.epub Tests/Fixtures/childrens-literature.epub renamed to Tests/Publications/Publications/childrens-literature.epub

@@ -0,0 +1,29 @@
+//
+//  Copyright 2025 Readium Foundation. All rights reserved.
+//  Use of this source code is governed by the BSD-style license
+//  available in the top-level LICENSE file of the project.
+//
+
+import Foundation
+
+/// Provides access to shared test publication files.
+public enum TestPublications {
+    /// Returns the resource bundle containing shared test publications.
+    public static let bundle = Bundle.module
+
+    /// Returns a URL for the specified publication file.
+    ///
+    /// - Parameter filename: The filename with extension (e.g., "childrens-literature.epub").
+    /// - Returns: A URL pointing to the publication file.
+    public static func url(for filename: String) -> URL {
+        let components = filename.split(separator: ".", maxSplits: 1)
+        let name = String(components[0])
+        let ext = components.count > 1 ? String(components[1]) : nil
+
+        guard let url = bundle.url(forResource: name, withExtension: ext, subdirectory: "Publications") else {
+            fatalError("Test publication '\(filename)' not found in TestPublications bundle")
+        }
+
+        return url
+    }
+}

Tests/Fixtures/daisy.lcpdf …ts/Publications/Publications/daisy.lcpdfTests/Fixtures/daisy.lcpdf renamed to Tests/Publications/Publications/daisy.lcpdf Tests/Fixtures/daisy.lcpdf renamed to Tests/Publications/Publications/daisy.lcpdf

@@ -5,6 +5,7 @@
 //
 
 @testable import ReadiumShared
+import TestPublications
 import XCTest
 
 class BufferingResourceTests: XCTestCase {
@@ -99,7 +100,7 @@ class BufferingResourceTests: XCTestCase {
         }
     }
 
-    private let file = Fixtures(path: "Fetcher").url(for: "epub.epub")
+    private let file = FileURL(url: TestPublications.url(for: "childrens-literature.epub"))!
     private lazy var data = try! Data(contentsOf: file.url)
     private lazy var resource = FileResource(file: file)
 

Tests/Fixtures/daisy.pdf Tests/Publications/Publications/daisy.pdfTests/Fixtures/daisy.pdf renamed to Tests/Publications/Publications/daisy.pdf

@@ -5,6 +5,7 @@
 //
 
 @testable import ReadiumShared
+import TestPublications
 import XCTest
 
 class TailCachingResourceTests: XCTestCase {
@@ -50,7 +51,7 @@ class TailCachingResourceTests: XCTestCase {
         }
     }
 
-    private let file = Fixtures(path: "Fetcher").url(for: "epub.epub")
+    private let file = FileURL(url: TestPublications.url(for: "childrens-literature.epub"))!
     private lazy var data = try! Data(contentsOf: file.url)
     private lazy var resource = FileResource(file: file)