Bunch more adjustments

StanfordSpezi · Feb 14, 2024 · 6b44124 · 6b44124
1 parent 1e260aa
commit 6b44124
Show file tree

Hide file tree

Showing 16 changed files with 125 additions and 57 deletions.
diff --git a/Tests/UITests/TestApp/Examples/NameFieldsExample.swift b/Tests/UITests/TestApp/Examples/NameFieldsExample.swift
@@ -39,7 +39,9 @@ struct NameFieldsExample: View {
             }
         }
             .navigationTitle("Enter your details")
+            #if !os(macOS)
             .navigationBarTitleDisplayMode(.inline)
+            #endif
             .navigationBarBackButtonHidden(hideBackButton)
             .toolbar {
                 ToolbarItem(placement: .primaryAction) {

diff --git a/Tests/UITests/TestApp/Examples/ValidationExample.swift b/Tests/UITests/TestApp/Examples/ValidationExample.swift
@@ -29,7 +29,9 @@ struct ValidationExample: View {
                 VerifiableTextField("Password", text: $password, type: .secure)
                     .validate(input: password, rules: .minimalPassword)
             }
+                #if !os(macOS)
                 .textInputAutocapitalization(.never)
+                #endif
                 .autocorrectionDisabled(true)
 
             Section {
@@ -40,7 +42,9 @@ struct ValidationExample: View {
             }
         }
             .navigationTitle("Signup")
+            #if !os(macOS)
             .navigationBarTitleDisplayMode(.inline)
+            #endif
             .navigationBarBackButtonHidden(backButtonHidden)
             .receiveValidation(in: $validation)
             .toolbar {

diff --git a/Tests/UITests/TestApp/Examples/ViewStateExample.swift b/Tests/UITests/TestApp/Examples/ViewStateExample.swift
@@ -38,7 +38,9 @@ struct ViewStateExample: View {
                         .padding()
                 }
                     .navigationTitle("Reset Password")
+                    #if !os(macOS)
                     .navigationBarTitleDisplayMode(.inline)
+                    #endif
                     .viewStateAlert(state: $viewState)
                     .frame(maxWidth: .infinity, minHeight: proxy.size.height)
             }
@@ -54,9 +56,11 @@ struct ViewStateExample: View {
             .validate(input: emailAddress, rules: .minimalEmail)
             .textFieldStyle(.roundedBorder)
             .autocorrectionDisabled(true)
+            #if !os(macOS)
             .textInputAutocapitalization(.never)
-            .textContentType(.username)
             .keyboardType(.emailAddress)
+            #endif
+            .textContentType(.username)
             .font(.title3)
 
         Spacer()

diff --git a/Tests/UITests/TestApp/Localizable.xcstrings b/Tests/UITests/TestApp/Localizable.xcstrings
@@ -9,6 +9,25 @@
     },
     "Action executed" : {
 
+    },
+    "Background text?" : {
+
+    },
+    "Canvas Size: none" : {
+
+    },
+    "Canvas Size: width %lf, height %lf" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Canvas Size: width %1$lf, height %2$lf"
+          }
+        }
+      }
+    },
+    "CanvasTest" : {
+
     },
     "Credentials" : {
 

diff --git a/Tests/UITests/TestApp/PersonalInfoTests/NameFieldsTestView.swift b/Tests/UITests/TestApp/PersonalInfoTests/NameFieldsTestView.swift
@@ -19,7 +19,9 @@ struct NameFieldsTestView: View {
                 nameFields
             }
         }
+            #if !os(macOS)
             .navigationBarTitleDisplayMode(.inline)
+            #endif
     }
 
 

