fixed test code

Author: minsOne

.github/workflows/ci.yml

@@ -11,10 +11,13 @@ jobs:
       CODECOV_PACKAGE_NAME: DIContainer
 
     steps:
-    - uses: actions/checkout@v1
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Set up Xcode
+      run: sudo xcode-select --switch /Applications/Xcode_16.2.app/Contents/Developer
     - name: Build and Test
       run: |
-        set -o pipefail && swift test --no-parallel --enable-code-coverage | xcpretty -c;
+        set -o pipefail && swift test --enable-code-coverage | xcpretty -c;
 
     - name: Upload Code Coverage
       run: |

Sources/DIContainer/Container/Container.swift

@@ -49,6 +49,11 @@ extension Container {
     static func weakResolve<T, U: InjectionKeyType>(for type: U.Type) -> T? {
         root.module(type)?.resolve() as? T
     }
+    
+    /// Check if the dependency is registered in the container.
+    static func isRegistered<T: InjectionKeyType>(_ type: T.Type) -> Bool {
+        root.module(type) != nil
+    }
 
     func module<T: InjectionKeyType>(_ type: T.Type) -> Module? {
         let keyName = KeyName(type).name
@@ -96,7 +101,7 @@ public extension Container {
 @MainActor
 public extension Container {
     static func clear() {
-        root.modules.removeAll()
+        root = .init()
     }
 }
 

Tests/DIContainerTests/Helper/Helper.swift

@@ -5,6 +5,6 @@ import Foundation
 extension InjectionKeyType {
     @MainActor
     static var module: Module? {
-        return Container.root.module(Self.self)
+        Container.root.module(Self.self)
     }
 }

Tests/DIContainerTests/Tests/AutoModuleIsNotCachedTests.swift

@@ -6,33 +6,31 @@ import XCTest
 @MainActor
 @Suite(.serialized)
 struct WeakInjectNilTest {
-    init() {
-        Container().build()
-    }
-}
-
-extension WeakInjectNilTest {
     @Test
     func containerDoesNotContainWeakMockService() {
+        Container.clear()
+
         // When
         let weakMockService = WeakMockServiceKey.module?.resolve()
         let weakMockServiceImpl = WeakMockServiceKey.module?.resolve() as? WeakMockServiceKey.Value
         let weakMockServiceProtocol = WeakMockServiceKey.module?.resolve() as? WeakMockService
 
         // Then
-        XCTAssertNil(weakMockService)
-        XCTAssertNil(weakMockServiceImpl)
-        XCTAssertNil(weakMockServiceProtocol)
+        #expect(weakMockService == nil)
+        #expect(weakMockServiceImpl == nil)
+        #expect(weakMockServiceProtocol == nil)
     }
 
     @Test
     func weakInjectReturnsNil() {
+        Container.clear()
+
         // When
         @WeakInject(WeakMockServiceKey.self) var service1
         @WeakInject(WeakMockServiceKey.self) var service2: WeakMockService?
 
         // Then
-        XCTAssertNil(service1)
-        XCTAssertNil(service2)
+        #expect(service1 == nil)
+        #expect(service2 == nil)
     }
 }

Tests/DIContainerTests/Tests/Inject/WeakInjectNilTests.swift

@@ -5,8 +5,8 @@ import XCTest
 
 @MainActor
 @Suite(.serialized)
-struct WeakInjectTest {
-    init() {
+class WeakInjectTest {
+    func registerContainer() {
         // Given
         Container {
             Module(WeakMockServiceKey.self) { WeakMockServiceImpl() }
@@ -20,6 +20,9 @@ struct WeakInjectTest {
 extension WeakInjectTest {
     @Test
     func containerRegistration1() {
+        // given
+        registerContainer()
+        
         // When
         let weakMockService = WeakMockServiceKey.module?.resolve()
         let weakMockServiceImpl = WeakMockServiceKey.module?.resolve() as? WeakMockServiceKey.Value
@@ -33,6 +36,9 @@ extension WeakInjectTest {
 
     @Test
     func containerRegistration2() throws {
+        // given
+        registerContainer()
+
         // When
         @WeakInject(WeakMockServiceKey.self) var service1
         @WeakInject(MockServiceKey.self) var service2
@@ -44,8 +50,22 @@ extension WeakInjectTest {
         #expect(factory != nil)
     }
 
+    @Test
+    func containerRegistration3() throws {
+        // given
+        registerContainer()
+        
+        // Then
+        #expect(Container.isRegistered(WeakMockServiceKey.self))
+        #expect(Container.isRegistered(MockServiceKey.self))
+        #expect(Container.isRegistered(MockServiceFactoryKey.self))
+    }
+    
     @Test
     func weakInjectBehavior1() throws {
+        // given
+        registerContainer()
+
         // When
         @WeakInject(WeakMockServiceKey.self) var _service1: WeakMockService?
         @WeakInject(MockServiceKey.self) var _service2: MockService?
@@ -74,6 +94,9 @@ extension WeakInjectTest {
 
     @Test
     func weakInjectBehavior2() throws {
+        // given
+        registerContainer()
+
         // When
         @WeakInject(WeakMockServiceKey.self) var _service1
         @WeakInject(MockServiceKey.self) var _service2
@@ -102,6 +125,9 @@ extension WeakInjectTest {
 
     @Test
     func factoryBehavior() throws {
+        // given
+        registerContainer()
+
         @WeakInject(MockServiceFactoryKey.self) var factory
         let _service1 = factory?.makeWeakService()
         let _service2 = factory?.makeWeakService()

Tests/DIContainerTests/Tests/Inject/WeakInjectTests.swift

@@ -6,22 +6,32 @@ import XCTest
 
 @MainActor
 @Suite(.serialized)
-struct ModuleListExtensionTest {}
+class ModuleListExtensionTest {
+    var moduleList: [Module]
+
+    init() {
+        moduleList = [
+            Module(MockServiceFactory.self),
+            Module(WeakMockServiceImpl.self),
+            Module(MockServiceImpl.self),
+        ]
+    }
+}
 
 extension ModuleListExtensionTest {
     @Test
     func replaceOneModule() {
         // Given
         let newModule = Module(MockServiceKey.self) { Service1() }
-        var moduleList = ModuleScanner().scanModuleList
-        #expect(moduleList.count == 3)
 
         // When
         moduleList = moduleList.replacing(newModule)
 
         // Then
         #expect(moduleList.count == 3)
-        #expect(moduleList.last?.name == newModule.name)
+        let isContainNewModule = moduleList
+            .contains { $0.name == newModule.name }
+        #expect(isContainNewModule)
 
         let service = moduleList.last?.resolve() as? Service1
         service?.doSomething()
@@ -34,8 +44,6 @@ extension ModuleListExtensionTest {
         // Given
         let newModule1 = Module(MockServiceKey.self) { Service1() }
         let newModule2 = Module(WeakMockServiceKey.self) { Service2() }
-        var moduleList = ModuleScanner().scanModuleList
-        #expect(moduleList.count == 3)
 
         // When
         moduleList = moduleList.replacing(contentsOf: [newModule1, newModule2])

Tests/DIContainerTests/Tests/ModuleListExtensionTests.swift

@@ -24,6 +24,7 @@ extension MachOLoaderTests {
     }
 }
 
+/**
 class ScannerPerformanceTests: XCTestCase {
     func test_MachOLoader() {
         measure {
@@ -39,3 +40,4 @@ class ScannerPerformanceTests: XCTestCase {
         }
     }
 }
+*/

…tainerTests/Tests/MachOLoaderTests.swift …sts/Tests/Scanner/MachOLoaderTests.swiftTests/DIContainerTests/Tests/MachOLoaderTests.swift renamed to Tests/DIContainerTests/Tests/Scanner/MachOLoaderTests.swift Tests/DIContainerTests/Tests/MachOLoaderTests.swift renamed to Tests/DIContainerTests/Tests/Scanner/MachOLoaderTests.swift

@@ -70,3 +70,28 @@ extension ModuleScannerTest {
         }
     }
 }
+
+extension ModuleScannerTest {
+    @Test
+    func generateNewInstanceFromContainer() throws {
+        Container.autoRegisterModules()
+
+        let _service1 = getMockService()
+        let _service2 = getMockService()
+
+        _service1.doSomething()
+        let service1 = try #require(_service1 as? MockServiceImpl)
+        #expect(service1.count == 1)
+
+        _service2.doSomething()
+        let service2 = try #require(_service2 as? MockServiceImpl)
+        #expect(service2.count == 1)
+
+        #expect((service1 === service2) == false)
+    }
+    
+    func getMockService() -> MockService {
+        @Inject(MockServiceKey.self) var service
+        return service
+    }
+}