diff --git a/README.md b/README.md index 28aded4..0d12f67 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ import XCTHealthKit class HealthKitUITests: XCTestCase { func testAddMockData() throws { - let healthApp = XCUIApplication.healthApp() + let healthApp = XCUIApplication.healthApp try launchAndAddSample(healthApp: healthApp, .steps(value: 71)) try launchAndAddSample(healthApp: healthApp, .electrocardiogram()) } @@ -50,7 +50,7 @@ import XCTHealthKit class HealthKitUITests: XCTestCase { func testAddMockData() throws { - let healthApp = XCUIApplication.healthApp() + let healthApp = XCUIApplication.healthApp try launchAndAddSamples(healthApp: healthApp, [ .activeEnergy(), .electrocardiogram(), diff --git a/Sources/XCTHealthKit/XCTHealthKit.docc/XCTHealthKit.md b/Sources/XCTHealthKit/XCTHealthKit.docc/XCTHealthKit.md index c25ebda..42867e1 100644 --- a/Sources/XCTHealthKit/XCTHealthKit.docc/XCTHealthKit.md +++ b/Sources/XCTHealthKit/XCTHealthKit.docc/XCTHealthKit.md @@ -29,7 +29,7 @@ import XCTHealthKit class HealthKitUITests: XCTestCase { func testAddMockData() throws { - let healthApp = XCUIApplication.healthApp() + let healthApp = XCUIApplication.healthApp try launchAndAddSample(healthApp: healthApp, .steps(value: 71)) try launchAndAddSample(healthApp: healthApp, .electrocardiogram()) } @@ -43,7 +43,7 @@ import XCTHealthKit class HealthKitUITests: XCTestCase { func testAddMockData() throws { - let healthApp = XCUIApplication.healthApp() + let healthApp = XCUIApplication.healthApp try launchAndAddSamples(healthApp: healthApp, [ .activeEnergy(), .electrocardiogram(), diff --git a/Sources/XCTHealthKit/XCTHealthKitAddSampleInput.swift b/Sources/XCTHealthKit/XCTHealthKitAddSampleInput.swift index c8e15b7..d130c42 100644 --- a/Sources/XCTHealthKit/XCTHealthKitAddSampleInput.swift +++ b/Sources/XCTHealthKit/XCTHealthKitAddSampleInput.swift @@ -88,8 +88,8 @@ extension NewHealthSampleInput { } /// Creates a new Electrocardiogram sample input, with the specified values - public static func electrocardiogram(date: DateComponents? = nil) -> Self { - .init(sampleType: .electrocardiograms, date: date, enterSampleValueHandler: .custom { _, app in + public static func electrocardiogram() -> Self { + .init(sampleType: .electrocardiograms, date: nil, enterSampleValueHandler: .custom { _, app in XCTAssert(app.tables.staticTexts["High Heart Rate"].firstMatch.waitForExistence(timeout: 2)) app.tables.staticTexts["High Heart Rate"].firstMatch.tap() }) diff --git a/Sources/XCTHealthKit/XCTest+HealthKit.swift b/Sources/XCTHealthKit/XCTest+HealthKit.swift index 1efe674..7be39a0 100644 --- a/Sources/XCTHealthKit/XCTest+HealthKit.swift +++ b/Sources/XCTHealthKit/XCTest+HealthKit.swift @@ -20,11 +20,8 @@ struct XCTHealthKitError: Error { extension XCUIApplication { /// The Apple Health app - public static func healthApp(locale: Locale = .current) -> XCUIApplication { - let app = XCUIApplication(bundleIdentifier: "com.apple.Health") - app.launchArguments.append("-AppleLocale") - app.launchArguments.append(locale.identifier) - return app + public static var healthApp: XCUIApplication { + XCUIApplication(bundleIdentifier: "com.apple.Health") } } diff --git a/Tests/UITests/TestAppUITests/TestAppUITests.swift b/Tests/UITests/TestAppUITests/TestAppUITests.swift index 222f74c..e53b806 100644 --- a/Tests/UITests/TestAppUITests/TestAppUITests.swift +++ b/Tests/UITests/TestAppUITests/TestAppUITests.swift @@ -22,7 +22,7 @@ class TestAppUITests: XCTestCase { @MainActor func testXCTHealthKitAddSamples1() throws { - let healthApp = XCUIApplication.healthApp() + let healthApp = XCUIApplication.healthApp try launchAndAddSample(healthApp: healthApp, .electrocardiogram()) try launchAndAddSample(healthApp: healthApp, .steps()) healthApp.terminate() @@ -35,7 +35,7 @@ class TestAppUITests: XCTestCase { @MainActor func testXCTHealthKitAddSamples2() throws { - let healthApp = XCUIApplication.healthApp() + let healthApp = XCUIApplication.healthApp try launchAndAddSamples(healthApp: healthApp, [.electrocardiogram(), .steps()]) healthApp.terminate() try launchAndAddSamples(healthApp: healthApp, [.pushes(), .restingHeartRate()]) @@ -46,7 +46,7 @@ class TestAppUITests: XCTestCase { @MainActor func testSampleEntryWithDateAndTime() throws { - try launchAndAddSample(healthApp: .healthApp(), .steps( + try launchAndAddSample(healthApp: .healthApp, .steps( value: 52, date: DateComponents(year: 2025, month: 01, day: 19, hour: 14, minute: 42) ))