diff --git a/Tests/UITests/TestApp/SpeziViewsTargetsTests.swift b/Tests/UITests/TestApp/SpeziViewsTargetsTests.swift
@@ -28,6 +28,11 @@ struct SpeziViewsTargetsTests: View {
                 Button("SpeziValidation") {
                     presentingSpeziValidation = true
                 }
+                #if canImport(PencilKit) && !os(macOS)
+                NavigationLink("CanvasTest") {
+                    CanvasTestView()
+                }
+                #endif
 
                 Section {
                     NavigationLink("ViewState") {
@@ -48,13 +53,13 @@ struct SpeziViewsTargetsTests: View {
                 .navigationTitle("Targets")
         }
             .sheet(isPresented: $presentingSpeziViews) {
-                TestAppTestsView<SpeziViewsTests>()
+                TestAppTestsView<SpeziViewsTests>(showCloseButton: true)
             }
             .sheet(isPresented: $presentingSpeziPersonalInfo) {
-                TestAppTestsView<SpeziPersonalInfoTests>()
+                TestAppTestsView<SpeziPersonalInfoTests>(showCloseButton: true)
             }
             .sheet(isPresented: $presentingSpeziValidation) {
-                TestAppTestsView<SpeziValidationTests>()
+                TestAppTestsView<SpeziValidationTests>(showCloseButton: true)
             }
     }
 }

diff --git a/Tests/UITests/TestApp/ViewsTests/CanvasTestView.swift b/Tests/UITests/TestApp/ViewsTests/CanvasTestView.swift
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+#if canImport(PencilKit) && !os(macOS)
 import PencilKit
 import SpeziViews
 import SwiftUI
@@ -16,28 +17,38 @@ struct CanvasTestView: View {
     @State var didDrawAnything = false
     @State var showToolPicker = false
     @State var drawing = PKDrawing()
-
-    
+    @State var receivedSize: CGSize?
+
     var body: some View {
-        VStack {
-            Text("Did Draw Anything: \(didDrawAnything.description)")
-            Button("Show Tool Picker") {
-                showToolPicker.toggle()
+        ZStack {
+            VStack {
+                Text("Did Draw Anything: \(didDrawAnything.description)")
+                if let receivedSize {
+                    Text("Canvas Size: width \(receivedSize.width), height \(receivedSize.height)")
+                } else {
+                    Text("Canvas Size: none")
+                }
+                Button("Show Tool Picker") {
+                    showToolPicker.toggle()
+                }
+                CanvasView(
+                    drawing: $drawing,
+                    isDrawing: $isDrawing,
+                    tool: .init(.pencil, color: .red, width: 10),
+                    drawingPolicy: .anyInput,
+                    showToolPicker: $showToolPicker
+                )
             }
-            CanvasView(
-                drawing: $drawing,
-                isDrawing: $isDrawing,
-                tool: .init(.pencil, color: .red, width: 10),
-                drawingPolicy: .anyInput,
-                showToolPicker: $showToolPicker
-            )
         }
             .onChange(of: isDrawing) {
                 if isDrawing {
                     didDrawAnything = true
                 }
             }
             .navigationBarTitleDisplayMode(.inline)
+            .onPreferenceChange(CanvasView.CanvasSizePreferenceKey.self) { size in
+                self.receivedSize = size
+            }
     }
 }
 
@@ -49,3 +60,5 @@ struct CanvasTestView_Previews: PreviewProvider {
     }
 }
 #endif
+#endif
+
diff --git a/Tests/UITests/TestApp/ViewsTests/GeometryReaderTestView.swift b/Tests/UITests/TestApp/ViewsTests/GeometryReaderTestView.swift
@@ -36,7 +36,9 @@ struct GeometryReaderTestView: View {
                 .frame(width: 300)
                 .border(.blue)
         }
+            #if !os(macOS)
             .navigationBarTitleDisplayMode(.inline)
+            #endif
     }
 }
 

