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

Revert "tweaks to testing"

Browse Source 
This reverts commit d2f39b163a4689635c832d26a4a1e0a37c66f729.
This commit is contained in:
Erik 2015-09-28 15:46:25 -04:00
parent d2f39b163a
commit f3b4c0eba3
9 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
View File

@ -12,6 +12,7 @@ import XCTest
class SocketPollingAcknowledgementTest: SocketAcknowledgementTest {
override func setUp() {
AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
testKind = .Acknowledgement
testKind = TestKind.Acknowledgement
openConnection(AbstractSocketTest.socket)
}
}

3
SocketIO-MacTests/SocketPollingEmitTest.swift
View File

@ -12,6 +12,7 @@ import XCTest
class SocketPollingEmitTest: SocketEmitTest {
override func setUp() {
AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
testKind = .Emit
testKind = TestKind.Emit
openConnection(AbstractSocketTest.socket)
}
}

3
SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
View File

@ -12,6 +12,7 @@ import XCTest
class SocketPollingNamespaceAcknowledgementTest: SocketNamespaceAcknowledgementTest {
override func setUp() {
AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
testKind = .Acknowledgement
testKind = TestKind.Acknowledgement
openConnection(AbstractSocketTest.socket)
}
}

3
SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
View File

@ -12,6 +12,7 @@ import XCTest
class SocketPollingNamespaceEmitTest: SocketNamespaceEmitTest {
override func setUp() {
AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
testKind = .Emit
testKind = TestKind.Emit
openConnection(AbstractSocketTest.socket)
}
}

18
SocketIO-iOSTests/AbstractSocketTest.swift
View File

@ -13,25 +13,13 @@ class AbstractSocketTest: XCTestCase {
static let TEST_TIMEOUT = 5.0
static var socket: SocketIOClient!
static let regularSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL)
static let regularPollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
opts: ["forcePolling": true])
static let namespaceSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
opts: ["nsp": "/swift"])
static let namespacePollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
opts: ["forsePolling": true, "nsp": "/swift"])
static let namespaceSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: ["nsp": "/swift"])
static let namespacePollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: ["forsePolling": true,"nsp": "/swift"])
var testKind:TestKind?
override func setUp() {
connectAll()
}
func connectAll() {
openConnection(AbstractSocketTest.namespacePollingSocket)
openConnection(AbstractSocketTest.regularSocket)
openConnection(AbstractSocketTest.regularPollingSocket)
openConnection(AbstractSocketTest.namespaceSocket)
}
func openConnection(socket: SocketIOClient) {
guard socket.status == SocketIOClientStatus.NotConnected else {return}

3
SocketIO-iOSTests/SocketAcknowledgementTest.swift
View File

@ -13,7 +13,8 @@ class SocketAcknowledgementTest: AbstractSocketTest {
override func setUp() {
super.setUp()
AbstractSocketTest.socket = AbstractSocketTest.regularSocket
testKind = .Acknowledgement
testKind = TestKind.Acknowledgement
openConnection(AbstractSocketTest.socket)
}
func testConnectionStatus() {

3
SocketIO-iOSTests/SocketEmitTest.swift
View File

@ -13,7 +13,8 @@ class SocketEmitTest: AbstractSocketTest {
override func setUp() {
super.setUp()
AbstractSocketTest.socket = AbstractSocketTest.regularSocket
testKind = .Emit
testKind = TestKind.Emit
openConnection(AbstractSocketTest.socket)
}
func testConnectionStatus() {

4
SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
View File

@ -9,10 +9,12 @@
import XCTest
class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
override func setUp() {
super.setUp()
AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
testKind = .Acknowledgement
testKind = TestKind.Acknowledgement
openConnection(AbstractSocketTest.socket)
}
func testConnectionStatus() {

4
SocketIO-iOSTests/SocketNamespaceEmitTest.swift
View File

@ -9,10 +9,12 @@
import XCTest
class SocketNamespaceEmitTest: AbstractSocketTest {
override func setUp() {
super.setUp()
AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
testKind = .Emit
testKind = TestKind.Emit
openConnection(AbstractSocketTest.socket)
}
func testConnectionStatus() {