fix: OCKCatalog unit tests

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         destination: ['platform=iOS\ Simulator,OS=17.4,name=iPhone\ 15\ Pro']
-        scheme: ['ResearchKit']
+        scheme: ['ResearchKit', 'ORKCatalog']
     name: ${{ matrix.scheme }} Unit Tests
     steps:
       - uses: actions/checkout@v4

samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift

@@ -1066,7 +1066,7 @@ enum TaskListRow: Int, CustomStringConvertible {
         let dateTimeQuestionSectionHeaderFormItem = ORKFormItem(sectionTitle: TaskListRowStrings.exampleQuestionText)
         let dateTimeQuestionFormItem = ORKFormItem(identifier: String(describing: Identifier.dateTimeQuestionFormStep), text: nil, answerFormat: dateTimeAnswerFormat)
         dateTimeQuestionFormItem.placeholder = "Select Date & Time"
-        let dateTimeQuestionFormStep = ORKFormStep(identifier: String(describing: Identifier.dateTimeQuestionFormItem), title: NSLocalizedString("Date and Time", comment: ""), text: TaskListRowStrings.exampleQuestionText)
+        let dateTimeQuestionFormStep = ORKFormStep(identifier: String(describing: Identifier.dateTimeQuestionFormItem), title: NSLocalizedString("Date and Time", comment: ""), text: "Your text here")
         dateTimeQuestionFormStep.formItems = [dateTimeQuestionSectionHeaderFormItem, dateTimeQuestionFormItem]
 
         return ORKOrderedTask(identifier: String(describing: Identifier.dateTimeQuestionTask), steps: [dateTimeQuestionFormStep])

samples/ORKCatalog/ORKCatalogUITests/Helpers.swift

@@ -113,7 +113,7 @@ class Helpers: XCTestCase {
             if tap && item.isEnabled {
                 item.tap()
             }
-        return item
+            return item
         }
         XCTFail("Unable to locate Element based on text \(identifier)")
         return nil
@@ -140,7 +140,7 @@ class Helpers: XCTestCase {
     //Enter any ORKCatalog task based on the name of the task and leave without taking action
     func launchAndLeave(_ task: String) -> Bool {
         XCTAssert(verifyElement(taskScreen.mainTaskScreen))
-        let currentTask = verifyAndAssignByText(task)!
+        let currentTask = taskScreen.getCurrentTask(task: task)!
         currentTask.tap()
 
         sleep(1)
@@ -183,15 +183,15 @@ class Helpers: XCTestCase {
     //Return an XCUIElement based on page number of the Scale test
     func scaleTitle(_ pageNumber: Int) -> XCUIElement? {
         let titles: [Int: String] = [1: "Discrete Scale", 2: "Continuous Scale", 3: "Discrete Vertical Scale", 4: "Continuous Vertical Scale", 5: "Text Scale", 6: "Text Vertical Scale"]
-        return app.scrollViews.otherElements.staticTexts[titles[pageNumber] ?? "Invalid Page Number"]
+        return app.otherElements.otherElements.staticTexts[titles[pageNumber] ?? "Invalid Page Number"]
     }
 
     //Select and interact with sliders in the Scale Question task. Function verifies expected outputs of each slider.
     func sliderValuesCheck(_ sliderScreen:SliderTesting, _ screenNum: Int, _ direction:SwipeDirection) -> Bool {
         let sliderValues: [SliderTesting:String] = [
-            .slider1:"8",
+            .slider1:"9",
             .slider3:"8",
-            .slider4:"4.23",
+            .slider4:"4.3",
             .slider5:"Above Average",
             .slider6:"Above Average"
         ]
@@ -231,8 +231,8 @@ class Helpers: XCTestCase {
 
     //Returns true if sliders behave as expected on any given screen in the Scale Question task.
     func sliderScreenCheck(_ sliderScreen:SliderTesting) -> Bool {
-        XCTAssert(verifyElement(app.scrollViews.otherElements.staticTexts["Scale"]))
-        XCTAssert(verifyElement(app.scrollViews.otherElements.staticTexts["Your question here."]))
+        XCTAssert(verifyElement(app.otherElements.otherElements.staticTexts["Scale"]))
+        XCTAssert(verifyElement(app.otherElements.otherElements.staticTexts["Your question here."]))
 
         switch sliderScreen {
         case .slider1:

samples/ORKCatalog/ORKCatalogUITests/PreSubmissionTests.swift

@@ -41,7 +41,6 @@ class PreSubmissionTests: XCTestCase {
         continueAfterFailure = false
         helpers.monitorAlerts()
         app.launch()
-
     }
 
     override func tearDownWithError() throws {
@@ -62,8 +61,6 @@ class PreSubmissionTests: XCTestCase {
         for task in taskScreen.surveyQuestions {
             XCTAssert(helpers.launchAndLeave(task))
         }
-
-        return
     }
 
     func testAccessActiveTasks() throws {
@@ -72,15 +69,21 @@ class PreSubmissionTests: XCTestCase {
         for task in taskScreen.activeTasks {
             XCTAssert(helpers.launchAndLeave(task))
         }
-
-        return
+    }
+
+    func testAccessOnboarding() throws {
+        XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
+
+        for task in taskScreen.onboardingTasks {
+            XCTAssert(helpers.launchAndLeave(task))
+        }
     }
 
     func testWrittenMultipleChoice() throws {
         XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
         let options = ["Choice 1", "Choice 2", "Choice 3", "Other"]
-        let required = ["Text Choice", "Additional text can go here.", "Your question here."]
-        
+        let required = ["Your title here", "Your text here", "Select an option"]
+
         XCTAssert(helpers.verifyElementByText("Text Choice Question", true))
 
         for item in required {
@@ -89,8 +92,7 @@ class PreSubmissionTests: XCTestCase {
 
         XCTAssert(helpers.verifyElementByText(options.randomElement()!, true))
 
-        XCTAssert(helpers.verifyElementByType(.button, "Done", true))
-        return
+        XCTAssert(helpers.verifyElementByType(.button, "Next", true))
     }
 
     func testImageMultipleChoice() throws {
@@ -120,18 +122,17 @@ class PreSubmissionTests: XCTestCase {
 
         XCTAssert(helpers.verifyElementByType(.button, "Done", true))
         XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
-        return
     }
 
     func testSQPickerWheel() throws {
         XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
 
         let dt = helpers.verifyAndAssignByText("Date and Time Question")!
-        let elementsQuery = app.scrollViews.otherElements.staticTexts
-        
+        let elementsQuery = app.otherElements.tables.staticTexts
+
         dt.tap()
         XCTAssert(elementsQuery["Date and Time"].exists)
-        XCTAssert(elementsQuery["Additional text can go here."].exists)
+        XCTAssert(elementsQuery["Your text here"].exists)
         XCTAssert(elementsQuery["Your question here."].exists)
 
         let skip = helpers.verifyAndAssignByText("Skip")!
@@ -148,6 +149,9 @@ class PreSubmissionTests: XCTestCase {
         let newDate = Calendar.current.date(byAdding: .day, value: 5, to: now)
         let newDateString = formatter.string(from: newDate!)
 
+        let selectDateField = helpers.verifyAndAssignByType(.other, "Select Date & Time", false)!
+        selectDateField.tap()
+
         let firstPredicate = NSPredicate(format: "value BEGINSWITH 'Today'")
         let firstPicker = app.pickerWheels.element(matching: firstPredicate)
         XCTAssert(firstPicker.isEnabled)
@@ -165,15 +169,15 @@ class PreSubmissionTests: XCTestCase {
         XCTAssert(fourthPicker.isEnabled)
         datetime == "AM" ? fourthPicker.adjust(toPickerWheelValue: "PM") : fourthPicker.adjust(toPickerWheelValue: "AM")
 
-        XCTAssert(done.isEnabled)
-        done.tap()
+        let pickerDoneButton = app.otherElements.toolbars.buttons["Done"]
+        if pickerDoneButton.exists {
+            pickerDoneButton.tap()
+        }
+
         XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
 
         dt.tap()
-        skip.tap()
         XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
-
-        return
     }
 
     func testSQSliders() throws {
@@ -186,15 +190,7 @@ class PreSubmissionTests: XCTestCase {
         XCTAssert(helpers.sliderScreenCheck(.slider5))
         XCTAssert(helpers.sliderScreenCheck(.slider6))
 
-        XCTAssert(helpers.sliderScreenCheck(.slider1))
-        XCTAssert(helpers.sliderScreenCheck(.slider2))
-        XCTAssert(helpers.sliderScreenCheck(.slider3))
-        XCTAssert(helpers.sliderScreenCheck(.slider4))
-        XCTAssert(helpers.sliderScreenCheck(.slider5))
-        XCTAssert(helpers.sliderScreenCheck(.slider6))
-
         XCTAssert(taskScreen.mainTaskScreen.waitForExistence(timeout: 5))
-        return
     }
 
     func testSQTextEntry() throws {
@@ -206,7 +202,7 @@ class PreSubmissionTests: XCTestCase {
             XCTFail("Unable to locate done button")
             return
         }
-        XCTAssertFalse(done.isEnabled)
+        XCTAssertTrue(done.isEnabled)
         XCTAssert(helpers.verifyElementByText("Text"))
         XCTAssert(helpers.verifyElementByText("Additional text can go here."))
 
@@ -230,8 +226,6 @@ class PreSubmissionTests: XCTestCase {
         done.tap()
 
         XCTAssert(helpers.verifyElement(taskScreen.mainTaskScreen))
-
-        return
     }
 
 }

samples/ORKCatalog/ORKCatalogUITests/Screens/AllowScreens.swift

@@ -46,7 +46,7 @@ struct AllowScreens {
 
     func allowHealthAccess() {
         if healthAccessScreen.exists {
-            app.tables.staticTexts["Turn All Categories On"].tap()
+            app.tables.staticTexts["Turn On All"].tap()
             sleep(1)
             app.navigationBars["Health Access"].buttons["Allow"].tap()
         }
@@ -59,7 +59,7 @@ struct AllowScreens {
     }
 
     func triggerAllowScreens() -> Bool {
-        let healthTriggers = ["Height Question", "Weight Question"]
+        let healthTriggers = ["Height Question", "Weight Question", "Health Quantity Question"]
         XCTAssert(commonElements.verifyElement(taskScreen.mainTaskScreen))
 
         for task in healthTriggers {

samples/ORKCatalog/ORKCatalogUITests/Screens/CommonElements.swift

@@ -47,19 +47,19 @@ struct CommonElements {
     }
 
     var nextButton: XCUIElement? {
-        app.scrollViews.otherElements.staticTexts["Next"]
+        app.buttons["Next"]
     }
 
     var backButton: XCUIElement? {
         app.navigationBars.buttons["Back"]
     }
 
     var skipButton: XCUIElement? {
-        app.scrollViews.otherElements.staticTexts["Skip"]
+        app.buttons["Skip"]
     }
 
     func getExitButton() -> XCUIElement? {
-        let otherElements = app.sheets.scrollViews.otherElements
+        let otherElements = app.otherElements.scrollViews.otherElements
         if otherElements.buttons["Discard Results"].exists {
             return otherElements.buttons["Discard Results"]
         }

samples/ORKCatalog/ORKCatalogUITests/Screens/TaskScreen.swift

@@ -35,64 +35,86 @@ struct TaskScreen {
     let app = XCUIApplication()
 
     var surveyTasks = [
-    "Form Survey Example",
-    "Grouped Form Survey Example",
-    "Simple Survey Example"
+        "Don't Know Survey",
+        "Form Survey Example",
+        "Grouped Form Survey Example",
+        "Simple Survey Example",
+        "Survey With Multiple Options"
     ]
 
     var surveyQuestions = [
-    "Boolean Question",
-    "Custom Boolean Question",
-    "Date Question",
-    "Date and Time Question",
-    "Height Question",
-    "Weight Question",
-    "Image Choice Question",
-    "Location Question",
-    "Numeric Question",
-    "Scale Question",
-    "Text Question",
-    "Text Choice Question",
-    "Time Interval Question",
-    "Value Picker Choice Question",
-    "Validated Text Question",
-    "Image Capture Step",
-    "Video Capture Step",
-    "Front Facing Camera Step",
-    "Wait Step",
-    "PDF Viewer Step",
-    "Request Permissions Step"
+        "Boolean Question",
+        "Custom Boolean Question",
+        "Date Question",
+        "Date and Time Question",
+        "Date and Time 3 day Limit Question",
+        "Health Quantity Question",
+        "Height Question",
+        "Weight Question",
+        "Image Choice Question",
+        "Location Question",
+        "Numeric Question",
+        "Scale Question",
+        "Text Question",
+        "Text Choice Question",
+        "Text Choice Image Question",
+        "Time Interval Question",
+        "Time of Day Question",
+        "Value Picker Choice Question",
+        "Validated Text Question",
+        "Front Facing Camera Step",
+        "Image Capture Step",
+        "PDF Viewer Step",
+        "Request Permissions Step",
+        "Video Capture Step",
+        "Video Instruction",
+        "Wait Step",
+        "Web View"
     ]
 
     var activeTasks: [String] {
-        var tasks = [
+        let tasks = [
             "Audio",
             "Amsler Grid",
+            "dBHL Tone Audiometry",
             "Fitness Check",
             "Hole Peg Test",
+            "Knee Range of Motion",
+            "Normalized Reaction Time",
             "PSAT",
             "Reaction Time",
             "Short Walk",
+            "Shoulder Range of Motion",
+            "Six Minute Walk",
             "Spatial Span Memory",
-            "Speech Recognition",
             "Speech in Noise",
+            "Speech Recognition",
+            "Environment SPL Meter",
             "Stroop",
+            "Tecumseh Cube Test",
             "Timed Walk with Turn Around",
             "Tone Audiometry",
-            "dBHL Tone Audiometry",
-            //"Environment SPL Meter",
             "Tower of Hanoi",
             "Tremor Test",
             "Two Finger Tapping Interval",
             "Walk Back and Forth",
-            "Knee Range of Motion",
-            "Shoulder Range of Motion",
-            "Trail Making Test"
+            // "Trail Making Test"
             ]
 
         return tasks
     }
-
+
+    var onboardingTasks = [
+        "Account Creation",
+        "Biometric Passcode Creation and Authorization",
+        "Consent Document Review",
+        "Consent Task",
+        "Eligibility Task Example",
+        // "Login",
+        "Passcode Creation",
+        "Review Step"
+    ]
+
     var mainTaskScreen: XCUIElement {
         app.navigationBars["ORKCatalog"].staticTexts["ORKCatalog"]
     }