Added support for SelectedTests in schemes Test configuration. (#913)

* added support for selectedTests in test shemes * added PR description to changelog * CHANGELOG fix * use presence of selectedTests for useTestSelectionWhitelist Co-authored-by: Artem Semavin <Artem Semavin> Co-authored-by: yonaskolb <[email protected]>
yonaskolb · Apr 8, 2021 · 0ac7a5f · 0ac7a5f
1 parent 209afcc
commit 0ac7a5f
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Added explicity `LastUpgradeCheck` and `LastUpgradeVersion` override support so it's possible to override these properties without using the `project.xcodeVersion`. [1013](https://github.com/yonaskolb/XcodeGen/pull/1013) @Andre113
 - Added `macroExpansion` for `run` in `schemes` [#1036](https://github.com/yonaskolb/XcodeGen/pull/1036) @freddi-kit
 - Added `askForAppToLaunch` for `profile` in `schemes`  [#1035](https://github.com/yonaskolb/XcodeGen/pull/1035) @freddi-kit
+- Added support for selectedTests in schemes `Test` configuration. [#913](https://github.com/yonaskolb/XcodeGen/pull/913) @ooodin
 
 #### Fixed
 - Fixed regression on **.storekit** configuration files' default build phase. [#1026](https://github.com/yonaskolb/XcodeGen/pull/1026) @jcolicchio

diff --git a/Docs/ProjectSpec.md b/Docs/ProjectSpec.md
@@ -808,7 +808,8 @@ A multiline script can be written using the various YAML multiline methods, for
 - [ ] **parallelizable**: **Bool** - Whether to run tests in parallel. Defaults to false
 - [ ] **randomExecutionOrder**: **Bool** - Whether to run tests in a random order. Defaults to false
 - [ ] **skipped**: **Bool** - Whether to skip all of the test target tests. Defaults to false
-- [ ] **skippedTests**: **[String]** - List of tests in the test target to skip. Defaults to empty.
+- [ ] **skippedTests**: **[String]** - List of tests in the test target to skip. Defaults to empty
+- [ ] **selectedTests**: **[String]** - List of tests in the test target to whitelist and select. Defaults to empty. This will override `skippedTests` if provided
 
 ### Archive Action
 

diff --git a/Sources/ProjectSpec/Scheme.swift b/Sources/ProjectSpec/Scheme.swift
@@ -185,19 +185,22 @@ public struct Scheme: Equatable {
             public var parallelizable: Bool
             public var skipped: Bool
             public var skippedTests: [String]
+            public var selectedTests: [String]
 
             public init(
                 targetReference: TargetReference,
                 randomExecutionOrder: Bool = randomExecutionOrderDefault,
                 parallelizable: Bool = parallelizableDefault,
                 skipped: Bool = false,
-                skippedTests: [String] = []
+                skippedTests: [String] = [],
+                selectedTests: [String] = []
             ) {
                 self.targetReference = targetReference
                 self.randomExecutionOrder = randomExecutionOrder
                 self.parallelizable = parallelizable
                 self.skipped = skipped
                 self.skippedTests = skippedTests
+                self.selectedTests = selectedTests
             }
 
             public init(stringLiteral value: String) {
@@ -207,6 +210,7 @@ public struct Scheme: Equatable {
                     parallelizable = false
                     skipped = false
                     skippedTests = []
+                    selectedTests = []
                 } catch {
                     fatalError(SpecParsingError.invalidTargetReference(value).description)
                 }
@@ -512,6 +516,7 @@ extension Scheme.Test.TestTarget: JSONObjectConvertible {
         parallelizable = jsonDictionary.json(atKeyPath: "parallelizable") ?? Scheme.Test.TestTarget.parallelizableDefault
         skipped = jsonDictionary.json(atKeyPath: "skipped") ?? false
         skippedTests = jsonDictionary.json(atKeyPath: "skippedTests") ?? []
+        selectedTests = jsonDictionary.json(atKeyPath: "selectedTests") ?? []
     }
 }
 

diff --git a/Sources/XcodeGenKit/SchemeGenerator.swift b/Sources/XcodeGenKit/SchemeGenerator.swift
@@ -191,7 +191,9 @@ public class SchemeGenerator {
                 parallelizable: testTarget.parallelizable,
                 randomExecutionOrdering: testTarget.randomExecutionOrder,
                 buildableReference: testBuilEntries.buildableReference,
-                skippedTests: testTarget.skippedTests.map(XCScheme.TestItem.init)
+                skippedTests: testTarget.skippedTests.map(XCScheme.TestItem.init),
+                selectedTests: testTarget.selectedTests.map(XCScheme.TestItem.init),
+                useTestSelectionWhitelist: !testTarget.selectedTests.isEmpty ? true : nil
             )
         }
 

diff --git a/Tests/ProjectSpecTests/SpecLoadingTests.swift b/Tests/ProjectSpecTests/SpecLoadingTests.swift
@@ -839,6 +839,46 @@ class SpecLoadingTests: XCTestCase {
                 try expect(scheme.test) == expectedTest
             }
 
+            $0.it("parses alternate test schemes") {
+                let schemeDictionary: [String: Any] = [
+                    "build": [
+                        "targets": ["Target1": "all"],
+                    ],
+                    "test": [
+                        "config": "debug",
+                        "targets": [
+                            "Target1",
+                            [
+                                "name": "ExternalProject/Target2",
+                                "parallelizable": true,
+                                "randomExecutionOrder": true,
+                                "selectedTests": ["Test/testExample()"],
+                            ],
+                        ],
+                        "gatherCoverageData": true,
+                        "disableMainThreadChecker": true,
+                        "stopOnEveryMainThreadCheckerIssue": true,
+                    ],
+                ]
+                let scheme = try Scheme(name: "Scheme", jsonDictionary: schemeDictionary)
+
+                let expectedTest = Scheme.Test(
+                    config: "debug",
+                    gatherCoverageData: true,
+                    disableMainThreadChecker: true,
+                    targets: [
+                        "Target1",
+                        Scheme.Test.TestTarget(
+                            targetReference: "ExternalProject/Target2",
+                            randomExecutionOrder: true,
+                            parallelizable: true,
+                            selectedTests: ["Test/testExample()"]
+                        ),
+                    ]
+                )
+                try expect(scheme.test) == expectedTest
+            }
+
             $0.it("parses schemes variables") {
                 let schemeDictionary: [String: Any] = [
                     "build": [