Merge pull request #11 from sassiwalid/10-migrate-to-swift-testing-framework

[Spark DI][Swift testing] - move to fully swift testing

Author: sassiwalid

.github/workflows/ci.yml

@@ -1,5 +1,4 @@
 name: CI
-
 on:
   push:
     branches:
@@ -10,22 +9,20 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
-
+    runs-on: macos-14  # Use macOS 14 for Xcode 16 support
     steps:
-      - name: Check Xcode Version
-        run: xcodebuild -version
-
       - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up Swift
-        uses: fwal/setup-swift@v1
-        with:
-          swift-version: '5.9'
-
+        uses: actions/checkout@v4  # Updated to v4
+        
+      - name: Select Xcode 16
+        run: sudo xcode-select -s /Applications/Xcode_16.2.0.app/Contents/Developer
+        
+      - name: Show Xcode and Swift Version
+        run: xcodebuild -version
+             swift --version
+        
       - name: Build SparkDI
-        run: swift build
-
-      - name: Run Tests
-        run: swift test
+        run: swift build --build-tests
+                
+      - name: Run Swift Testing Tests
+        run: swift test --enable-code-coverage --parallel

Tests/SparkDITests/AssemblerTests.swift

@@ -2,13 +2,10 @@
 //  Copyright © 2024 SparkDI Contributors. All rights reserved.
 //
 
-#if canImport(Testing)
 import Testing
-#endif
-import XCTest
+
 @testable import SparkDI
 
