Add onlyGenerateCoverageForSpecifiedTargets parameter to TestAction

tuist · Sep 15, 2019 · b2fe08c · b2fe08c
1 parent 440f10e
commit b2fe08c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/Fixtures/iOS/Project.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme b/Fixtures/iOS/Project.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme
@@ -44,6 +44,8 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ codeCoverageEnabled = "YES"
+ onlyGenerateCoverageForSpecifiedTargets = "YES"
  shouldUseLaunchSchemeArgsEnv = "YES">
  <PreActions>
  <ExecutionAction

diff --git a/Sources/xcodeproj/Extensions/AEXML+XcodeFormat.swift b/Sources/xcodeproj/Extensions/AEXML+XcodeFormat.swift
@@ -35,6 +35,7 @@ let attributesOrder: [String: [String]] = [
  "language",
  "region",
  "codeCoverageEnabled",
+ "onlyGenerateCoverageForSpecifiedTargets",
  "shouldUseLaunchSchemeArgsEnv",
  ],
  "LaunchAction": [

diff --git a/Sources/xcodeproj/Scheme/XCScheme+TestAction.swift b/Sources/xcodeproj/Scheme/XCScheme+TestAction.swift
@@ -21,6 +21,7 @@ extension XCScheme {
  public var selectedLauncherIdentifier: String
  public var shouldUseLaunchSchemeArgsEnv: Bool
  public var codeCoverageEnabled: Bool
+ public var onlyGenerateCoverageForSpecifiedTargets: Bool?
  public var enableAddressSanitizer: Bool
  public var enableASanStackUseAfterReturn: Bool
  public var enableThreadSanitizer: Bool
@@ -47,6 +48,7 @@ extension XCScheme {
  shouldUseLaunchSchemeArgsEnv: Bool = true,
  codeCoverageEnabled: Bool = false,
  codeCoverageTargets: [BuildableReference] = [],
+ onlyGenerateCoverageForSpecifiedTargets: Bool? = nil,
  enableAddressSanitizer: Bool = false,
  enableASanStackUseAfterReturn: Bool = false,
  enableThreadSanitizer: Bool = false,
@@ -67,6 +69,7 @@ extension XCScheme {
  self.shouldUseLaunchSchemeArgsEnv = shouldUseLaunchSchemeArgsEnv
  self.codeCoverageEnabled = codeCoverageEnabled
  self.codeCoverageTargets = codeCoverageTargets
+ self.onlyGenerateCoverageForSpecifiedTargets = onlyGenerateCoverageForSpecifiedTargets
  self.enableAddressSanitizer = enableAddressSanitizer
  self.enableASanStackUseAfterReturn = enableASanStackUseAfterReturn
  self.enableThreadSanitizer = enableThreadSanitizer
@@ -88,6 +91,8 @@ extension XCScheme {
  selectedLauncherIdentifier = element.attributes["selectedLauncherIdentifier"] ?? XCScheme.defaultLauncher
  shouldUseLaunchSchemeArgsEnv = element.attributes["shouldUseLaunchSchemeArgsEnv"].map { $0 == "YES" } ?? true
  codeCoverageEnabled = element.attributes["codeCoverageEnabled"] == "YES"
+ onlyGenerateCoverageForSpecifiedTargets = element.attributes["onlyGenerateCoverageForSpecifiedTargets"]
+ .map { $0 == "YES" }
  enableAddressSanitizer = element.attributes["enableAddressSanitizer"] == "YES"
  enableASanStackUseAfterReturn = element.attributes["enableASanStackUseAfterReturn"] == "YES"
  enableThreadSanitizer = element.attributes["enableThreadSanitizer"] == "YES"
@@ -143,6 +148,9 @@ extension XCScheme {
  if codeCoverageEnabled {
  attributes["codeCoverageEnabled"] = codeCoverageEnabled.xmlString
  }
+ if let onlyGenerateCoverageForSpecifiedTargets = onlyGenerateCoverageForSpecifiedTargets {
+ attributes["onlyGenerateCoverageForSpecifiedTargets"] = onlyGenerateCoverageForSpecifiedTargets.xmlString
+ }
  if enableAddressSanitizer {
  attributes["enableAddressSanitizer"] = enableAddressSanitizer.xmlString
  }
@@ -205,6 +213,7 @@ extension XCScheme {
  selectedLauncherIdentifier == rhs.selectedLauncherIdentifier &&
  shouldUseLaunchSchemeArgsEnv == rhs.shouldUseLaunchSchemeArgsEnv &&
  codeCoverageEnabled == rhs.codeCoverageEnabled &&
+ onlyGenerateCoverageForSpecifiedTargets == onlyGenerateCoverageForSpecifiedTargets &&
  enableAddressSanitizer == rhs.enableAddressSanitizer &&
  enableASanStackUseAfterReturn == rhs.enableASanStackUseAfterReturn &&
  enableThreadSanitizer == rhs.enableThreadSanitizer &&

diff --git a/Tests/xcodeprojTests/Scheme/XCSchemeTests.swift b/Tests/xcodeprojTests/Scheme/XCSchemeTests.swift
@@ -96,7 +96,8 @@ final class XCSchemeIntegrationTests: XCTestCase {
  XCTAssertEqual(scheme.testAction?.selectedDebuggerIdentifier, "Xcode.DebuggerFoundation.Debugger.LLDB")
  XCTAssertEqual(scheme.testAction?.selectedDebuggerIdentifier, "Xcode.DebuggerFoundation.Debugger.LLDB")
  XCTAssertEqual(scheme.testAction?.shouldUseLaunchSchemeArgsEnv, true)
- XCTAssertEqual(scheme.testAction?.codeCoverageEnabled, false)
+ XCTAssertEqual(scheme.testAction?.codeCoverageEnabled, true)
+ XCTAssertEqual(scheme.testAction?.onlyGenerateCoverageForSpecifiedTargets, true)
  XCTAssertEqual(scheme.testAction?.testables.first?.skipped, false)
  XCTAssertEqual(scheme.testAction?.testables.first?.parallelizable, false)
  XCTAssertEqual(scheme.testAction?.testables.first?.randomExecutionOrdering, false)
@@ -252,6 +253,7 @@ final class XCSchemeIntegrationTests: XCTestCase {
  XCTAssertEqual(scheme.testAction?.selectedLauncherIdentifier, "Xcode.DebuggerFoundation.Launcher.LLDB")
  XCTAssertTrue(scheme.testAction?.shouldUseLaunchSchemeArgsEnv == true)
  XCTAssertTrue(scheme.testAction?.codeCoverageEnabled == false)
+ XCTAssertEqual(scheme.testAction?.onlyGenerateCoverageForSpecifiedTargets, nil)
  XCTAssertNil(scheme.testAction?.macroExpansion)
  XCTAssertEqual(scheme.testAction?.enableAddressSanitizer, false)
  XCTAssertEqual(scheme.testAction?.enableASanStackUseAfterReturn, false)