Minor test additions

StanfordSpezi · Aug 1, 2024 · 07b76d2 · 07b76d2
1 parent 17c15b1
commit 07b76d2
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 11 deletions.
diff --git a/Tests/SpeziTests/DependenciesTests/DependencyBuilderTests.swift b/Tests/SpeziTests/DependenciesTests/DependencyBuilderTests.swift
@@ -43,6 +43,18 @@ final class DependencyBuilderTests: XCTestCase {
         XCTAssertEqual(collection.count, 2)
     }
 
+    @available(*, deprecated, message: "Propagate deprecation warning.")
+    @MainActor
+    func testDeprecatedInits() {
+        let collection1 = DependencyCollection(singleEntry: ExampleDependentModule())
+        let collection2 = DependencyCollection(singleEntry: {
+            ExampleDependentModule()
+        })
+
+        XCTAssertEqual(collection1.count, 1)
+        XCTAssertEqual(collection2.count, 1)
+    }
+
 
     @MainActor
     func testDependencyBuilder() throws {

diff --git a/Tests/SpeziTests/DependenciesTests/DependencyTests.swift b/Tests/SpeziTests/DependenciesTests/DependencyTests.swift
@@ -163,16 +163,6 @@ private final class InjectionOfOptionalDefaultValue: Module {
     init() {}
 }
 
-
-/*
-private final class TestModuleCircle11: Module {
-    @Dependency var testModuleCircle2 = TestModuleCircle22()
-}
-
-private final class TestModuleCircle22: Module {
-    @Dependency var testModuleCircle1 = TestModuleCircle11()
-}*/
-
 private final class TestModuleCircle1: Module {
     @Dependency var modules: [any Module]
 
@@ -659,6 +649,31 @@ final class DependencyTests: XCTestCase { // swiftlint:disable:this type_body_le
             _ = DependencyManager.resolve([module1])
         }
     }
+
+    @MainActor
+    func testMissingRequiredModule() throws {
+        class Module1: Module {
+            @Dependency(TestModuleX.self) var module
+        }
+
+        try XCTRuntimePrecondition {
+            _ = DependencyManager.resolve([Module1()])
+        }
+    }
+
+    @available(*, deprecated, message: "Propagate deprecation warning")
+    @MainActor
+    func testDeprecatedInits() throws {
+        let spezi = Spezi(standard: DefaultStandard(), modules: [DeprecatedDeclarations()])
+
+        let modules = spezi.modules
+
+        let module: DeprecatedDeclarations = try getModule(in: modules)
+
+        XCTAssertNil(module.testModule6)
+        XCTAssertEqual(module.testModule3.state, 0)
+        XCTAssertEqual(module.testModule3.num, 3)
+    }
 }
 
 // swiftlint:disable:this file_length
diff --git a/Tests/UITests/TestAppUITests/LifecycleHandlerTests.swift b/Tests/UITests/TestAppUITests/LifecycleHandlerTests.swift
@@ -21,6 +21,8 @@ final class LifecycleHandlerTests: XCTestCase {
         app.launchArguments = ["--lifecycleTests"]
         app.launch()
 
+        XCTAssertTrue(app.wait(for: .runningForeground, timeout: 2.0))
+
         app.buttons["LifecycleHandler"].tap()
 
         XCTAssert(app.staticTexts["WillFinishLaunchingWithOptions: 1"].waitForExistence(timeout: 2))
@@ -43,6 +45,8 @@ final class LifecycleHandlerTests: XCTestCase {
         app.activate()
         #endif
 
+        XCTAssertTrue(app.wait(for: .runningForeground, timeout: 2.0))
+
         XCTAssert(app.staticTexts["WillFinishLaunchingWithOptions: 1"].waitForExistence(timeout: 2))
         XCTAssert(app.staticTexts["SceneWillEnterForeground: 2"].exists)
         XCTAssert(app.staticTexts["SceneDidBecomeActive: 2"].exists)

diff --git a/Tests/UITests/TestAppUITests/ModelTests.swift b/Tests/UITests/TestAppUITests/ModelTests.swift
@@ -15,6 +15,8 @@ final class ModelTests: XCTestCase {
         let app = XCUIApplication()
         app.launch()
 
+        XCTAssertTrue(app.wait(for: .runningForeground, timeout: 2.0))
+
         app.buttons["Model"].tap()
 
         XCTAssert(app.staticTexts["Passed"].waitForExistence(timeout: 1))

diff --git a/Tests/UITests/TestAppUITests/ViewModifierTests.swift b/Tests/UITests/TestAppUITests/ViewModifierTests.swift
@@ -14,7 +14,9 @@ final class ViewModifierTests: XCTestCase {
     func testViewModifierPropertyWrapper() throws {
         let app = XCUIApplication()
         app.launch()
-
+
+        XCTAssertTrue(app.wait(for: .runningForeground, timeout: 2.0))
+
         app.buttons["ViewModifier"].tap()
 
         XCTAssert(app.staticTexts["Passed"].waitForExistence(timeout: 1))