From 1a38e7d4867a3f57ed1cbc5eb8597d462af5369b Mon Sep 17 00:00:00 2001 From: Thibault Deutsch Date: Thu, 9 Apr 2015 04:14:43 +0300 Subject: [PATCH] Convert to Swift 1.2 --- Source/Client.swift | 20 +++++----- Source/Index.swift | 4 +- Source/Network.swift | 2 +- Source/Query.swift | 2 +- Tests/ClientTests.swift | 64 +++++++++++++++--------------- Tests/IndexTests.swift | 88 ++++++++++++++++++++--------------------- 6 files changed, 90 insertions(+), 90 deletions(-) diff --git a/Source/Client.swift b/Source/Client.swift index 342cc8b9e..ec25fcd95 100644 --- a/Source/Client.swift +++ b/Source/Client.swift @@ -63,8 +63,8 @@ public class Client { } public let appID: String - public let hostnames: [String] + private var hostnames: [String] private let manager: Manager private var requestBuffer = RingBuffer(maxCapacity: 10) @@ -78,9 +78,9 @@ public class Client { /// :param: tagFilters value of the header X-Algolia-TagFilters /// :param: userToken value of the header X-Algolia-UserToken public init(appID: String, apiKey: String, hostnames: [String]? = nil, dsn: Bool = false, dsnHost: String? = nil, tagFilters: String? = nil, userToken: String? = nil) { - if countElements(appID) == 0 { + if count(appID) == 0 { NSException(name: "InvalidArgument", reason: "Application ID must be set", userInfo: nil).raise() - } else if countElements(apiKey) == 0 { + } else if count(apiKey) == 0 { NSException(name: "InvalidArgument", reason: "APIKey must be set", userInfo: nil).raise() } @@ -108,7 +108,7 @@ public class Client { } } - let version = NSBundle(identifier: "com.algolia.AlgoliaSearch")!.infoDictionary!["CFBundleShortVersionString"] as String + let version = NSBundle(identifier: "com.algolia.AlgoliaSearch")!.infoDictionary!["CFBundleShortVersionString"] as! String var HTTPHeaders = [ "X-Algolia-API-Key": self.apiKey, "X-Algolia-Application-Id": self.appID, @@ -336,8 +336,8 @@ public class Client { for query in queries { if let query = query as? [String: AnyObject] { convertedQueries.append([ - "params": (query["query"] as Query).buildURL(), - "indexName": query["indexName"] as String + "params": (query["query"] as! Query).buildURL(), + "indexName": query["indexName"] as! String ]) } } @@ -357,16 +357,16 @@ public class Client { if let block = block { switch(statusCode) { case 200, 201: - block(JSON: (data as [String: AnyObject]), error: nil) + block(JSON: (data as! [String: AnyObject]), error: nil) case 400: - let errorMessage = data!["message"] as String + let errorMessage = data!["message"] as! String block(JSON: nil, error: NSError(domain: "Bad request argument: \(errorMessage)", code: 400, userInfo: nil)) case 403: block(JSON: nil, error: NSError(domain: "Invalid Application-ID or API-Key", code: 403, userInfo: nil)) case 404: block(JSON: nil, error: NSError(domain: "Resource does not exist", code: 404, userInfo: nil)) default: - if let errorMessage = (data as [String: String])["message"] { + if let errorMessage = (data as! [String: String])["message"] { block(JSON: nil, error: NSError(domain: errorMessage, code: 0, userInfo: nil)) } else { block(JSON: nil, error: NSError(domain: "No error message", code: 0, userInfo: nil)) @@ -388,7 +388,7 @@ public class Client { /// Cancel a queries. Only the last ten queries can be cancelled. func cancelQueries(method: HTTPMethod, path: String) { for request in requestBuffer { - if request.request.URL.path == path { + if request.request.URL!.path! == path { if request.request.HTTPMethod == method.rawValue { request.cancel() } diff --git a/Source/Index.swift b/Source/Index.swift index 2f86fce65..f5c493c36 100644 --- a/Source/Index.swift +++ b/Source/Index.swift @@ -148,7 +148,7 @@ public class Index { if let object = object as? [String: AnyObject] { requests.append([ "action": "partialUpdateObject", - "objectID": object["objectID"] as String, + "objectID": object["objectID"] as! String, "body": object ]) } @@ -180,7 +180,7 @@ public class Index { if let object = object as? [String: AnyObject] { requests.append([ "action": "updateObject", - "objectID": object["objectID"] as String, + "objectID": object["objectID"] as! String, "body": object ]) } diff --git a/Source/Network.swift b/Source/Network.swift index b3955ab37..297f5fc07 100644 --- a/Source/Network.swift +++ b/Source/Network.swift @@ -72,7 +72,7 @@ class Manager { return URLRequest } - var mutableURLRequest: NSMutableURLRequest! = URLRequest.mutableCopy() as NSMutableURLRequest + var mutableURLRequest: NSMutableURLRequest! = URLRequest.mutableCopy() as! NSMutableURLRequest var error: NSError? = nil if let data = NSJSONSerialization.dataWithJSONObject(parameters!, options: .allZeros, error: &error) { diff --git a/Source/Query.swift b/Source/Query.swift index 1ab7293c1..4ec4c652b 100644 --- a/Source/Query.swift +++ b/Source/Query.swift @@ -249,7 +249,7 @@ public class Query : Printable { var error: NSError? let data = NSJSONSerialization.dataWithJSONObject(facetFilters, options: .PrettyPrinted, error: &error) if error == nil { - let json: String = NSString(data: data!, encoding: NSUTF8StringEncoding)! + let json: String = NSString(data: data!, encoding: NSUTF8StringEncoding)! as String url.append(Query.encodeForQuery(json, withKey: "facetFilters")) } else { NSException(name: "InvalidArgument", reason: "Invalid facetFilters (should be an array of string)", userInfo: nil).raise() diff --git a/Tests/ClientTests.swift b/Tests/ClientTests.swift index baaa37364..6f334e43f 100644 --- a/Tests/ClientTests.swift +++ b/Tests/ClientTests.swift @@ -32,8 +32,8 @@ class ClientTests: XCTestCase { override func setUp() { super.setUp() - let appID = NSProcessInfo.processInfo().environment["ALGOLIA_APPLICATION_ID"] as String - let apiKey = NSProcessInfo.processInfo().environment["ALGOLIA_API_KEY"] as String + let appID = NSProcessInfo.processInfo().environment["ALGOLIA_APPLICATION_ID"] as! String + let apiKey = NSProcessInfo.processInfo().environment["ALGOLIA_API_KEY"] as! String client = AlgoliaSearch.Client(appID: appID, apiKey: apiKey) index = client.getIndex("algol?à-swift") @@ -67,7 +67,7 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -76,11 +76,11 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during listIndexes: \(error)") } else { - let items = JSON!["items"] as [[String: AnyObject]] + let items = JSON!["items"] as! [[String: AnyObject]] var found = false for item in items { - if (item["name"] as String) == self.index.indexName { + if (item["name"] as! String) == self.index.indexName { found = true break } @@ -108,19 +108,19 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expecation.fulfill() } else { - XCTAssertEqual(JSON!["status"] as String, "published", "Wait task failed") + XCTAssertEqual(JSON!["status"] as! String, "published", "Wait task failed") self.client.moveIndex(self.index.indexName, to: "algol?à-swift2", block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during moveIndex: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expecation.fulfill() @@ -130,7 +130,7 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 1, "Wrong number of object in the index") } @@ -168,19 +168,19 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expecation.fulfill() } else { - XCTAssertEqual(JSON!["status"] as String, "published", "Wait task failed") + XCTAssertEqual(JSON!["status"] as! String, "published", "Wait task failed") self.client.copyIndex(self.index.indexName, to: "algol?à-swift2", block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during copyIndex: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") } else { @@ -188,7 +188,7 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 1, "Wrong number of object in the index") } @@ -200,7 +200,7 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 1, "Wrong number of object in the index") } @@ -237,7 +237,7 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expecation.fulfill() @@ -246,7 +246,7 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during getLogs: \(error)") } else { - let logs = JSON!["logs"] as [AnyObject] + let logs = JSON!["logs"] as! [AnyObject] XCTAssertNotEqual(logs.count, 0, "Get logs failed") } @@ -269,7 +269,7 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expecation.fulfill() @@ -278,7 +278,7 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during getLogs: \(error)") } else { - let logs = JSON!["logs"] as [AnyObject] + let logs = JSON!["logs"] as! [AnyObject] XCTAssertEqual(logs.count, 1, "Get logs failed") } @@ -301,7 +301,7 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expecation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expecation.fulfill() @@ -310,7 +310,7 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during getLogs: \(error)") } else { - let logs = JSON!["logs"] as [AnyObject] + let logs = JSON!["logs"] as! [AnyObject] XCTAssertEqual(logs.count, 1, "Get logs failed") } @@ -333,7 +333,7 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -344,8 +344,8 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during multipleQueries: \(error)") } else { - let items = JSON!["results"] as [[String: AnyObject]] - let nbHits = items[0]["nbHits"] as Int + let items = JSON!["results"] as! [[String: AnyObject]] + let nbHits = items[0]["nbHits"] as! Int XCTAssertEqual(nbHits, 1, "Wrong number of object in the index") } @@ -368,7 +368,7 @@ class ClientTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -379,29 +379,29 @@ class ClientTests: XCTestCase { expectation.fulfill() } else { NSThread.sleepForTimeInterval(5) // Wait the backend - self.client.getUserKeyACL(JSON!["key"] as String, block: { (JSON, error) -> Void in + self.client.getUserKeyACL(JSON!["key"] as! String, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during getUserKeyACL: \(error)") expectation.fulfill() } else { - let acls = JSON!["acl"] as [String] + let acls = JSON!["acl"] as! [String] XCTAssertEqual(acls, ["search"], "Add user key failed") - self.client.updateUserKey(JSON!["value"] as String, withACL: ["addObject"], block: { (JSON, error) -> Void in + self.client.updateUserKey(JSON!["value"] as! String, withACL: ["addObject"], block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during updateUserKey: \(error)") expectation.fulfill() } else { NSThread.sleepForTimeInterval(5) // Wait the backend - self.client.getUserKeyACL(JSON!["key"] as String, block: { (JSON, error) -> Void in + self.client.getUserKeyACL(JSON!["key"] as! String, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during getUserKeyACL: \(error)") expectation.fulfill() } else { - let acls = JSON!["acl"] as [String] + let acls = JSON!["acl"] as! [String] XCTAssertEqual(acls, ["addObject"], "Update user key failed") - let keyToDelete = JSON!["value"] as String + let keyToDelete = JSON!["value"] as! String self.client.deleteUserKey(keyToDelete, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during deleteUserKey: \(error)") @@ -412,11 +412,11 @@ class ClientTests: XCTestCase { if let error = error { XCTFail("Error during listUserKeys: \(error)") } else { - let keys = JSON!["keys"] as [[String: AnyObject]] + let keys = JSON!["keys"] as! [[String: AnyObject]] var found = false for key in keys { - if (key["value"] as String) == keyToDelete { + if (key["value"] as! String) == keyToDelete { found = true break; } diff --git a/Tests/IndexTests.swift b/Tests/IndexTests.swift index 211f3f4c6..09693ce08 100644 --- a/Tests/IndexTests.swift +++ b/Tests/IndexTests.swift @@ -32,8 +32,8 @@ class IndexTests: XCTestCase { override func setUp() { super.setUp() - let appID = NSProcessInfo.processInfo().environment["ALGOLIA_APPLICATION_ID"] as String - let apiKey = NSProcessInfo.processInfo().environment["ALGOLIA_API_KEY"] as String + let appID = NSProcessInfo.processInfo().environment["ALGOLIA_APPLICATION_ID"] as! String + let apiKey = NSProcessInfo.processInfo().environment["ALGOLIA_API_KEY"] as! String client = AlgoliaSearch.Client(appID: appID, apiKey: apiKey) index = client.getIndex("algol?à-swift") @@ -67,7 +67,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -76,7 +76,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 1, "Wrong number of object in the index") } @@ -100,7 +100,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -109,7 +109,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObject: \(error)") } else { - let city = JSON!["city"] as String + let city = JSON!["city"] as! String XCTAssertEqual(city, object["city"]!, "Get object return a bad object") } @@ -135,7 +135,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObjects: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -144,7 +144,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 2, "Wrong number of object in the index") } @@ -167,11 +167,11 @@ class IndexTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") } else { - XCTAssertEqual(JSON!["status"] as String, "published", "Wait task failed") + XCTAssertEqual(JSON!["status"] as! String, "published", "Wait task failed") } expectation.fulfill() @@ -196,7 +196,7 @@ class IndexTests: XCTestCase { XCTFail("Error during deleteObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -205,7 +205,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 0, "Wrong number of object in the index") } @@ -238,7 +238,7 @@ class IndexTests: XCTestCase { XCTFail("Error during deleteObjects: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -247,7 +247,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 0, "Wrong number of object in the index") } @@ -272,7 +272,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -281,7 +281,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObject: \(error)") } else { - let city = JSON!["city"] as String + let city = JSON!["city"] as! String XCTAssertEqual(city, object["city"]!, "Get object return a bad object") } @@ -307,7 +307,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObjetcs: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -316,7 +316,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObjects: \(error)") } else { - let items = JSON!["results"] as [[String: String]] + let items = JSON!["results"] as! [[String: String]] XCTAssertEqual(items[0]["city"]!, objects[0]["city"]!, "GetObjects return the wrong object") XCTAssertEqual(items[1]["city"]!, objects[1]["city"]!, "GetObjects return the wrong object") } @@ -345,7 +345,7 @@ class IndexTests: XCTestCase { XCTFail("Error during partialUpdateObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -354,8 +354,8 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObject: \(error)") } else { - let city = JSON!["city"] as String - let initial = JSON!["initial"] as String + let city = JSON!["city"] as! String + let initial = JSON!["initial"] as! String XCTAssertEqual(city, "Los Angeles", "Partial update is not applied") XCTAssertEqual(initial, "NY", "Partial update failed") } @@ -393,7 +393,7 @@ class IndexTests: XCTestCase { XCTFail("Error during partialUpdateObjects: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -402,7 +402,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObjects: \(error)") } else { - let items = JSON!["results"] as [[String: String]] + let items = JSON!["results"] as! [[String: String]] XCTAssertEqual(items[0]["city"]!, "Paris", "partialUpdateObjects failed") XCTAssertEqual(items[0]["initial"]!, "SF", "partialUpdateObjects failed") XCTAssertEqual(items[1]["city"]!, "Strasbourg", "partialUpdateObjects failed") @@ -435,7 +435,7 @@ class IndexTests: XCTestCase { XCTFail("Error during saveObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -444,7 +444,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObject: \(error)") } else { - let city = JSON!["city"] as String + let city = JSON!["city"] as! String let initial: AnyObject? = JSON!["initial"] XCTAssertEqual(city, "Los Angeles", "Save object is not applied") XCTAssertNil(initial, "Save object failed") @@ -483,7 +483,7 @@ class IndexTests: XCTestCase { XCTFail("Error during saveObjects: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -492,7 +492,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getObjects: \(error)") } else { - let items = JSON!["results"] as [[String: String]] + let items = JSON!["results"] as! [[String: String]] XCTAssertEqual(items[0]["city"]!, "Paris", "saveObjects failed") XCTAssertNil(items[0]["initial"], "saveObjects failed") XCTAssertEqual(items[1]["city"]!, "Strasbourg", "saveObjects failed") @@ -525,7 +525,7 @@ class IndexTests: XCTestCase { XCTFail("Error during clearIndex: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -534,7 +534,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during search: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 0, "Clear index failed") } @@ -559,7 +559,7 @@ class IndexTests: XCTestCase { XCTFail("Error during setSettings: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -568,7 +568,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during getSettings: \(error)") } else { - let attributesToRetrieve = JSON!["attributesToRetrieve"] as [String] + let attributesToRetrieve = JSON!["attributesToRetrieve"] as! [String] XCTAssertEqual(attributesToRetrieve, settings["attributesToRetrieve"]!, "Set settings failed") } @@ -591,7 +591,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -600,7 +600,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during browse: \(error)") } else { - let nbHits = JSON!["nbHits"] as Int + let nbHits = JSON!["nbHits"] as! Int XCTAssertEqual(nbHits, 1, "Wrong number of object in the index") } @@ -626,7 +626,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObjects: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -635,7 +635,7 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during browse: \(error)") } else { - let nbPages = JSON!["nbPages"] as Int + let nbPages = JSON!["nbPages"] as! Int XCTAssertEqual(nbPages, 2, "Wrong number of page") } @@ -658,7 +658,7 @@ class IndexTests: XCTestCase { XCTFail("Error during addObject: \(error)") expectation.fulfill() } else { - self.index.waitTask(JSON!["taskID"] as Int, block: { (JSON, error) -> Void in + self.index.waitTask(JSON!["taskID"] as! Int, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during waitTask: \(error)") expectation.fulfill() @@ -669,29 +669,29 @@ class IndexTests: XCTestCase { expectation.fulfill() } else { NSThread.sleepForTimeInterval(5) // Wait the backend - self.index.getUserKeyACL(JSON!["key"] as String, block: { (JSON, error) -> Void in + self.index.getUserKeyACL(JSON!["key"] as! String, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during getUserKeyACL: \(error)") expectation.fulfill() } else { - let acls = JSON!["acl"] as [String] + let acls = JSON!["acl"] as! [String] XCTAssertEqual(acls, ["search"], "Add user key failed") - self.index.updateUserKey(JSON!["value"] as String, withACL: ["addObject"], block: { (JSON, error) -> Void in + self.index.updateUserKey(JSON!["value"] as! String, withACL: ["addObject"], block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during updateUserKey: \(error)") expectation.fulfill() } else { NSThread.sleepForTimeInterval(5) // Wait the backend - self.index.getUserKeyACL(JSON!["key"] as String, block: { (JSON, error) -> Void in + self.index.getUserKeyACL(JSON!["key"] as! String, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during getUserKeyACL: \(error)") expectation.fulfill() } else { - let acls = JSON!["acl"] as [String] + let acls = JSON!["acl"] as! [String] XCTAssertEqual(acls, ["addObject"], "Update user key failed") - let keyToDelete = JSON!["value"] as String + let keyToDelete = JSON!["value"] as! String self.index.deleteUserKey(keyToDelete, block: { (JSON, error) -> Void in if let error = error { XCTFail("Error during deleteUserKey: \(error)") @@ -702,11 +702,11 @@ class IndexTests: XCTestCase { if let error = error { XCTFail("Error during listUserKeys: \(error)") } else { - let keys = JSON!["keys"] as [[String: AnyObject]] + let keys = JSON!["keys"] as! [[String: AnyObject]] var found = false for key in keys { - if (key["value"] as String) == keyToDelete { + if (key["value"] as! String) == keyToDelete { found = true break; }