-#if canImport(Testing)
 struct AssemblerTests {
     @Test func assemblerWithMultipleModules() async throws {
         /// GIVEN
@@ -39,32 +36,3 @@ struct AssemblerTests {
         #expect(userService1 !== userService2)
     }
 }
-#endif
-
-final class AssemblerXCTests: XCTestCase {
-    
-    func testAssemblerWithMultipleModules() async throws {
-        let container = DependencyContainer()
-        let assembler = Assembler(container: container)
-        try await assembler.apply(
-            modules: [NetworkModule(), UserModule()]
-        )
-        
-        // resolve Network module dependencies (singletons case)
-        let apiService1 = try await container.resolve(type: APIServiceDummy.self)
-        let apiService2 = try await container.resolve(type: APIServiceDummy.self)
-        
-        let networkManager1 = try await container.resolve(type: NetworkManagerDummy.self)
-        let networkManager2 = try await container.resolve(type: NetworkManagerDummy.self)
-        
-        // resolve user module dependencies (new instance case)
-        
-        let userService1 = try await container.resolve(type: UserServiceDummy.self)
-        let userService2 = try await container.resolve(type: UserServiceDummy.self)
-        
-        XCTAssertTrue(apiService1 === apiService2)
-        XCTAssertTrue(networkManager1 === networkManager2)
-        XCTAssertTrue(userService1 !== userService2)
-        
-    }
-}

Tests/SparkDITests/ConcurrentTests.swift

@@ -2,13 +2,11 @@
 //  Copyright © 2024 SparkDI Contributors. All rights reserved.
 //
 
-#if canImport(Testing)
 import Testing
-#endif
-import XCTest
+import Foundation
+
 @testable import SparkDI
 
-#if canImport(Testing)
 struct SparkDIConcurrentTests {
     @Test
     func ConcurrentWriteCrash() async throws {
@@ -53,49 +51,3 @@ struct SparkDIConcurrentTests {
         }
     }
 }
-#endif
-
-final class ConcurrentTests: XCTestCase {
-    func testConcurrentWriteCrash() throws {
-        let container = DependencyContainer()
-        
-        let expectation = XCTestExpectation(description: "Concurrent writes should cause crash (1000 iterations)")
-        
-        let iterations = 1000
-
-        DispatchQueue.concurrentPerform(iterations: iterations) { index in
-            Task {
-                try await container.register(
-                    type: String.self,
-                    factory: { _ in
-                        "instance \(index)"
-                    },
-                    scope: .transient
-                )
-            }
-        }
-        
-        expectation.fulfill()
-        
-        wait(for: [expectation], timeout: 5)
-    }
-    
-    func testConcurrentReadCrash() throws {
-        let container = DependencyContainer()
-        
-        let expectation = XCTestExpectation(description: "Concurrent read should cause crash (1000 iterations)")
-        
-        let iterations = 1000
-
-        DispatchQueue.concurrentPerform(iterations: iterations) { index in
-            Task {
-                _ = try await container.resolve(type: String.self)
-    
-            }
-        }
-        
-        expectation.fulfill()
-        
-        wait(for: [expectation], timeout: 5)
-    }
-}

Tests/SparkDITests/DependencyContainerTests.swift

@@ -1,14 +1,11 @@
 //  
 //  Copyright © 2024 SparkDI Contributors. All rights reserved.
 //
-
-#if canImport(Testing)
+import Foundation
 import Testing
-#endif
-import XCTest
+
 @testable import SparkDI
 
-#if canImport(Testing)
 struct DependencyInjectionTests {
 
     @Test func singletonScopeWithoutParameter() async throws {
@@ -139,152 +136,3 @@ struct DependencyInjectionTests {
     }
 
 }
-#endif
-
-final class DependencyContainerTests: XCTestCase {
-    
-    func testSingletonScopeWithoutParameter() async throws {
-        /// Given
-        let container = DependencyContainer()
-        
-        /// When
-        try await container.register(type: String.self, factory: { _ in  "Singleton Instance" }, scope: .singleton)
-        
-        // Then
-        let instance1: String? = try await container.resolve(type: String.self)
-        let instance2: String? = try await container.resolve(type: String.self)
-        
-        XCTAssertTrue(
-            instance1 == instance2,
-            "Singleton scope should return the same instance"
-        )
-        
-    }
-    
-    func testTransientScopeWithoutParameter() async throws {
-        /// Given
-        let container = DependencyContainer()
-        
-        try await container.register(
-            type: String.self,
-            factory: { _ in UUID().uuidString
-            },
-            scope: .transient
-        )
-        
-        /// When
-        
-        let instance1: String? = try await container.resolve(type: String.self)
-        let instance2: String? = try await container.resolve(type: String.self)
-        
-        /// Then
-        
-        XCTAssertNotEqual(
-            instance1,
-            instance2,
-            "Transient scope should create a new instance each time"
-        )
-    }
-    
-    func testSingletonScopeWithSingleParameter() async throws {
-        
-        /// Given
-        let container = DependencyContainer()
-        
-        try await container.register(
-            type: AppConfigurationDummy.self,
-            factory: { args in
-                guard let version = args.first as? String else { fatalError("Invalid arguments") }
-                
-                return AppConfigurationDummy(version: version)
-            },
-            scope: .singleton
-        )
-        
-        /// When
-        
-        let instance1: AppConfigurationDummy? = try await container.resolve(
-            type: AppConfigurationDummy.self,
-            arguments: "1.0.0"
-        )
-        
-        let instance2: AppConfigurationDummy? = try await container.resolve(type: AppConfigurationDummy.self)
-        
-        /// Then
-        XCTAssertTrue(
-            instance1 == instance2,
-            "Singleton scope should return the same instance"
-        )
-        
-    }
-    
-    func testTransientScopeWithSingleparameter() async throws {
-        
-        /// Given
-        let container = DependencyContainer()
-        
-        try await container.register(
-            type: AppConfigurationDummy.self,
-            factory: { args in
-                guard let version = args.first as? String else { fatalError("Invalid arguments") }
-                
-                return AppConfigurationDummy(version: version)
-            },
-            scope: .transient
-        )
-        
-        /// When
-        
-        let instance1: AppConfigurationDummy? = try await container.resolve(
-            type: AppConfigurationDummy.self,
-            arguments: "1.0.0"
-        )
-        
-        let instance2: AppConfigurationDummy? = try await container.resolve(
-            type: AppConfigurationDummy.self,
-            arguments: "2.0.0"
-        )
-        
-        /// Then
-        
-        XCTAssertNotEqual(
-            instance1,
-            instance2,
-            "Transient scope should create a new instance each time"
-        )
-    }
-    
-    
-    func testTransientScopeWithMultipleParameters() async throws {
-        /// Given
-        let container = DependencyContainer()
-        
-        try await container.register(
-            type: String.self,
-            factory: { args in
-                guard let name = args[0] as? String, let age = args[1] as? Int else {
-                    return "Invalid arguments"
-                }
-                return "\(name) is \(age) years old"
-            },
-            scope: .transient
-        )
-        
-        /// When
-        
-        let instance: String? = try await container.resolve(
-            type: String.self,
-            arguments: ["John", 25]
-        )
-        
-        /// Then
-        
-        XCTAssertEqual(
-            instance,
-            "John is 25 years old"
-        )
-    }
-    
-}
-
-