From 34ef8a5278013959aaa9b93da3b2a8ec08240edd Mon Sep 17 00:00:00 2001
From: Erik Little <nuclear.ace@gmail.com>
Date: Thu, 8 Sep 2016 07:23:00 -0400
Subject: [PATCH] Fix tests

---
 SocketIO-MacTests/SocketBasicPacketTest.swift     |  8 ++++----
 SocketIO-MacTests/SocketNamespacePacketTest.swift | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SocketIO-MacTests/SocketBasicPacketTest.swift b/SocketIO-MacTests/SocketBasicPacketTest.swift
index 6766c74..d2614fb 100644
--- a/SocketIO-MacTests/SocketBasicPacketTest.swift
+++ b/SocketIO-MacTests/SocketBasicPacketTest.swift
@@ -46,7 +46,7 @@ class SocketBasicPacketTest: XCTestCase {
     }
     
     func testJSONEmit() {
-        let expectedSendString = "2[\"test\",{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
+        let expectedSendString = "2[\"test\",{\"null\":null,\"hello\":1,\"test\":\"hello\",\"foobar\":true}]"
         let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
         
@@ -71,12 +71,12 @@ class SocketBasicPacketTest: XCTestCase {
     }
     
     func testMultipleBinaryEmit() {
-        let expectedSendString = "52-[\"test\",{\"data1\":{\"_placeholder\":true,\"num\":0},\"data2\":{\"_placeholder\":true,\"num\":1}}]"
+        let expectedSendString = "52-[\"test\",{\"data2\":{\"_placeholder\":true,\"num\":0},\"data1\":{\"_placeholder\":true,\"num\":1}}]"
         let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
         
         XCTAssertEqual(packet.packetString, expectedSendString)
-        XCTAssertEqual(packet.binary, [data, data2])
+        XCTAssertEqual(packet.binary, [data2, data])
     }
     
     func testEmitWithAck() {
@@ -123,7 +123,7 @@ class SocketBasicPacketTest: XCTestCase {
     }
     
     func testJSONAck() {
-        let expectedSendString = "30[{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
+        let expectedSendString = "30[{\"null\":null,\"hello\":1,\"test\":\"hello\",\"foobar\":true}]"
         let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
         
diff --git a/SocketIO-MacTests/SocketNamespacePacketTest.swift b/SocketIO-MacTests/SocketNamespacePacketTest.swift
index 6b0a474..51a7ba4 100644
--- a/SocketIO-MacTests/SocketNamespacePacketTest.swift
+++ b/SocketIO-MacTests/SocketNamespacePacketTest.swift
@@ -38,7 +38,7 @@ class SocketNamespacePacketTest: XCTestCase {
     }
     
     func testJSONEmit() {
-        let expectedSendString = "2/swift,[\"test\",{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
+        let expectedSendString = "2/swift,[\"test\",{\"null\":null,\"test\":\"hello\",\"hello\":1,\"foobar\":true}]"
         let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()] as NSDictionary]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
         
@@ -46,8 +46,8 @@ class SocketNamespacePacketTest: XCTestCase {
     }
     
     func testArrayEmit() {
-        let expectedSendString = "2/swift,[\"test\",[\"hello\",true,{\"test\":\"test\"}]]"
-        let sendData: [Any] = ["test", ["hello", 1, ["test": "test"]]]
+        let expectedSendString = "2/swift,[\"test\",[\"hello\",1,{\"test\":\"test\"},true]]"
+        let sendData: [Any] = ["test", ["hello", 1, ["test": "test"], true]]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
         
         
@@ -64,12 +64,12 @@ class SocketNamespacePacketTest: XCTestCase {
     }
     
     func testMultipleBinaryEmit() {
-        let expectedSendString = "52-/swift,[\"test\",{\"data1\":{\"_placeholder\":true,\"num\":0},\"data2\":{\"_placeholder\":true,\"num\":1}}]"
+        let expectedSendString = "52-/swift,[\"test\",{\"data2\":{\"_placeholder\":true,\"num\":0},\"data1\":{\"_placeholder\":true,\"num\":1}}]"
         let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
         
         XCTAssertEqual(packet.packetString, expectedSendString)
-        XCTAssertEqual(packet.binary, [data, data2])
+        XCTAssertEqual(packet.binary, [data2, data])
     }
     
     func testEmitWithAck() {
@@ -114,7 +114,7 @@ class SocketNamespacePacketTest: XCTestCase {
     }
     
     func testJSONAck() {
-        let expectedSendString = "3/swift,0[{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
+        let expectedSendString = "3/swift,0[{\"null\":null,\"hello\":1,\"test\":\"hello\",\"foobar\":true}]"
         let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true)