diff --git a/Tests/UITests/TestApp/ViewsTests/SpeziViewsTests.swift b/Tests/UITests/TestApp/ViewsTests/SpeziViewsTests.swift
@@ -12,9 +12,13 @@ import XCTestApp
 
 
 enum SpeziViewsTests: String, TestAppTests {
+    #if canImport(PencilKit) && !os(macOS)
     case canvas = "Canvas"
+    #endif
     case geometryReader = "Geometry Reader"
+    #if !os(macOS)
     case label = "Label"
+    #endif
     case lazyText = "Lazy Text"
     case markdownView = "Markdown View"
     case viewState = "View State"
@@ -26,16 +30,19 @@ enum SpeziViewsTests: String, TestAppTests {
     case listRow = "List Row"
 
 
+    #if canImport(PencilKit) && !os(macOS)
     @ViewBuilder
     private var canvas: some View {
         CanvasTestView()
     }
-
+    #endif
+
     @ViewBuilder
     private var geometryReader: some View {
         GeometryReaderTestView()
     }
 
+    #if !os(macOS)
     @ViewBuilder
     private var label: some View {
         Label(
@@ -54,7 +61,8 @@ enum SpeziViewsTests: String, TestAppTests {
         )
             .border(.red)
     }
-
+    #endif
+
     @ViewBuilder
     private var markdownView: some View {
         MarkdownViewTestView()
@@ -118,12 +126,16 @@ enum SpeziViewsTests: String, TestAppTests {
 
     func view(withNavigationPath path: Binding<NavigationPath>) -> some View {  // swiftlint:disable:this cyclomatic_complexity
         switch self {
+        #if canImport(PencilKit) && !os(macOS)
         case .canvas:
             canvas
+        #endif
         case .geometryReader:
             geometryReader
+        #if !os(macOS)
         case .label:
             label
+        #endif
         case .lazyText:
             lazyText
         case .markdownView:

diff --git a/Tests/UITests/TestAppUITests/SpeziPersonalInfo/PersonalInfoViewsTests.swift b/Tests/UITests/TestAppUITests/SpeziPersonalInfo/PersonalInfoViewsTests.swift
@@ -25,25 +25,15 @@ final class PersonalInfoViewsTests: XCTestCase {
     func testNameFields() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["Name Fields"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["Name Fields"].tap()
+        XCTAssert(app.buttons["Name Fields"].waitForExistence(timeout: 2))
+        app.buttons["Name Fields"].tap()
 
         XCTAssert(app.staticTexts["First Name"].waitForExistence(timeout: 2))
         XCTAssert(app.staticTexts["Last Name"].waitForExistence(timeout: 2))
 
-        #if os(visionOS)
-        app.textFields["enter your first name"].tap()
-        sleep(1)
-        app.typeText("Leland")
-
-        app.textFields["enter your last name"].tap()
-        sleep(1)
-        app.typeText("Stanford")
-
-        #else
+        print(app.textFields.debugDescription) // TODO: name fields don't look good on macOS
         try app.textFields["enter your first name"].enter(value: "Leland")
         try app.textFields["enter your last name"].enter(value: "Stanford")
-        #endif
 
         XCTAssert(app.textFields["Leland"].waitForExistence(timeout: 2))
         XCTAssert(app.textFields["Stanford"].waitForExistence(timeout: 2))
@@ -52,8 +42,8 @@ final class PersonalInfoViewsTests: XCTestCase {
     func testUserProfile() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["User Profile"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["User Profile"].tap()
+        XCTAssert(app.buttons["User Profile"].waitForExistence(timeout: 2))
+        app.buttons["User Profile"].tap()
 
         XCTAssertTrue(app.staticTexts["PS"].waitForExistence(timeout: 2))
         XCTAssertTrue(app.staticTexts["LS"].exists)

diff --git a/Tests/UITests/TestAppUITests/SpeziValidation/ValidationTests.swift b/Tests/UITests/TestAppUITests/SpeziValidation/ValidationTests.swift
@@ -56,17 +56,25 @@ final class ValidationTests: XCTestCase {
         XCTAssertFalse(app.staticTexts[passwordMessage].exists)
         XCTAssertTrue(app.staticTexts[emptyMessage].exists)
 
-        print(app.switches["Switch Focus"].debugDescription)
+        #if os(macOS)
+        XCTAssertTrue(app.checkBoxes["Switch Focus"].exists)
+        app.checkBoxes["Switch Focus"].tap()
+        #else
         XCTAssertTrue(app.switches["Switch Focus"].exists)
         try XCTUnwrap(app.switches.allElementsBoundByIndex.last).tap() // toggles automatic focus switch off
+        #endif
 
         app.buttons["Validate"].tap()
 
         app.typeText("!")
         app.dismissKeyboard()
 
         XCTAssertTrue(app.textFields["Hello World!"].waitForExistence(timeout: 0.5))
+        #if os(macOS)
+        app.checkBoxes["Switch Focus"].tap()
+        #else
         try XCTUnwrap(app.switches.allElementsBoundByIndex.last).tap() // toggles automatic focus switch on
+        #endif
 
         app.buttons["Validate"].tap()
 

diff --git a/Tests/UITests/TestAppUITests/SpeziViews/EnvironmentTests.swift b/Tests/UITests/TestAppUITests/SpeziViews/EnvironmentTests.swift
@@ -25,13 +25,14 @@ final class EnvironmentTests: XCTestCase {
     func testDefaultErrorDescription() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["Default Error Description"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["Default Error Description"].tap()
+        XCTAssert(app.buttons["Default Error Description"].waitForExistence(timeout: 2))
+        app.buttons["Default Error Description"].tap()
 
         XCTAssert(app.staticTexts["View State: processing"].waitForExistence(timeout: 2))
 
         sleep(12)
 
+        print(app.alerts.debugDescription)
         XCTAssert(app.alerts.staticTexts["This is a default error description!"].exists)
         XCTAssert(app.alerts.staticTexts["Failure Reason\n\nHelp Anchor\n\nRecovery Suggestion"].exists)
         app.alerts.buttons["OK"].tap()

diff --git a/Tests/UITests/TestAppUITests/SpeziViews/ModelTests.swift b/Tests/UITests/TestAppUITests/SpeziViews/ModelTests.swift
@@ -25,8 +25,8 @@ final class ModelTests: XCTestCase {
     func testViewState() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["View State"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["View State"].tap()
+        XCTAssert(app.buttons["View State"].waitForExistence(timeout: 2))
+        app.buttons["View State"].tap()
 
         XCTAssert(app.staticTexts["View State: processing"].waitForExistence(timeout: 2))
 
@@ -42,8 +42,8 @@ final class ModelTests: XCTestCase {
     func testOperationState() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["Operation State"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["Operation State"].tap()
+        XCTAssert(app.buttons["Operation State"].waitForExistence(timeout: 2))
+        app.buttons["Operation State"].tap()
 
         XCTAssert(app.staticTexts["Operation State: someOperationStep"].waitForExistence(timeout: 2))
 
@@ -61,8 +61,8 @@ final class ModelTests: XCTestCase {
     func testViewStateMapper() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["View State Mapper"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["View State Mapper"].tap()
+        XCTAssert(app.buttons["View State Mapper"].waitForExistence(timeout: 2))
+        app.buttons["View State Mapper"].tap()
 
         XCTAssert(app.staticTexts["View State: processing"].waitForExistence(timeout: 2))
         XCTAssert(app.staticTexts["Operation State: someOperationStep"].waitForExistence(timeout: 2))
@@ -84,8 +84,8 @@ final class ModelTests: XCTestCase {
     func testDefaultErrorDescription() throws {
         let app = XCUIApplication()
 
-        XCTAssert(app.collectionViews.buttons["Default Error Only"].waitForExistence(timeout: 2))
-        app.collectionViews.buttons["Default Error Only"].tap()
+        XCTAssert(app.buttons["Default Error Only"].waitForExistence(timeout: 2))
+        app.buttons["Default Error Only"].tap()
 
         XCTAssert(app.staticTexts["View State: processing"].waitForExistence(timeout: 2))
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,9 @@ struct NameFieldsTestView: View { @@
                     nameFields
                 }
             }
+                #if !os(macOS)
                 .navigationBarTitleDisplayMode(.inline)
+                #endif
         }
@@ Expand Down @@