Update test file system to discover inputs using new input provider

swiftlang · Oct 8, 2024 · 86ab779 · 86ab779
1 parent 71b8f28
commit 86ab779
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 57 deletions.
diff --git a/Sources/SwiftDocCTestUtilities/TestFileSystem.swift b/Sources/SwiftDocCTestUtilities/TestFileSystem.swift
@@ -45,10 +45,10 @@ package class TestFileSystem: FileManagerProtocol, DocumentationWorkspaceDataPro
 
     package var identifier: String = UUID().uuidString
 
-    private var _bundles = [DocumentationBundle]()
     package func bundles(options: BundleDiscoveryOptions) throws -> [DocumentationBundle] {
-        // Ignore the bundle discovery options, these test bundles are already built.
-        return _bundles
+        try DocumentationContext.InputsProvider(fileManager: self)
+            .inputs(startingPoint: URL(fileURLWithPath: currentDirectoryPath), options: options)
+            .map { [$0] } ?? []
     }
 
     /// Thread safe access to the file system.
@@ -71,48 +71,8 @@ package class TestFileSystem: FileManagerProtocol, DocumentationWorkspaceDataPro
         files["/"] = Self.folderFixtureData
         files["/tmp"] = Self.folderFixtureData
 
-        // Import given folders
-        try updateDocumentationBundles(withFolders: folders)
-    }
-
-    func updateDocumentationBundles(withFolders folders: [Folder]) throws {
-        _bundles.removeAll()
-
         for folder in folders {
-            let files = try addFolder(folder)
-
-            func asCatalog(_ file: File) -> Folder? {
-                if let folder = file as? Folder, URL(fileURLWithPath: folder.name).pathExtension == "docc" {
-                    return folder
-                }
-                return nil
-            }
-
-            if let catalog = asCatalog(folder) ?? folder.recursiveContent.mapFirst(where: asCatalog(_:)) {
-                let files = files.filter({ $0.hasPrefix(catalog.absoluteURL.path) }).compactMap({ URL(fileURLWithPath: $0) })
-
-                let markupFiles = files.filter({ DocumentationBundleFileTypes.isMarkupFile($0) })
-                let miscFiles = files.filter({ !DocumentationBundleFileTypes.isMarkupFile($0) })
-                let graphs = files.filter({ DocumentationBundleFileTypes.isSymbolGraphFile($0) })
-                let customHeader = files.first(where: { DocumentationBundleFileTypes.isCustomHeader($0) })
-                let customFooter = files.first(where: { DocumentationBundleFileTypes.isCustomFooter($0) })
-
-                let info = try DocumentationBundle.Info(
-                    from: try catalog.recursiveContent.mapFirst(where: { $0 as? InfoPlist })?.data(),
-                    bundleDiscoveryOptions: nil,
-                    derivedDisplayName: URL(fileURLWithPath: catalog.name).deletingPathExtension().lastPathComponent
-                )
-
-                let bundle = DocumentationBundle(
-                    info: info,
-                    symbolGraphURLs: graphs,
-                    markupURLs: markupFiles,
-                    miscResourceURLs: miscFiles,
-                    customHeader: customHeader,
-                    customFooter: customFooter
-                )
-                _bundles.append(bundle)
-            }
+            try addFolder(folder)
         }
     }
 
@@ -185,20 +145,20 @@ package class TestFileSystem: FileManagerProtocol, DocumentationWorkspaceDataPro
         return files.keys.contains(path)
     }
 
-    package func copyItem(at srcURL: URL, to dstURL: URL) throws {
+    package func copyItem(at source: URL, to destination: URL) throws {
         guard !disableWriting else { return }
 
         filesLock.lock()
         defer { filesLock.unlock() }
 
-        try ensureParentDirectoryExists(for: dstURL)
+        try ensureParentDirectoryExists(for: destination)
 
-        let srcPath = srcURL.path
-        let dstPath = dstURL.path
+        let sourcePath      = source.path
+        let destinationPath = destination.path
 
-        files[dstPath] = files[srcPath]
-        for (path, data) in files where path.hasPrefix(srcPath) {
-            files[path.replacingOccurrences(of: srcPath, with: dstPath)] = data
+        files[destinationPath] = files[sourcePath]
+        for (path, data) in files where path.hasPrefix(sourcePath) {
+            files[path.replacingOccurrences(of: sourcePath, with: destinationPath)] = data
         }
     }
 
@@ -400,7 +360,3 @@ package class TestFileSystem: FileManagerProtocol, DocumentationWorkspaceDataPro
     }
 }
 
-private extension File {
-    /// A URL of the file node if it was located in the root of the file system.
-    var absoluteURL: URL { return URL(string: "/\(name)")! }
-}
diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift b/Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift
@@ -1797,7 +1797,7 @@ class ConvertActionTests: XCTestCase {
 
         _ = try action.perform(logHandle: .none)
 
-        XCTAssertEqual(ResolvedTopicReference._numberOfCachedReferences(bundleID: #function), 8)
+        XCTAssertEqual(ResolvedTopicReference._numberOfCachedReferences(bundleID: #function), 13)
     }
 
     func testIgnoresAnalyzerHintsByDefault() throws {

diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift b/Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift
@@ -9,6 +9,7 @@
 */
 
 import XCTest
+import SwiftDocC
 @testable import SwiftDocCTestUtilities
 
 class TestFileSystemTests: XCTestCase {
@@ -17,7 +18,6 @@ class TestFileSystemTests: XCTestCase {
         let fs = try TestFileSystem(folders: [])
         XCTAssertEqual(fs.currentDirectoryPath, "/")
         XCTAssertFalse(fs.identifier.isEmpty)
-        XCTAssertTrue(try fs.bundles().isEmpty)
         var isDirectory = ObjCBool(false)
         XCTAssertTrue(fs.fileExists(atPath: "/", isDirectory: &isDirectory))
         XCTAssertEqual(fs.files.keys.sorted(), ["/", "/tmp"], "The root (/) should be the only existing path.")