added unit tests for Containerable

Author: Hadevs

SwiftInjector/SwiftInjector.xcodeproj/project.pbxproj

@@ -22,6 +22,11 @@
 		E676F73522C9688F00DC1282 /* TestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = E676F73422C9688F00DC1282 /* TestClass.swift */; };
 		E6BF5C6322CD2A32009A9331 /* SILogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BF5C6222CD2A32009A9331 /* SILogger.swift */; };
 		E6BF5C6522CD45C0009A9331 /* RecursiveResolvingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BF5C6422CD45C0009A9331 /* RecursiveResolvingTests.swift */; };
+		E6C8BEFF22CD592300D99B89 /* AutoRecursionContainer_2Parent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6C8BEFE22CD592300D99B89 /* AutoRecursionContainer_2Parent.swift */; };
+		E6F3F57B22D11056003D86FA /* ContainerablePropertyNameTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6F3F57A22D11056003D86FA /* ContainerablePropertyNameTests.swift */; };
+		E6F3F57D22D111CB003D86FA /* ContainerableRegisterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6F3F57C22D111CB003D86FA /* ContainerableRegisterTests.swift */; };
+		E6F3F57F22D11646003D86FA /* ContainerablePropertyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6F3F57E22D11646003D86FA /* ContainerablePropertyTests.swift */; };
+		E6F3F58122D117EE003D86FA /* ContainerableFormattedStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6F3F58022D117EE003D86FA /* ContainerableFormattedStringTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -54,6 +59,11 @@
 		E676F73422C9688F00DC1282 /* TestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestClass.swift; sourceTree = "<group>"; };
 		E6BF5C6222CD2A32009A9331 /* SILogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SILogger.swift; sourceTree = "<group>"; };
 		E6BF5C6422CD45C0009A9331 /* RecursiveResolvingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecursiveResolvingTests.swift; sourceTree = "<group>"; };
+		E6C8BEFE22CD592300D99B89 /* AutoRecursionContainer_2Parent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoRecursionContainer_2Parent.swift; sourceTree = "<group>"; };
+		E6F3F57A22D11056003D86FA /* ContainerablePropertyNameTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerablePropertyNameTests.swift; sourceTree = "<group>"; };
+		E6F3F57C22D111CB003D86FA /* ContainerableRegisterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerableRegisterTests.swift; sourceTree = "<group>"; };
+		E6F3F57E22D11646003D86FA /* ContainerablePropertyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerablePropertyTests.swift; sourceTree = "<group>"; };
+		E6F3F58022D117EE003D86FA /* ContainerableFormattedStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerableFormattedStringTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -112,6 +122,10 @@
 			children = (
 				E676F71A22C94F2E00DC1282 /* SwiftInjectorTests.swift */,
 				E676F72A22C9511200DC1282 /* ContainerableMainTests.swift */,
+				E6F3F57C22D111CB003D86FA /* ContainerableRegisterTests.swift */,
+				E6F3F58022D117EE003D86FA /* ContainerableFormattedStringTests.swift */,
+				E6F3F57E22D11646003D86FA /* ContainerablePropertyTests.swift */,
+				E6F3F57A22D11056003D86FA /* ContainerablePropertyNameTests.swift */,
 				E6BF5C6422CD45C0009A9331 /* RecursiveResolvingTests.swift */,
 				E676F71C22C94F2E00DC1282 /* Info.plist */,
 			);
@@ -124,6 +138,7 @@
 				E676F72622C94F4700DC1282 /* RootContainer.swift */,
 				E6BF5C6222CD2A32009A9331 /* SILogger.swift */,
 				E676F73022C954BB00DC1282 /* TestContainer.swift */,
+				E6C8BEFE22CD592300D99B89 /* AutoRecursionContainer_2Parent.swift */,
 				E676F73222C955B200DC1282 /* DIContainer.swift */,
 				E676F72E22C9548B00DC1282 /* Container.swift */,
 				E676F72822C94F6000DC1282 /* Containerable.swift */,
@@ -232,6 +247,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E6C8BEFF22CD592300D99B89 /* AutoRecursionContainer_2Parent.swift in Sources */,
 				E676F73522C9688F00DC1282 /* TestClass.swift in Sources */,
 				E676F73322C955B200DC1282 /* DIContainer.swift in Sources */,
 				E676F70822C94F2B00DC1282 /* ViewController.swift in Sources */,
@@ -248,9 +264,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E6F3F57F22D11646003D86FA /* ContainerablePropertyTests.swift in Sources */,
 				E6BF5C6522CD45C0009A9331 /* RecursiveResolvingTests.swift in Sources */,
 				E676F72B22C9511200DC1282 /* ContainerableMainTests.swift in Sources */,
+				E6F3F58122D117EE003D86FA /* ContainerableFormattedStringTests.swift in Sources */,
+				E6F3F57D22D111CB003D86FA /* ContainerableRegisterTests.swift in Sources */,
 				E676F71B22C94F2E00DC1282 /* SwiftInjectorTests.swift in Sources */,
