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

Merge pull request #158 from lightsprint09/fix-travis-ci-tests

Browse Source 
Fix travis ci tests
This commit is contained in:
Erik Little 2015-09-03 11:59:08 -04:00
commit 0dc4f863f3
5 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
SocketIO-iOSTests/AbstractSocketTest.swift
View File

@ -1,6 +1,6 @@
// //
// AbstractSocketTest.swift // AbstractSocketTest.swift
// Socket.IO-Client-Swift // AbstractSocketTest.socket.IO-Client-Swift
// //
// Created by Lukas Schmidt on 02.08.15. // Created by Lukas Schmidt on 02.08.15.
// //
@ -9,23 +9,25 @@
import XCTest import XCTest
class AbstractSocketTest: XCTestCase { class AbstractSocketTest: XCTestCase {
static let serverURL = "milkbartube.com:6979"
static let TEST_TIMEOUT = 8.0 static let TEST_TIMEOUT = 8.0
var socket:SocketIOClient! static var socket:SocketIOClient!
var testKind:TestKind? var testKind:TestKind?
override func tearDown() {
super.tearDown()
socket.close(fast: false)
}
func openConnection() { func openConnection() {
let expection = self.expectationWithDescription("connect") guard AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected else {return}
XCTAssertTrue(socket.status == SocketIOClientStatus.NotConnected)
socket.on("connect") {data, ack in weak var expection = self.expectationWithDescription("connect")
expection.fulfill() XCTAssertTrue(AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected)
AbstractSocketTest.socket.on("connect") {data, ack in
XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connected)
if let expection = expection {
expection.fulfill()
}
} }
socket.connect() AbstractSocketTest.socket.connect()
XCTAssertEqual(socket.status, SocketIOClientStatus.Connecting) XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connecting)
waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil) waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
} }
@ -34,8 +36,8 @@ class AbstractSocketTest: XCTestCase {
} }
func checkConnectionStatus() { func checkConnectionStatus() {
XCTAssertEqual(socket.status, SocketIOClientStatus.Connected) XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connected)
XCTAssertFalse(socket.secure) XCTAssertFalse(AbstractSocketTest.socket.secure)
} }
func socketMultipleEmit(testName:String, emitData:Array<AnyObject>, callback:NormalCallback){ func socketMultipleEmit(testName:String, emitData:Array<AnyObject>, callback:NormalCallback){
@ -48,8 +50,8 @@ class AbstractSocketTest: XCTestCase {
} }
} }
socket.emit(finalTestname, withItems: emitData) AbstractSocketTest.socket.emit(finalTestname, withItems: emitData)
socket.on(finalTestname + "Return", callback: didGetEmit) AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit)
waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil) waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
} }
@ -65,11 +67,11 @@ class AbstractSocketTest: XCTestCase {
} }
socket.on(finalTestname + "Return", callback: didGetEmit) AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit)
if let emitData = emitData { if let emitData = emitData {
socket.emit(finalTestname, emitData) AbstractSocketTest.socket.emit(finalTestname, emitData)
} else { } else {
socket.emit(finalTestname) AbstractSocketTest.socket.emit(finalTestname)
} }
waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil) waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
@ -85,7 +87,7 @@ class AbstractSocketTest: XCTestCase {
} }
} }
socket.emitWithAck(finalTestname, withItems: Data)(timeoutAfter: 5, callback: didGetResult) AbstractSocketTest.socket.emitWithAck(finalTestname, withItems: Data)(timeoutAfter: 5, callback: didGetResult)
waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil) waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
} }
@ -100,9 +102,9 @@ class AbstractSocketTest: XCTestCase {
} }
var ack:OnAckCallback! var ack:OnAckCallback!
if let Data = Data { if let Data = Data {
ack = socket.emitWithAck(finalTestname, Data) ack = AbstractSocketTest.socket.emitWithAck(finalTestname, Data)
} else { } else {
ack = socket.emitWithAck(finalTestname) ack = AbstractSocketTest.socket.emitWithAck(finalTestname)
} }
ack(timeoutAfter: 20, callback: didGet) ack(timeoutAfter: 20, callback: didGet)

5
SocketIO-iOSTests/SocketAcknowledgementTest.swift
View File

@ -13,13 +13,16 @@ class SocketAcknowledgementTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Acknowledgement testKind = TestKind.Acknowledgement
socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ if AbstractSocketTest.socket == nil {
AbstractSocketTest.socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10
"forcePolling": false, "forcePolling": false,
"forceWebsockets": false,// default false "forceWebsockets": false,// default false
"path": ""]) "path": ""])
}
openConnection() openConnection()
} }

18
SocketIO-iOSTests/SocketEmitTest.swift
View File

@ -13,19 +13,21 @@ class SocketEmitTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Emit testKind = TestKind.Emit
socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ if AbstractSocketTest.socket == nil {
"reconnects": true, // default true AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
"reconnectAttempts": -1, // default -1 "reconnects": true, // default true
"reconnectWait": 5, // default 10 "reconnectAttempts": -1, // default -1
"forcePolling": false, "reconnectWait": 5, // default 10
"forceWebsockets": false,// default false "forcePolling": false,
"path": ""] "forceWebsockets": false,// default false
"path": ""]
) )
}
openConnection() openConnection()
} }
override func tearDown() { override func tearDown() {
socket.close(fast: false)
super.tearDown() super.tearDown()
} }

5
SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
View File

@ -13,7 +13,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Acknowledgement testKind = TestKind.Acknowledgement
socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ if AbstractSocketTest.socket == nil {
AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10
@ -21,6 +22,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
"forceWebsockets": false,// default false "forceWebsockets": false,// default false
"path": "", "path": "",
"nsp": "/swift"]) "nsp": "/swift"])
}
openConnection() openConnection()
} }

5
SocketIO-iOSTests/SocketNamespaceEmitTest.swift
View File

@ -13,7 +13,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Emit testKind = TestKind.Emit
socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ if AbstractSocketTest.socket == nil {
AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10
@ -21,6 +22,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest {
"forceWebsockets": false,// default false "forceWebsockets": false,// default false
"path": "", "path": "",
"nsp": "/swift"]) "nsp": "/swift"])
}
openConnection() openConnection()
} }