Merge pull request #20 from AppCron/get-interactor-for-request

Get interactor for request

Author: Florian Rieger

Sources/ACInteractor/InteractorExecutor.swift

@@ -7,7 +7,7 @@ open class InteractorExecutor {
 
     private var interactors = Dictionary<String, AnyObject>()
 
-    // MARK: Register
+    // MARK: - Register
 
     public func registerInteractor<InteractorProtocol: Interactor, Response>
         (_ interactor: InteractorProtocol, request: InteractorRequest<Response>)
@@ -16,7 +16,7 @@ open class InteractorExecutor {
         interactors[key] = InteractorWrapper(interactor: interactor)
     }
 
-    // MARK: Execute
+    // MARK: - Execute
 
     open func execute<Request: InteractorRequestProtocol>(_ request: Request) {
         let key = String(describing: request)
@@ -35,7 +35,20 @@ open class InteractorExecutor {
         wrapper.execute(request)
     }
 
-    // MARK: Error Handling
+    // MARK: - GetInteractor
+    
+    open func getInteractor<Request: InteractorRequestProtocol>(request: Request) -> AnyObject? {
+        let key = String(describing: request)
+        let optional = interactors[key]
+        
+        guard let wrapper = optional as? InteractorWrapper<Request> else {
+            return nil
+        }
+        
+        return wrapper.wrappedInteractor
+    }
+    
+    // MARK: - Error Handling
 
     private func fireErrorOnRequest(_ request: ErrorRequestProtocol, errorMessage: String) {
         let error = InteractorError(message: errorMessage)

Tests/ACInteractorTests/InteractorErrorTests.swift

@@ -8,7 +8,6 @@ class InteractorErrorTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
 
         testError = NSError(domain: "com.appcron", code: 42, userInfo: [NSLocalizedDescriptionKey: "testMessage"])
 

Tests/ACInteractorTests/InteractorExecutorTests.swift

@@ -14,48 +14,34 @@ class InteractorExecutorTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
 
         firstRequest.onError = { [unowned self] (error: InteractorError) -> Void in
             self.errorMessageFromFirstRequest = error.message
         }
     }
 
-    // MARK: registerInteractor
+    // MARK: - registerInteractor
 
     func testRegisterInteractor_succeeds(){
         // Act
         executor.registerInteractor(firstInteractor, request: firstRequest)
     }
 
-    // MARK: execute
-    
-    func testExecute_withInteractorAndRequest_callsExecuteOnInteractor() {
+    func testRegisterInteractor_callsErrorClosureOnRequest_whenInteractorDoesNotMatchRequest() {
         // Arrange
-        executor.registerInteractor(firstInteractor, request: firstRequest)
+        executor.registerInteractor(secondInteractor, request: firstRequest)
 
         // Act
         executor.execute(firstRequest)
 
         // Assert
-        XCTAssertEqual(firstInteractor.numberOfExceuteCalls, 1)
-        XCTAssert(firstInteractor.executedRequest === firstRequest)
+        let expected = "ACInteractor.ACInteractorExecutor: Request does not match execute function of registered Interactor!"
+        XCTAssertEqual(errorMessageFromFirstRequest, expected)
     }
 
-    func testExecute_withTwoInteractors_executeOnSecond_callsExecuteOnSecondInteractor() {
-        // Arrange
-        executor.registerInteractor(firstInteractor, request: firstRequest)
-        executor.registerInteractor(secondInteractor, request: secondRequest)
-        
-        // Act
-        executor.execute(secondRequest)
-        
-        // Assert
-        XCTAssertEqual(secondInteractor.numberOfExceuteCalls, 1)
-        XCTAssert(secondInteractor.executedRequest === secondRequest)
-    }
+    // MARK: - execute
 
-    func testExecute_withTwoInteractors_executeOnBoth_callsExecuteOnEachInteractor() {
+    func testExecute_callsExecuteOnInteractor_thatIsRegisteredForRequest() {
         // Arrange
         executor.registerInteractor(firstInteractor, request: firstRequest)
         executor.registerInteractor(secondInteractor, request: secondRequest)
@@ -65,14 +51,17 @@ class InteractorExecutorTests: XCTestCase {
         executor.execute(secondRequest)
 
         // Assert
-        XCTAssertEqual(firstInteractor.numberOfExceuteCalls, 1)
-        XCTAssert(firstInteractor.executedRequest === firstRequest)
+        XCTAssertEqual(firstInteractor.executedRequests.count, 1)
+        XCTAssert(firstInteractor.executedRequests.first === firstRequest)
 
-        XCTAssertEqual(secondInteractor.numberOfExceuteCalls, 1)
-        XCTAssert(secondInteractor.executedRequest === secondRequest)
+        XCTAssertEqual(secondInteractor.executedRequests.count, 1)
+        XCTAssert(secondInteractor.executedRequests.first === secondRequest)
     }
 
-    func testExecute_withUnknownRequest_callsErrorOnRequest() {
+    func testExecute_callsErrorOnRequest_whenNoInteractorIsRegisteredForRequest() {
+        // Arrange
+        executor.registerInteractor(secondInteractor, request: secondRequest)
+        
         // Act
         executor.execute(firstRequest)
 
@@ -81,47 +70,28 @@ class InteractorExecutorTests: XCTestCase {
         XCTAssertEqual(errorMessageFromFirstRequest, expected)
     }
 
-    func testExecute_withMismatchRequest_callsErrorOnRequest() {
+    // MARK: - getInteractor
+    
+    func testGetInteractor_returnsInteractor_registeredForRequest() {
         // Arrange
-        executor.registerInteractor(secondInteractor, request: firstRequest)
+        executor.registerInteractor(firstInteractor, request: firstRequest)
+        executor.registerInteractor(secondInteractor, request: secondRequest)
 
         // Act
-        executor.execute(firstRequest)
+        let firstResult = executor.getInteractor(request: firstRequest)
+        let secondResult = executor.getInteractor(request: secondRequest)
 
         // Assert
-        let expected = "ACInteractor.ACInteractorExecutor: Request does not match execute function of registered Interactor!"
-        XCTAssertEqual(errorMessageFromFirstRequest, expected)
+        XCTAssert(firstResult === firstInteractor)
+        XCTAssert(secondResult === secondInteractor)
     }
 
-    
-    // MARK: Test Interactors
-    
-   class FirstInteractor: Interactor {
-        var numberOfExceuteCalls = 0
-        var executedRequest: Request?
-        
-        class Request: InteractorRequest<NSString> {
-        }
-        
-    func execute(_ request: Request) {
-        numberOfExceuteCalls += 1
-        executedRequest = request
-        }
-    }
-    
-    class SecondInteractor: Interactor {
-        var numberOfExceuteCalls = 0
-        var executedRequest: Request?
-        
-        class Request: InteractorRequest<NSString> {
-        }
+    func testGetInteractor_returnsNil_whenNoInteractorIsRegisteredForRequest() {
+        // Act
+        let result = executor.getInteractor(request: firstRequest)
 
-        func execute(_ request: Request) {
-            numberOfExceuteCalls += 1
-            executedRequest = request
-        }
+        // Assert
+        XCTAssertNil(result)
     }
 
 }
-
-

Tests/ACInteractorTests/LazyInteractorTests.swift

@@ -9,8 +9,6 @@ class LazyInteractorTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-        
         lazyInteractor = LazyInteractor(factory: testFactory)
     }
 
@@ -56,36 +54,8 @@ class LazyInteractorTests: XCTestCase {
 
         // Assert
         let interactor = lazyInteractor.getInteractor()
-        XCTAssertEqual(interactor.numberOfExceuteCalls, 1)
-        XCTAssert(interactor.executedRequest === request)
+        XCTAssertEqual(interactor.executedRequests.count, 1)
+        XCTAssert(interactor.executedRequests.first === request)
     }
 
-    // MARK: Test Interactor
-    
-    class TestInteractor: Interactor {
-        let dependency: String
-        var numberOfExceuteCalls = 0
-        var executedRequest: Request?
-        
-        var handledErrorRequest: ErrorRequestProtocol?
-        var handledError: Error?
-        
-        init(dependency: String) {
-            self.dependency = dependency
-        }
-    
-        class Request: InteractorRequest<NSString> {
-        }
-    
-        func execute(_ request: Request) {
-            numberOfExceuteCalls += 1
-            executedRequest = request
-        }
-        
-        func handleError(_ request: ErrorRequestProtocol, error: Error) {
-            handledErrorRequest = request
-            handledError = error
-        }
-    }
-
 }

Tests/ACInteractorTests/TestInteractors.swift

@@ -0,0 +1,48 @@
+import Foundation
+@testable import ACInteractor
+
+class TestInteractor: Interactor {
+    
+    class Request: InteractorRequest<String> {
+    }
+    
+    let dependency: String
+    private(set) var executedRequests = [Request]()
+    
+    init(dependency: String) {
+        self.dependency = dependency
+    }
+    
+    func execute(_ request: Request) {
+        executedRequests.append(request)
+    }
+    
+}
+
+
+class FirstInteractor: Interactor {
+    
+    var executedRequests = [Request]()
+    
+    class Request: InteractorRequest<NSString> {
+    }
+    
+    func execute(_ request: Request) {
+        executedRequests.append(request)
+    }
+    
+}
+
+
+class SecondInteractor: Interactor {
+    
+    var executedRequests = [Request]()
+    
+    class Request: InteractorRequest<NSString> {
+    }
+    
+    func execute(_ request: Request) {
+        executedRequests.append(request)
+    }
+    
+}