Merge branch 'swift5-tests-fix'

Author: reloni

RxHttpClient/RequestPlugin/ActivityIndicatorPlugin.swift

@@ -21,6 +21,11 @@ public final class NetworkActivityIndicatorPlugin : RequestPluginType {
 
 	var counter = 0 {
 		didSet {
+            guard !Thread.isMainThread else {
+                application.isNetworkActivityIndicatorVisible = counter != 0
+                return
+            }
+            
 			DispatchQueue.main.async {
 				self.application.isNetworkActivityIndicatorVisible = self.counter != 0
 			}

RxHttpClientTests/Fake.swift

@@ -30,9 +30,9 @@ class FakeDataTask : NSObject, URLSessionDataTaskType {
 
 	open func cancel() {
 		if !isCancelled {
+            state = .suspended
+            isCancelled = true
 			cancelClosure?(self)
-			state = .suspended
-			isCancelled = true
 		}
 	}
 }

RxHttpClientTests/HttpClientBasicTests.swift

@@ -26,21 +26,21 @@ class HttpClientBasicTests: XCTestCase {
 	func testTerminateRequest() {
 		let fakeSession = FakeSession()
 		let cancelExpectation = expectation(description: "Should cancel task")
+        cancelExpectation.assertForOverFulfill = false
 		let resumeExpectation = expectation(description: "Should start task")
 		fakeSession.task = FakeDataTask(resumeClosure: { _ in resumeExpectation.fulfill() }, cancelClosure: { _ in cancelExpectation.fulfill() })
 		let client = HttpClient(session: fakeSession)
 		let url = URL(baseUrl: "https://test.com/json", parameters: nil)!
+        
 		let disposable = client.requestData(url: url)
 			.do(
 				onNext: { e in
 				XCTFail("Should not receive responce")
 			},
 				onCompleted: { XCTFail("Should not complete task") })
 			.subscribe()
-		
-		XCTAssertEqual(false, fakeSession.task?.isCancelled)
-		
-		DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { disposable.dispose() }
+				
+		DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { disposable.dispose() }
 
 		let waitResult = XCTWaiter().wait(for: [resumeExpectation, cancelExpectation], timeout: waitTimeout, enforceOrder: true)