update tests

Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
This commit is contained in:
Lukas Schmidt 2015-08-10 06:33:32 +02:00
parent 145448c087
commit 84bb6b7dad
2 changed files with 5 additions and 7 deletions

View File

@ -20,11 +20,12 @@ class AbstractSocketTest: XCTestCase {
func openConnection() { func openConnection() {
let expection = self.expectationWithDescription("connect") let expection = self.expectationWithDescription("connect")
XCTAssertTrue(socket.status == SocketIOClientStatus.NotConnected)
socket.on("connect") {data, ack in socket.on("connect") {data, ack in
expection.fulfill() expection.fulfill()
} }
socket.connect() socket.connect()
XCTAssertTrue(socket.connecting) XCTAssertEqual(socket.status, SocketIOClientStatus.Connecting)
waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil) waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
} }
@ -33,10 +34,7 @@ class AbstractSocketTest: XCTestCase {
} }
func checkConnectionStatus() { func checkConnectionStatus() {
XCTAssertTrue(socket.connected) XCTAssertEqual(socket.status, SocketIOClientStatus.Connected)
XCTAssertFalse(socket.connecting)
XCTAssertFalse(socket.reconnecting)
XCTAssertFalse(socket.closed)
XCTAssertFalse(socket.secure) XCTAssertFalse(socket.secure)
} }

View File

@ -52,8 +52,8 @@ class SocketTestCases: NSObject {
func didGetResult(result:NSArray?, ack:AckEmitter?) { func didGetResult(result:NSArray?, ack:AckEmitter?) {
if let array = result?.firstObject as? NSArray { if let array = result?.firstObject as? NSArray {
XCTAssertEqual(array.count, 2) XCTAssertEqual(array.count, 2)
XCTAssertEqual(array.firstObject! as! String, "test3") XCTAssertEqual((array.firstObject! as! String), "test3")
XCTAssertEqual(array.lastObject! as! String, "test4") XCTAssertEqual((array.lastObject! as! String), "test4")
}else { }else {
XCTFail("Should have NSArray as result") XCTFail("Should have NSArray as result")
} }