tweaks to testing
This commit is contained in:
parent
b8ab80bdf1
commit
d2f39b163a
@ -12,7 +12,6 @@ import XCTest
|
||||
class SocketPollingAcknowledgementTest: SocketAcknowledgementTest {
|
||||
override func setUp() {
|
||||
AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
|
||||
testKind = TestKind.Acknowledgement
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Acknowledgement
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,7 +12,6 @@ import XCTest
|
||||
class SocketPollingEmitTest: SocketEmitTest {
|
||||
override func setUp() {
|
||||
AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
|
||||
testKind = TestKind.Emit
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Emit
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,7 +12,6 @@ import XCTest
|
||||
class SocketPollingNamespaceAcknowledgementTest: SocketNamespaceAcknowledgementTest {
|
||||
override func setUp() {
|
||||
AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
|
||||
testKind = TestKind.Acknowledgement
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Acknowledgement
|
||||
}
|
||||
}
|
||||
@ -12,7 +12,6 @@ import XCTest
|
||||
class SocketPollingNamespaceEmitTest: SocketNamespaceEmitTest {
|
||||
override func setUp() {
|
||||
AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
|
||||
testKind = TestKind.Emit
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Emit
|
||||
}
|
||||
}
|
||||
@ -13,13 +13,25 @@ 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}
|
||||
|
||||
|
||||
@ -13,8 +13,7 @@ class SocketAcknowledgementTest: AbstractSocketTest {
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
AbstractSocketTest.socket = AbstractSocketTest.regularSocket
|
||||
testKind = TestKind.Acknowledgement
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Acknowledgement
|
||||
}
|
||||
|
||||
func testConnectionStatus() {
|
||||
|
||||
@ -13,8 +13,7 @@ class SocketEmitTest: AbstractSocketTest {
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
AbstractSocketTest.socket = AbstractSocketTest.regularSocket
|
||||
testKind = TestKind.Emit
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Emit
|
||||
}
|
||||
|
||||
func testConnectionStatus() {
|
||||
|
||||
@ -9,12 +9,10 @@
|
||||
import XCTest
|
||||
|
||||
class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
|
||||
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
|
||||
testKind = TestKind.Acknowledgement
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Acknowledgement
|
||||
}
|
||||
|
||||
func testConnectionStatus() {
|
||||
|
||||
@ -9,12 +9,10 @@
|
||||
import XCTest
|
||||
|
||||
class SocketNamespaceEmitTest: AbstractSocketTest {
|
||||
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
|
||||
testKind = TestKind.Emit
|
||||
openConnection(AbstractSocketTest.socket)
|
||||
testKind = .Emit
|
||||
}
|
||||
|
||||
func testConnectionStatus() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user