Fixed tests

Capture the geocoder until after the completion handler is executed. These failures suggest that MBGeocoder had been leaking all this time until it was refactored to use NSURLSession instead of NSURLConnection.

Author: 1ec5

MapboxGeocoder/MBGeocoder.swift

@@ -22,7 +22,7 @@ public class MBGeocoder: NSObject {
 
     private var task: NSURLSessionDataTask?
 
-    internal var errorForSimultaneousRequests: NSError {
+    private var errorForSimultaneousRequests: NSError {
         let userInfo = [
             NSLocalizedFailureReasonErrorKey: "Cannot geocode on an MBGeocoder object that is already geocoding.",
         ]
@@ -59,7 +59,7 @@ public class MBGeocoder: NSObject {
 
 //    public func geocodeAddressString(addressString: String, inRegion region: CLRegion, completionHandler: MBGeocodeCompletionHandler)
 
-    internal func taskWithRouter(router: MBGeocoderRouter, completionHandler completion: MBGeocodeCompletionHandler) -> NSURLSessionDataTask? {
+    private func taskWithRouter(router: MBGeocoderRouter, completionHandler completion: MBGeocodeCompletionHandler) -> NSURLSessionDataTask? {
         return router.loadJSON(JSON.self) { [weak self] (json, error) in
             guard let dataTaskSelf = self where dataTaskSelf.task?.state == .Completed
                 else {

MapboxGeocoderTests/ReverseGeocodingTests.swift

@@ -38,7 +38,8 @@ class ReverseGeocodingTests: XCTestCase {
             return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: nil)
         }
 
-        MBGeocoder(accessToken: accessToken).reverseGeocodeLocation(
+        let geocoder = MBGeocoder(accessToken: accessToken)
+        geocoder.reverseGeocodeLocation(
           CLLocation(latitude: 37.13284000, longitude: -95.78558000)) { (placemarks, error) in
             if let result = placemarks?.first where placemarks?.count > 0 {
                 resultsExpectation.fulfill()
@@ -102,7 +103,10 @@ class ReverseGeocodingTests: XCTestCase {
             }
         }
 
-        waitForExpectationsWithTimeout(1, handler: nil)
+        waitForExpectationsWithTimeout(1) { (error) in
+            XCTAssertNil(error, "Error: \(error)")
+            XCTAssertFalse(geocoder.geocoding)
+        }
     }
 
     func testInvalidReverseGeocode() {
@@ -113,12 +117,16 @@ class ReverseGeocodingTests: XCTestCase {
             return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: nil)
         }
 
-        MBGeocoder(accessToken: accessToken).reverseGeocodeLocation(CLLocation(latitude: 0, longitude: 0)) { (placemarks, error) in
+        let geocoder = MBGeocoder(accessToken: accessToken)
+        geocoder.reverseGeocodeLocation(CLLocation(latitude: 0, longitude: 0)) { (placemarks, error) in
             if placemarks?.count == 0 {
                 resultsExpection.fulfill()
             }
         }
 
-        waitForExpectationsWithTimeout(1, handler: nil)
+        waitForExpectationsWithTimeout(1) { (error) in
+            XCTAssertNil(error, "Error: \(error)")
+            XCTAssertFalse(geocoder.geocoding)
+        }
     }
 }