+				E6F3F57B22D11056003D86FA /* ContainerablePropertyNameTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SwiftInjector/SwiftInjector/AppDelegate.swift

@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     let newVc: ViewController? = self.container.resolve(name: "123")
     let testClass = newVc?.testClass
-    #error("NOT FINISHED RECURSIVE RESOLVING. BECAUSE AFTER RESOLVING I DONT PASS NAME VARIABLE TO RESOLVE.")
+//    #error("NOT FINISHED RECURSIVE RESOLVING. BECAUSE AFTER RESOLVING I DONT PASS NAME VARIABLE TO RESOLVE.")
     print(testClass)
     return true
   }

SwiftInjector/SwiftInjector/Source/AutoRecursionContainer_2Parent.swift

@@ -0,0 +1,15 @@
+//
+//  AutoRecursionContainer_2Parent.swift
+//  SwiftInjector
+//
+//  Created by Ghost on 04.07.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+import Foundation
+
+class AuthRecursionContainer_2Parent: DIContainer {
+  override func register() {
+
+  }
+}

SwiftInjector/SwiftInjector/Source/Containerable.swift

@@ -122,24 +122,13 @@ extension Containerable {
     }
   }
 
-  private func formattedString<T: Object>(of object: T) -> String {
+  // MARK: *TESTED*
+  func formattedString<T: Object>(of object: T) -> String {
     return String(describing: type(of: object)).replacingOccurrences(of: "Optional<", with: "").replacingOccurrences(of: ">", with: "")
   }
 
-  private func doesObjectHas(object: Object, propertyType: String) -> Bool {
-    let mirror = Mirror(reflecting: object)
-    for attr in mirror.children {
-      let objectType = type(of: attr.value)
-      let typeString = String(describing: objectType).replacingOccurrences(of: "Optional<", with: "").replacingOccurrences(of: ">", with: "")
-      if typeString == typeString {
-        return true
-      }
-    }
-
-    return false
-  }
-
-  private func property<T>(object: Object, propertyName: String) -> T? {
+  // MARK: *TESTED*
+  func property<T>(object: Object, propertyName: String) -> T? {
     let mirror = Mirror(reflecting: object)
     for attr in mirror.children {
       if attr.label == propertyName {
@@ -150,7 +139,9 @@ extension Containerable {
     return nil
   }
 
-  private func propertyName(by typeString: String, in object: Object) -> String? {
+  // MARK: *TESTED*
+  // Returns only first variable of type
+  func propertyName(by typeString: String, in object: Object) -> String? {
     let mirror = Mirror(reflecting: object)
     for attr in mirror.children {
       let propertyType = type(of: attr.value)
@@ -163,8 +154,8 @@ extension Containerable {
     return nil
   }
 
+  // MARK: *TESTED*
   func register<T: Object>(_ registration: @escaping (() -> T), name: String? = nil) {
-
     dispatchRegistrationGroup.enter()
     let object = registration()
     let key = String(describing: type(of: object))

SwiftInjector/SwiftInjector/TestClass.swift

@@ -8,7 +8,11 @@
 
 import Foundation
 
-class TestClass {
+class TestClass: Equatable {
   var name: String = "123"
   weak var viewController: ViewController?
+
+  static func == (lhs: TestClass, rhs: TestClass) -> Bool {
+    return "\(Unmanaged.passUnretained(lhs).toOpaque())" == "\(Unmanaged.passUnretained(rhs).toOpaque())"
+  }
 }

SwiftInjector/SwiftInjectorTests/ContainerableFormattedStringTests.swift

@@ -0,0 +1,36 @@
+//
+//  ContainerableFormattedStringTests.swift
+//  SwiftInjectorTests
+//
+//  Created by Ghost on 06.07.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+import XCTest
+@testable import SwiftInjector
+
+class ContainerableFormattedStringTests: XCTestCase {
+  let container = TestContainer()
+  override func setUp() {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+  }
+
+  override func tearDown() {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+  }
+
+  func testExampleRegister() {
+    let containerable: Containerable = RootContainer()
+    let object = TestClass()
+    let objectTypeString = containerable.formattedString(of: object)
+    XCTAssertEqual(objectTypeString, "TestClass")
+  }
+
+  func testExampleRegisterInvalid() {
+    let containerable: Containerable = RootContainer()
+    let object = TestClass()
+    let objectTypeString = containerable.formattedString(of: object)
+    XCTAssertNotEqual(objectTypeString, "TestClass1")
+  }
+}
+

SwiftInjector/SwiftInjectorTests/ContainerablePropertyNameTests.swift

@@ -0,0 +1,52 @@
+//
+//  ContainerablePropertyName.swift
+//  SwiftInjectorTests
+//
+//  Created by Ghost on 06.07.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+
+import XCTest
+@testable import SwiftInjector
+
+class ContainerablePropertyNameTests: XCTestCase {
+  let container: Containerable = RootContainer()
+
+  override func setUp() {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+  }
+
+  override func tearDown() {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+  }
+
+  func testPropertyNameWithOneString() {
+    class Test {
+      var name: String = "123"
+    }
+    let typeString = "String"
+    let name = container.propertyName(by: typeString, in: Test())
+    XCTAssertEqual(name, "name")
+  }
+
+  func testPropertyNameWithTwoStrings() {
+    class Test {
+      var name: String = "123"
+      var test: String = "456"
+    }
+    let typeString = "String"
+    let name = container.propertyName(by: typeString, in: Test())
+    XCTAssertEqual(name, "name")
+  }
+
+  func testPropertyNameWithTest() {
+    class Test {
+      var test: Test?
+    }
+    let typeString = "Test"
+    let name = container.propertyName(by: typeString, in: Test())
+    XCTAssertEqual(name, "test")
+  }
+}
+

SwiftInjector/SwiftInjectorTests/ContainerablePropertyTests.swift

@@ -0,0 +1,36 @@
+//
+//  ContainerablePropertyTests.swift
+//  SwiftInjectorTests
+//
+//  Created by Ghost on 06.07.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+import XCTest
+@testable import SwiftInjector
+
+class ContainerablePropertyTests: XCTestCase {
+
+  override func setUp() {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+  }
+
+  override func tearDown() {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+  }
+
+  func testPropertyNil() {
+    let container: Containerable = RootContainer()
+    let object = TestClass()
+    let property: String? = container.property(object: object, propertyName: "name1")
+    XCTAssertNil(property)
+  }
+
+  func testPropertyNotNil() {
+    let container: Containerable = RootContainer()
+    let object = TestClass()
+    let property: String? = container.property(object: object, propertyName: "name")
+    XCTAssertNotNil(property)
+    XCTAssertEqual(property, "123")
+  }
+}

SwiftInjector/SwiftInjectorTests/ContainerableRegisterTests.swift

@@ -0,0 +1,57 @@
+//
+//  ContainerableRegister.swift
+//  SwiftInjectorTests
+//
+//  Created by Ghost on 06.07.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+import XCTest
+@testable import SwiftInjector
+
+class ContainerableRegisterTests: XCTestCase {
+
+  override func setUp() {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+  }
+
+  override func tearDown() {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+  }
+
+  func testExampleRegisterWithoutResolving() {
+    let container: Containerable = RootContainer()
+    let object = TestClass()
+    container.register({ () -> TestClass in
+      return object
+    }, name: nil)
+
+    let key = String(describing: type(of: object))
+    XCTAssertNotNil(container.services[key])
+    XCTAssert(container.services[key]?.count ?? 0 == 1)
+
+    let containerObject = container.services[key]?.first
+    XCTAssertNil(containerObject?.object)
+    // it cannot be exists, because it has been not resolved yet
+  }
+
+  func testExampleRegisterWithResolving() {
+    let container: Containerable = RootContainer()
+    let object = TestClass()
+    container.register({ () -> TestClass in
+      return object
+    }, name: nil)
+
+    let key = String(describing: type(of: object))
+    XCTAssertNotNil(container.services[key])
+    XCTAssert(container.services[key]?.count ?? 0 == 1)
+
+    let obj: TestClass? = container.resolve()
+    XCTAssertNotNil(obj)
+    let containerObject = container.services[key]?.first
+    XCTAssertNotNil(containerObject?.object)
+    XCTAssert(containerObject?.object is TestClass)
+    XCTAssertEqual(containerObject?.object as? TestClass, object)
+  }
+}
+

SwiftInjector/SwiftInjectorTests/RecursiveResolvingTests.swift

@@ -39,28 +39,17 @@ class RecursiveResolvingTests: XCTestCase {
     // Put teardown code here. This method is called after the invocation of each test method in the class.
   }
 
+  let container = TestContainer()
 
-  class TestingContainer_1: DIContainer {
-    let firstClass = FirstClass()
-    let secondClass = SecondClass()
-    override func register() {
-      register { self.firstClass }
-      register { self.secondClass }
-    }
-  }
-  let container = TestingContainer_1()
   func testClassToClassRegister() {
-
-    var firstClass: FirstClass? = container.resolve()
-    let secondClass: SecondClass? = container.resolve()
+    let firstClass: ViewController? = container.resolve()
+    let secondClass: TestClass? = container.resolve()
     print("---------")
-    print(firstClass, secondClass?.firstClass)
     print("---------")
     XCTAssertNotNil(firstClass)
     XCTAssertNotNil(secondClass)
-    XCTAssertNotNil(secondClass?.firstClass)
-    XCTAssertEqual(firstClass?.secondClass, secondClass)
-    XCTAssertEqual(secondClass?.firstClass, firstClass)
+    XCTAssertNotNil(secondClass?.viewController)
+    XCTAssertEqual(secondClass?.viewController, firstClass)
+    XCTAssertEqual(firstClass?.testClass, secondClass)
   }
-
 }