Fix module_name and bundle_name for test specs (#118)

sergeykhliustin · Mar 1, 2024 · 2df9f35 · 2df9f35
1 parent b812b6e
commit 2df9f35
Show file tree

Hide file tree

Showing 29 changed files with 77 additions and 40 deletions.
diff --git a/Sources/BazelPodsCore/Analyzer/Analyzers/BaseAnalyzer.swift b/Sources/BazelPodsCore/Analyzer/Analyzers/BaseAnalyzer.swift
@@ -36,7 +36,7 @@ struct BaseAnalyzer<S: BaseInfoRepresentable> {
         let name = spec.name
         let version = spec.version
         let platformVersion = try resolvePlatformVersion(platform)
-        let moduleName: String = spec.resolveModuleName(platform)
+        let moduleName: String = spec.resolveModuleName(platform, options: options)
         let platforms = [platform.bazelKey: platformVersion]
         let swiftVersion: String?
         if let versions = spec.attr(\.swiftVersions).platform(platform)??.compactMap({ Double($0) }) {

diff --git a/Sources/BazelPodsCore/Build/PodBuildFile+makeAppspecs.swift b/Sources/BazelPodsCore/Build/PodBuildFile+makeAppspecs.swift
@@ -26,10 +26,6 @@ extension PodBuildFile {
                     continue
                 }
 
-                for patch in options.patches {
-
-                }
-
                 let (resourceTargets, resourceInfoplists) = makeResourceBundles(
                     targetName: targetName,
                     baseInfo: analyzer.baseInfo,

diff --git a/Sources/BazelPodsCore/Models/Specs/Protocols/BaseInfoRepresentable.swift b/Sources/BazelPodsCore/Models/Specs/Protocols/BaseInfoRepresentable.swift
@@ -60,9 +60,13 @@ extension BaseInfoRepresentable {
         }
     }
 
-    func resolveModuleName(_ platform: Platform) -> String {
+    func resolveModuleName(_ platform: Platform, options: BuildOptions) -> String {
         if let specModuleName = moduleName ?? platformRepresentable(platform)?.moduleName {
             return specModuleName
+        } else if let buildSettings = self as? XCConfigRepresentable, let moduleName = buildSettings.moduleName {
+            return moduleName
+        } else if let testSpec = self as? TestSpecRepresentable {
+            return [options.podName, testSpec.testType.rawValue.capitalized, name].joined(separator: "_")
         } else {
             return name.replacingOccurrences(of: "-", with: "_")
         }

diff --git a/Sources/BazelPodsCore/Models/Specs/Protocols/XCConfigRepresentable.swift b/Sources/BazelPodsCore/Models/Specs/Protocols/XCConfigRepresentable.swift
@@ -13,6 +13,12 @@ protocol XCConfigRepresentable: BaseRepresentable {
     var xcconfig: [String: String] { get }
 }
 
+extension XCConfigRepresentable {
+    var moduleName: String? {
+        return podTargetXcconfig["SWIFT_MODULE_NAME"]
+    }
+}
+
 private enum Keys: String {
     case pod_target_xcconfig
     case user_target_xcconfig

diff --git a/Sources/BazelPodsCore/Targets/TestSpecs/iOSUITest.swift b/Sources/BazelPodsCore/Targets/TestSpecs/iOSUITest.swift
@@ -43,6 +43,7 @@ struct iOSUITest: BazelTarget {
 
         let lines: [StarlarkFunctionArgument] = [
             .named(name: "name", value: name.toStarlark()),
+            .named(name: "bundle_name", value: info.moduleName.toStarlark()),
             .named(name: "module_name", value: info.moduleName.toStarlark()),
             .named(name: "minimum_os_version", value: info.minimumOsVersion.toStarlark()),
             .named(name: "test_host", value: test_host.toStarlark()),

diff --git a/Sources/BazelPodsCore/Targets/TestSpecs/iOSUnitTest.swift b/Sources/BazelPodsCore/Targets/TestSpecs/iOSUnitTest.swift
@@ -43,6 +43,7 @@ struct iOSUnitTest: BazelTarget {
 
         let lines: [StarlarkFunctionArgument] = [
             .named(name: "name", value: name.toStarlark()),
+            .named(name: "bundle_name", value: info.moduleName.toStarlark()),
             .named(name: "module_name", value: info.moduleName.toStarlark()),
             .named(name: "minimum_os_version", value: info.minimumOsVersion.toStarlark()),
             .named(name: "test_host", value: test_host.toStarlark()),

diff --git a/Tests/Recorded/CoreStore/BUILD.bazel b/Tests/Recorded/CoreStore/BUILD.bazel
diff --git a/Tests/Recorded/CwlCatchException/BUILD.bazel b/Tests/Recorded/CwlCatchException/BUILD.bazel
diff --git a/Tests/Recorded/CwlPreconditionTesting/BUILD.bazel b/Tests/Recorded/CwlPreconditionTesting/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseABTesting/BUILD.bazel b/Tests/Recorded/FirebaseABTesting/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseAuth/BUILD.bazel b/Tests/Recorded/FirebaseAuth/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseCore/BUILD.bazel b/Tests/Recorded/FirebaseCore/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseCoreInternal/BUILD.bazel b/Tests/Recorded/FirebaseCoreInternal/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseCrashlytics/BUILD.bazel b/Tests/Recorded/FirebaseCrashlytics/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseDatabase/BUILD.bazel b/Tests/Recorded/FirebaseDatabase/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseFunctions/BUILD.bazel b/Tests/Recorded/FirebaseFunctions/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseInstallations/BUILD.bazel b/Tests/Recorded/FirebaseInstallations/BUILD.bazel
diff --git a/Tests/Recorded/FirebasePerformance/BUILD.bazel b/Tests/Recorded/FirebasePerformance/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel b/Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseSessions/BUILD.bazel b/Tests/Recorded/FirebaseSessions/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseSharedSwift/BUILD.bazel b/Tests/Recorded/FirebaseSharedSwift/BUILD.bazel
diff --git a/Tests/Recorded/FirebaseStorage/BUILD.bazel b/Tests/Recorded/FirebaseStorage/BUILD.bazel
diff --git a/Tests/Recorded/GTMSessionFetcher/BUILD.bazel b/Tests/Recorded/GTMSessionFetcher/BUILD.bazel
diff --git a/Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel b/Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel
diff --git a/Tests/Recorded/GoogleDataTransport/BUILD.bazel b/Tests/Recorded/GoogleDataTransport/BUILD.bazel
diff --git a/Tests/Recorded/GoogleUtilities/BUILD.bazel b/Tests/Recorded/GoogleUtilities/BUILD.bazel
diff --git a/Tests/Recorded/PromisesObjC/BUILD.bazel b/Tests/Recorded/PromisesObjC/BUILD.bazel
diff --git a/Tests/Recorded/ViewInspector/BUILD.bazel b/Tests/Recorded/ViewInspector/BUILD.bazel
diff --git a/Tests/Recorded/Wire/BUILD.bazel b/Tests/Recorded/Wire/BUILD.bazel