From 30259115026aeac584a5f70131e2a90a79c0ddb9 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 26 Sep 2015 12:30:12 -0400 Subject: [PATCH] tweaks --- SocketIO-iOSTests/AbstractSocketTest.swift | 8 +------- SocketIO-iOSTests/SocketAcknowledgementTest.swift | 2 +- SocketIO-iOSTests/SocketEmitTest.swift | 4 ---- .../SocketNamespaceAcknowledgementTest.swift | 2 +- SocketIO-iOSTests/SocketNamespaceEmitTest.swift | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift index 3b78e7b..fbb8010 100644 --- a/SocketIO-iOSTests/AbstractSocketTest.swift +++ b/SocketIO-iOSTests/AbstractSocketTest.swift @@ -10,7 +10,7 @@ import XCTest class AbstractSocketTest: XCTestCase { static let serverURL = "localhost:6979" - static let TEST_TIMEOUT = 8.0 + static let TEST_TIMEOUT = 3.0 static var socket: SocketIOClient! static let regularSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ "reconnects": true, // default true @@ -31,12 +31,6 @@ class AbstractSocketTest: XCTestCase { "nsp": "/swift"]) var testKind:TestKind? -// override func setUp() { -// super.setUp() -// openConnection(AbstractSocketTest.socket) -// openConnection(AbstractSocketTest.namespaceSocket) -// } - func openConnection(socket: SocketIOClient) { guard socket.status == SocketIOClientStatus.NotConnected else {return} diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift index 82225a7..3beba03 100644 --- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift @@ -16,7 +16,7 @@ class SocketAcknowledgementTest: AbstractSocketTest { testKind = TestKind.Acknowledgement openConnection(AbstractSocketTest.socket) } - + func testConnectionStatus() { super.checkConnectionStatus() } diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift index 2356c0e..c653c0f 100644 --- a/SocketIO-iOSTests/SocketEmitTest.swift +++ b/SocketIO-iOSTests/SocketEmitTest.swift @@ -17,10 +17,6 @@ class SocketEmitTest: AbstractSocketTest { openConnection(AbstractSocketTest.socket) } - override func tearDown() { - super.tearDown() - } - func testConnectionStatus() { super.checkConnectionStatus() } diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift index db42b79..109e8c3 100644 --- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift @@ -14,7 +14,7 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest { super.setUp() AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket testKind = TestKind.Acknowledgement - openConnection(AbstractSocketTest.namespaceSocket) + openConnection(AbstractSocketTest.socket) } func testConnectionStatus() { diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift index 61f7710..508e4bc 100644 --- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift @@ -14,7 +14,7 @@ class SocketNamespaceEmitTest: AbstractSocketTest { super.setUp() AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket testKind = TestKind.Emit - openConnection(AbstractSocketTest.namespaceSocket) + openConnection(AbstractSocketTest.socket) } func testConnectionStatus() {