cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Lukas Schmidt 2015-07-28 16:15:12 +02:00
parent 30cf2bb67a
commit 79848b1ce0
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SocketIO-iOSTests/SocketAcknowledgementTest.swift
View File

@ -71,6 +71,19 @@ class SocketAcknowledgementTest: SocketEmitTest {
super.testMultipleItemsEmit() super.testMultipleItemsEmit()
} }
override func abstractSocketMultipleEmit(testName:String, emitData:Array<AnyObject>, callback:NormalCallback){
let finalTestname = generateTestName(testName)
let expection = self.expectationWithDescription(finalTestname)
func didGetEmit(result:NSArray?) {
callback(result, nil)
expection.fulfill()
}
socket.emitWithAck(finalTestname, withItems: emitData)(timeoutAfter: 5, callback: didGetEmit)
waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
}
override func abstractSocketEmit(testName:String, emitData:AnyObject?, callback:NormalCallback){ override func abstractSocketEmit(testName:String, emitData:AnyObject?, callback:NormalCallback){
let finalTestname = testName + testKind.rawValue let finalTestname = testName + testKind.rawValue
let expection = self.expectationWithDescription(finalTestname) let expection = self.expectationWithDescription(finalTestname)

5
SocketIO-iOSTests/SocketEmitTest.swift
View File

@ -10,7 +10,7 @@ import XCTest
import Foundation import Foundation
class SocketEmitTest: XCTestCase { class SocketEmitTest: XCTestCase {
static let TEST_TIMEOUT = 5.0 static let TEST_TIMEOUT = 15.0
var socket:SocketIOClient! var socket:SocketIOClient!
let headers = ["testing": "blah", "testing2": "b/:lah"] let headers = ["testing": "blah", "testing2": "b/:lah"]
var testKind = TestKind.Emit var testKind = TestKind.Emit
@ -185,8 +185,7 @@ class SocketEmitTest: XCTestCase {
XCTAssertEqual(result!.count, 5) XCTAssertEqual(result!.count, 5)
if let array = result?.firstObject as? Array<AnyObject> { if let array = result?.firstObject as? Array<AnyObject> {
XCTAssertEqual(array.last! as! Int, 2) XCTAssertEqual(array.last! as! Int, 2)
let string = NSString(data: array.first! as! NSData, encoding: NSUTF8StringEncoding)! XCTAssertEqual(array.first! as! Int, 1)
XCTAssertEqual(string, "gakgakgak2")
}else { }else {
XCTFail("Should have Array as result") XCTFail("Should have Array as result")
} }

22
SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
View File

@ -8,7 +8,7 @@
import XCTest import XCTest
class SocketNamespaceAcknowledgementTest: SocketEmitTest { class SocketNamespaceAcknowledgementTest: SocketAcknowledgementTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
@ -72,24 +72,4 @@ class SocketNamespaceAcknowledgementTest: SocketEmitTest {
override func testMultipleItemsEmit() { override func testMultipleItemsEmit() {
super.testMultipleItemsEmit() super.testMultipleItemsEmit()
} }
override func abstractSocketEmit(testName:String, emitData:AnyObject?, callback:NormalCallback){
let finalTestname = testName + testKind.rawValue
let expection = self.expectationWithDescription(finalTestname)
func didGetEmit(result:NSArray?) {
callback(result, nil)
expection.fulfill()
}
var ack:OnAckCallback!
if let emitData = emitData {
ack = socket.emitWithAck(finalTestname, emitData)
} else {
ack = socket.emitWithAck(finalTestname)
}
ack(timeoutAfter: 20, callback: didGetEmit)
waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
}
} }