From dfc905d9c3b6f0ca8fed67cef31630baab85cac1 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Thu, 3 Sep 2015 08:13:40 +0200 Subject: [PATCH 1/5] refactor --- SocketIO-iOSTests/AbstractSocketTest.swift | 1 + SocketIO-iOSTests/SocketEmitTest.swift | 2 +- SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift | 2 +- SocketIO-iOSTests/SocketNamespaceEmitTest.swift | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift index e5b16d5..9ade919 100644 --- a/SocketIO-iOSTests/AbstractSocketTest.swift +++ b/SocketIO-iOSTests/AbstractSocketTest.swift @@ -9,6 +9,7 @@ import XCTest class AbstractSocketTest: XCTestCase { + static let serverURL = "milkbartube.com:6979" static let TEST_TIMEOUT = 8.0 var socket:SocketIOClient! var testKind:TestKind? diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift index 56eaf53..b153d06 100644 --- a/SocketIO-iOSTests/SocketEmitTest.swift +++ b/SocketIO-iOSTests/SocketEmitTest.swift @@ -13,7 +13,7 @@ class SocketEmitTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Emit - socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ + socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift index ca68288..99a4374 100644 --- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift @@ -13,7 +13,7 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Acknowledgement - socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ + socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift index c83a4ba..324d161 100644 --- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift @@ -13,7 +13,7 @@ class SocketNamespaceEmitTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Emit - socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ + socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 From e238293711d00ed4a92a3d309e0066c5090ab332 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Thu, 3 Sep 2015 13:49:27 +0200 Subject: [PATCH 2/5] weak connection expection --- SocketIO-iOSTests/AbstractSocketTest.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift index 9ade919..25128e0 100644 --- a/SocketIO-iOSTests/AbstractSocketTest.swift +++ b/SocketIO-iOSTests/AbstractSocketTest.swift @@ -20,10 +20,12 @@ class AbstractSocketTest: XCTestCase { } func openConnection() { - let expection = self.expectationWithDescription("connect") + weak var expection = self.expectationWithDescription("connect") XCTAssertTrue(socket.status == SocketIOClientStatus.NotConnected) socket.on("connect") {data, ack in - expection.fulfill() + if let expection = expection { + expection.fulfill() + } } socket.connect() XCTAssertEqual(socket.status, SocketIOClientStatus.Connecting) From 110a6748ab4f3bdb636ac86af1555bd72a5e519c Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Thu, 3 Sep 2015 14:06:09 +0200 Subject: [PATCH 3/5] cleanup --- SocketIO-iOSTests/AbstractSocketTest.swift | 5 +---- SocketIO-iOSTests/SocketEmitTest.swift | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift index 25128e0..59e1b6e 100644 --- a/SocketIO-iOSTests/AbstractSocketTest.swift +++ b/SocketIO-iOSTests/AbstractSocketTest.swift @@ -14,10 +14,7 @@ class AbstractSocketTest: XCTestCase { var socket:SocketIOClient! var testKind:TestKind? - override func tearDown() { - super.tearDown() - socket.close(fast: false) - } + func openConnection() { weak var expection = self.expectationWithDescription("connect") diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift index b153d06..eacff7d 100644 --- a/SocketIO-iOSTests/SocketEmitTest.swift +++ b/SocketIO-iOSTests/SocketEmitTest.swift @@ -25,7 +25,6 @@ class SocketEmitTest: AbstractSocketTest { } override func tearDown() { - socket.close(fast: false) super.tearDown() } From 69b395879616d0868d22443b861df4f810c1faa0 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Thu, 3 Sep 2015 16:47:06 +0200 Subject: [PATCH 4/5] single connection --- SocketIO-iOSTests/AbstractSocketTest.swift | 37 ++++++++++--------- .../SocketAcknowledgementTest.swift | 5 ++- SocketIO-iOSTests/SocketEmitTest.swift | 17 +++++---- .../SocketNamespaceAcknowledgementTest.swift | 5 ++- .../SocketNamespaceEmitTest.swift | 5 ++- 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift index 59e1b6e..b21a2d4 100644 --- a/SocketIO-iOSTests/AbstractSocketTest.swift +++ b/SocketIO-iOSTests/AbstractSocketTest.swift @@ -1,6 +1,6 @@ // // AbstractSocketTest.swift -// Socket.IO-Client-Swift +// AbstractSocketTest.socket.IO-Client-Swift // // Created by Lukas Schmidt on 02.08.15. // @@ -11,21 +11,24 @@ import XCTest class AbstractSocketTest: XCTestCase { static let serverURL = "milkbartube.com:6979" static let TEST_TIMEOUT = 8.0 - var socket:SocketIOClient! + static var socket:SocketIOClient! +// var socket:SocketIOClient! var testKind:TestKind? - func openConnection() { + print(AbstractSocketTest.socket.status.description) + guard AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected else {return} weak var expection = self.expectationWithDescription("connect") - XCTAssertTrue(socket.status == SocketIOClientStatus.NotConnected) - socket.on("connect") {data, ack in + XCTAssertTrue(AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected) + AbstractSocketTest.socket.on("connect") {data, ack in + print("Conected") if let expection = expection { expection.fulfill() } } - socket.connect() - XCTAssertEqual(socket.status, SocketIOClientStatus.Connecting) + AbstractSocketTest.socket.connect() + XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connecting) waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil) } @@ -34,8 +37,8 @@ class AbstractSocketTest: XCTestCase { } func checkConnectionStatus() { - XCTAssertEqual(socket.status, SocketIOClientStatus.Connected) - XCTAssertFalse(socket.secure) + XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connected) + XCTAssertFalse(AbstractSocketTest.socket.secure) } func socketMultipleEmit(testName:String, emitData:Array, callback:NormalCallback){ @@ -48,8 +51,8 @@ class AbstractSocketTest: XCTestCase { } } - socket.emit(finalTestname, withItems: emitData) - socket.on(finalTestname + "Return", callback: didGetEmit) + AbstractSocketTest.socket.emit(finalTestname, withItems: emitData) + AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit) waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil) } @@ -65,11 +68,11 @@ class AbstractSocketTest: XCTestCase { } - socket.on(finalTestname + "Return", callback: didGetEmit) + AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit) if let emitData = emitData { - socket.emit(finalTestname, emitData) + AbstractSocketTest.socket.emit(finalTestname, emitData) } else { - socket.emit(finalTestname) + AbstractSocketTest.socket.emit(finalTestname) } waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil) @@ -85,7 +88,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) } @@ -100,9 +103,9 @@ class AbstractSocketTest: XCTestCase { } var ack:OnAckCallback! if let Data = Data { - ack = socket.emitWithAck(finalTestname, Data) + ack = AbstractSocketTest.socket.emitWithAck(finalTestname, Data) } else { - ack = socket.emitWithAck(finalTestname) + ack = AbstractSocketTest.socket.emitWithAck(finalTestname) } ack(timeoutAfter: 20, callback: didGet) diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift index 313c372..045d32e 100644 --- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift @@ -13,13 +13,16 @@ class SocketAcknowledgementTest: AbstractSocketTest { override func setUp() { super.setUp() 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 "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 "forcePolling": false, "forceWebsockets": false,// default false "path": ""]) + } + openConnection() } diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift index eacff7d..958f241 100644 --- a/SocketIO-iOSTests/SocketEmitTest.swift +++ b/SocketIO-iOSTests/SocketEmitTest.swift @@ -13,14 +13,17 @@ class SocketEmitTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Emit - socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ - "reconnects": true, // default true - "reconnectAttempts": -1, // default -1 - "reconnectWait": 5, // default 10 - "forcePolling": false, - "forceWebsockets": false,// default false - "path": ""] + if AbstractSocketTest.socket == nil { + AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ + "reconnects": true, // default true + "reconnectAttempts": -1, // default -1 + "reconnectWait": 5, // default 10 + "forcePolling": false, + "forceWebsockets": false,// default false + "path": ""] ) + } + openConnection() } diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift index 99a4374..a7ae5b9 100644 --- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift @@ -13,7 +13,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Acknowledgement - socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ + if AbstractSocketTest.socket == nil { + AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 @@ -21,6 +22,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest { "forceWebsockets": false,// default false "path": "", "nsp": "/swift"]) + } + openConnection() } diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift index 324d161..cac2fe9 100644 --- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift @@ -13,7 +13,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Emit - socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ + if AbstractSocketTest.socket == nil { + AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 @@ -21,6 +22,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest { "forceWebsockets": false,// default false "path": "", "nsp": "/swift"]) + } + openConnection() } From 0fb9be62473bc7f4b008b883809088dd9d50eba0 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Thu, 3 Sep 2015 16:52:43 +0200 Subject: [PATCH 5/5] clean debug code --- SocketIO-iOSTests/AbstractSocketTest.swift | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift index b21a2d4..62c6e7a 100644 --- a/SocketIO-iOSTests/AbstractSocketTest.swift +++ b/SocketIO-iOSTests/AbstractSocketTest.swift @@ -12,17 +12,16 @@ class AbstractSocketTest: XCTestCase { static let serverURL = "milkbartube.com:6979" static let TEST_TIMEOUT = 8.0 static var socket:SocketIOClient! -// var socket:SocketIOClient! var testKind:TestKind? func openConnection() { - print(AbstractSocketTest.socket.status.description) guard AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected else {return} + weak var expection = self.expectationWithDescription("connect") XCTAssertTrue(AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected) AbstractSocketTest.socket.on("connect") {data, ack in - print("Conected") + XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connected) if let expection = expection { expection.fulfill() }