Remove RugbyPods scheme after testing

swiftyfinch · Mar 9, 2024 · 794543d · 794543d
1 parent a74bc9e
commit 794543d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/Sources/RugbyFoundation/Core/Test/TestManager.swift b/Sources/RugbyFoundation/Core/Test/TestManager.swift
@@ -134,17 +134,26 @@ final class TestManager: Loggable {
             }
             let processInterruptionTask = processMonitor.runOnInterruption(cleanup)
 
-            defer {
+            let deleteTestsTargetScheme = {
+                try await self.xcodeProject.deleteTargets([testsTarget.uuid: testsTarget])
+            }
+            do {
+                try await xcodeBuild.test(
+                    scheme: testsTarget.name,
+                    testPlan: testplanPath.deletingPathExtension().lastPathComponent,
+                    simulatorName: simulatorName,
+                    options: options,
+                    paths: paths
+                )
+                try await deleteTestsTargetScheme()
+                processInterruptionTask.cancel()
+                cleanup()
+            } catch {
+                try await deleteTestsTargetScheme()
                 processInterruptionTask.cancel()
                 cleanup()
+                throw error
             }
-            try await xcodeBuild.test(
-                scheme: testsTarget.name,
-                testPlan: testplanPath.deletingPathExtension().lastPathComponent,
-                simulatorName: simulatorName,
-                options: options,
-                paths: paths
-            )
         })
     }
 

diff --git a/Tests/FoundationTests/Core/Test/TestManagerTests.swift b/Tests/FoundationTests/Core/Test/TestManagerTests.swift
@@ -249,6 +249,7 @@ extension TestManagerTests {
         let testplanURL = URL(fileURLWithPath: "tests/Rugby.xctestplan")
         testplanEditor.createTestplanTestplanTemplatePathTestTargetsInFolderPathReturnValue = testplanURL
         let testsTarget = IInternalTargetMock()
+        testsTarget.underlyingUuid = "test_RugbyPods_uuid"
         testsTarget.underlyingName = "RugbyPods"
         testsTarget.explicitDependencies = [
             localPodFrameworkUnitTests.uuid: localPodFrameworkUnitTests,
@@ -397,6 +398,12 @@ extension TestManagerTests {
         XCTAssertEqual(loggerBlockInvocations[9].level, .result)
         XCTAssertEqual(loggerBlockInvocations[9].output, .all)
 
+        XCTAssertEqual(xcodeProject.deleteTargetsKeepGroupsCallsCount, 1)
+        let deleteTargetsArgs = try XCTUnwrap(xcodeProject.deleteTargetsKeepGroupsReceivedArguments)
+        XCTAssertEqual(deleteTargetsArgs.targetsForRemove.count, 1)
+        XCTAssertTrue(deleteTargetsArgs.targetsForRemove.contains(testsTarget.uuid))
+        XCTAssertTrue(deleteTargetsArgs.keepGroups)
+
         XCTAssertEqual(loggerBlockInvocations[10].header, "Marking Tests as Passed")
         XCTAssertNil(loggerBlockInvocations[10].footer)
         XCTAssertNil(loggerBlockInvocations[10].metricKey)
@@ -515,6 +522,7 @@ extension TestManagerTests {
         let testplanURL = URL(fileURLWithPath: "tests/Rugby.xctestplan")
         testplanEditor.createTestplanTestplanTemplatePathTestTargetsInFolderPathReturnValue = testplanURL
         let testsTarget = IInternalTargetMock()
+        testsTarget.underlyingUuid = "test_RugbyPods_uuid"
         testsTarget.underlyingName = "RugbyPods"
         testsTarget.explicitDependencies = [
             localPodFrameworkUnitTests.uuid: localPodFrameworkUnitTests,
@@ -664,6 +672,12 @@ extension TestManagerTests {
         XCTAssertEqual(loggerBlockInvocations[9].level, .result)
         XCTAssertEqual(loggerBlockInvocations[9].output, .all)
 
+        XCTAssertEqual(xcodeProject.deleteTargetsKeepGroupsCallsCount, 1)
+        let deleteTargetsArgs = try XCTUnwrap(xcodeProject.deleteTargetsKeepGroupsReceivedArguments)
+        XCTAssertEqual(deleteTargetsArgs.targetsForRemove.count, 1)
+        XCTAssertTrue(deleteTargetsArgs.targetsForRemove.contains(testsTarget.uuid))
+        XCTAssertTrue(deleteTargetsArgs.keepGroups)
+
         XCTAssertEqual(logger.logLevelOutputReceivedInvocations.count, 4)
         XCTAssertEqual(logger.logLevelOutputReceivedInvocations[0].text, "LocalPod-framework-Unit-Tests")
         XCTAssertEqual(logger.logLevelOutputReceivedInvocations[0].output, .all)