Move the test for the ClangPackageWithRelativePublicHeadersPath package to FrameworkModuleMapGeneratorTests

Author: Ryu0118

Tests/ScipioKitTests/FrameworkModuleMapGeneratorTests.swift

@@ -7,6 +7,7 @@ private let fixturesPath = URL(fileURLWithPath: #filePath)
     .appendingPathComponent("Resources")
     .appendingPathComponent("Fixtures")
 private let clangPackageWithUmbrellaDirectoryPath = fixturesPath.appendingPathComponent("ClangPackageWithUmbrellaDirectory")
+private let clangPackageWithRelativePublicHeadersPath = fixturesPath.appendingPathComponent("ClangPackageWithRelativePublicHeadersPath")
 
 private struct PackageLocatorMock: PackageLocator {
     let packageDirectory: URL
@@ -29,6 +30,8 @@ struct FrameworkModuleMapGeneratorTests {
         defer { try? fileSystem.removeFileTree(outputDirectory) }
 
         let generatedModuleMapContents = try await generateModuleMap(
+            for: clangPackageWithUmbrellaDirectoryPath,
+            moduleName: "MyTarget",
             keepPublicHeadersStructure: false,
             outputDirectory: outputDirectory
         )
@@ -51,6 +54,8 @@ framework module MyTarget {
         defer { try? fileSystem.removeFileTree(outputDirectory) }
 
         let generatedModuleMapContents = try await generateModuleMap(
+            for: clangPackageWithUmbrellaDirectoryPath,
+            moduleName: "MyTarget",
             keepPublicHeadersStructure: true,
             outputDirectory: outputDirectory
         )
@@ -67,7 +72,29 @@ framework module MyTarget {
         #expect(generatedModuleMapContents == expectedModuleMapContents)
     }
 
+    @Test
+    func generate_keepPublicHeadersStructure_withRelativePublicHeadersPath_is_true() async throws {
+        let outputDirectory = temporaryDirectory.appending(component: #function)
+        defer { try? fileSystem.removeFileTree(outputDirectory) }
+
+        let generatedModuleMapContents = try await generateModuleMap(
+            for: clangPackageWithRelativePublicHeadersPath,
+            moduleName: "ClangPackageWithRelativePublicHeadersPath",
+            keepPublicHeadersStructure: true,
+            outputDirectory: outputDirectory
+        )
+        let expectedModuleMapContents = """
+framework module ClangPackageWithRelativePublicHeadersPath {
+    header "ClangPackageWithRelativePublicHeadersPath/add.h"
+    export *
+}
+"""
+        #expect(generatedModuleMapContents == expectedModuleMapContents)
+    }
+
     private func generateModuleMap(
+        for packageDirectory: URL,
+        moduleName: String,
         keepPublicHeadersStructure: Bool,
         outputDirectory: URL
     ) async throws -> String {
@@ -78,12 +105,12 @@ framework module MyTarget {
         )
 
         let descriptionPackage = try await DescriptionPackage(
-            packageDirectory: clangPackageWithUmbrellaDirectoryPath,
+            packageDirectory: packageDirectory,
             mode: .createPackage,
             onlyUseVersionsFromResolvedFile: false
         )
         let generatedModuleMapPath = try generator.generate(
-            resolvedTarget: #require(descriptionPackage.graph.module(for: "MyTarget")),
+            resolvedTarget: #require(descriptionPackage.graph.module(for: moduleName)),
             sdk: SDK.macOS,
             keepPublicHeadersStructure: keepPublicHeadersStructure
         )

Tests/ScipioKitTests/RunnerTests.swift

@@ -15,7 +15,6 @@ private let clangPackagePath = fixturePath.appendingPathComponent("ClangPackage"
 private let clangPackageWithSymbolicLinkHeadersPath = fixturePath.appendingPathComponent("ClangPackageWithSymbolicLinkHeaders")
 private let clangPackageWithCustomModuleMapPath = fixturePath.appendingPathComponent("ClangPackageWithCustomModuleMap")
 private let clangPackageWithUmbrellaDirectoryPath = fixturePath.appendingPathComponent("ClangPackageWithUmbrellaDirectory")
-private let clangPackageWithRelativePublicHeadersPath = fixturePath.appendingPathComponent("ClangPackageWithRelativePublicHeadersPath")
 
 private struct InfoPlist: Decodable {
     var bundleVersion: String
@@ -269,71 +268,6 @@ final class RunnerTests: XCTestCase {
         }
     }
 
-    func testBuildClangPackageWithRelativePublicHeadersPath() async throws {
-        defer {
-            try? fileManager.removeItem(at: clangPackageWithRelativePublicHeadersPath.appending(component: ".build"))
-        }
-
-        let runner = Runner(
-            mode: .createPackage,
-            options: .init(
-                baseBuildOptions: .init(isSimulatorSupported: false),
-                buildOptionsMatrix: [
-                    "ClangPackageWithRelativePublicHeadersPath": .init(
-                        keepPublicHeadersStructure: true
-                    ),
-                ],
-                shouldOnlyUseVersionsFromResolvedFile: true
-            )
-        )
-        do {
-            try await runner.run(packageDirectory: clangPackageWithRelativePublicHeadersPath,
-                                 frameworkOutputDir: .custom(frameworkOutputDir))
-        } catch {
-            XCTFail("Build should be succeeded. \(error.localizedDescription)")
-        }
-
-        let libraryName = "ClangPackageWithRelativePublicHeadersPath"
-        let xcFramework = frameworkOutputDir.appendingPathComponent("\(libraryName).xcframework")
-        let versionFile = frameworkOutputDir.appendingPathComponent(".\(libraryName).version")
-        let framework = xcFramework.appendingPathComponent("ios-arm64")
-            .appendingPathComponent("\(libraryName).framework")
-
-        XCTAssertTrue(
-            fileManager.fileExists(
-                atPath: framework.appending(
-                    components: ["Headers", "ClangPackageWithRelativePublicHeadersPath", "add.h"]
-                )
-                .path(percentEncoded: false)
-            ),
-            "Should exist a header while preserving the public header structure"
-        )
-
-        let moduleMapPath = framework.appending(components: ["Modules", "module.modulemap"])
-            .path(percentEncoded: false)
-
-        XCTAssertTrue(
-            fileManager.fileExists(atPath: moduleMapPath),
-            "Should exist a modulemap"
-        )
-        let moduleMapContents = try XCTUnwrap(fileManager.contents(atPath: moduleMapPath).flatMap { String(decoding: $0, as: UTF8.self) })
-        XCTAssertEqual(
-            moduleMapContents,
-                """
-                framework module ClangPackageWithRelativePublicHeadersPath {
-                    header "ClangPackageWithRelativePublicHeadersPath/add.h"
-                    export *
-                }
-                """,
-            "modulemap should be converted for frameworks"
-        )
-
-        XCTAssertTrue(fileManager.fileExists(atPath: xcFramework.path),
-                      "Should create \(libraryName).xcframework")
-        XCTAssertFalse(fileManager.fileExists(atPath: versionFile.path),
-                       "Should not create .\(libraryName).version in create mode")
-    }
-
     func testCacheIsValid() async throws {
         let descriptionPackage = try await DescriptionPackage(
             packageDirectory: testPackagePath,