Updated test cases to work on Linux and added more tests

Author: manavgabhawala

TestFoundation/TestNSJSONSerialization.swift

@@ -465,7 +465,8 @@ extension TestNSJSONSerialization {
             ("test_serialize_emptyArray", test_serialize_emptyArray),
             ("test_serialize_multiPODArray", test_serialize_multiPODArray),
 
-            ("test_serialize_values", test_serialize_nested),
+            ("test_serialize_nested", test_serialize_nested),
+            ("test_invalid_json", test_invalidJSON)
         ]
     }
 
@@ -517,8 +518,29 @@ extension TestNSJSONSerialization {
 
     func test_serialize_complicatedObject() {
         let json : [String: Any] = ["a": 4.0, "b": NSNull(), "c": "string", "d": false]
-        XCTAssertEqual(try trySerialize(json), "{\"b\":null,\"a\":4.0,\"d\":false,\"c\":\"string\"}")
-        XCTAssertEqual(try trySerializePretty(json), "{\n\t\"b\" : null,\n\t\"a\" : 4.0,\n\t\"d\" : false,\n\t\"c\" : \"string\"\n}")
+        
+        var normalString = "{"
+        var prettyString = "{"
+        for key in json.keys {
+            normalString += "\"\(key)\":"
+            prettyString += "\n\t\"\(key)\" : "
+            let valueString : String
+            if key == "a" {
+                valueString = "4.0"
+            } else if key == "b" {
+                valueString = "null"
+            } else if key == "c" {
+                valueString = "\"string\""
+            } else {
+                valueString = "false"
+            }
+            normalString += "\(valueString),"
+            prettyString += "\(valueString),"
+        }
+        normalString = normalString.substringToIndex(normalString.endIndex.predecessor()) + "}"
+        prettyString = prettyString.substringToIndex(prettyString.endIndex.predecessor()) + "\n}"
+        XCTAssertEqual(try trySerialize(json), normalString)
+        XCTAssertEqual(try trySerializePretty(json), prettyString)
     }
 
     //MARK: - Array Deserialization
@@ -549,12 +571,67 @@ extension TestNSJSONSerialization {
     //MARK: - Nested Serialization
     func test_serialize_nested() {
         let first: [String: Any] = ["a": 4.0, "b": NSNull(), "c": "string", "d": false]
+        
+        var normalString = "{"
+        var prettyString = "\n\t{"
+        
+        for key in first.keys {
+            normalString += "\"\(key)\":"
+            prettyString += "\n\t\t\"\(key)\" : "
+            let valueString : String
+            if key == "a" {
+                valueString = "4.0"
+            } else if key == "b" {
+                valueString = "null"
+            } else if key == "c" {
+                valueString = "\"string\""
+            } else {
+                valueString = "false"
+            }
+            normalString += "\(valueString),"
+            prettyString += "\(valueString),"
+        }
+        normalString = normalString.substringToIndex(normalString.endIndex.predecessor()) + "}"
+        prettyString = prettyString.substringToIndex(prettyString.endIndex.predecessor()) + "\n\t}"
+        
         let second: [Any] = [NSNull(), "hello", 1.0]
         let json: [Any] = [first, second, NSNull(), "hello", 1.0]
-        XCTAssertEqual(try trySerialize(json), "[{\"b\":null,\"a\":4.0,\"d\":false,\"c\":\"string\"},[null,\"hello\",1.0],null,\"hello\",1.0]")
-        XCTAssertEqual(try trySerializePretty(json), "[\n\t{\n\t\t\"b\" : null,\n\t\t\"a\" : 4.0,\n\t\t\"d\" : false,\n\t\t\"c\" : \"string\"\n\t},\n\t[\n\t\tnull,\n\t\t\"hello\",\n\t\t1.0\n\t],\n\tnull,\n\t\"hello\",\n\t1.0\n]")
+        
+        XCTAssertEqual(try trySerialize(json), "[\(normalString),[null,\"hello\",1.0],null,\"hello\",1.0]")
+        XCTAssertEqual(try trySerializePretty(json), "[\(prettyString),\n\t[\n\t\tnull,\n\t\t\"hello\",\n\t\t1.0\n\t],\n\tnull,\n\t\"hello\",\n\t1.0\n]")
 
     }
+    
+    // MARK: - Error checkers
+    func test_invalidJSON() {
+        let str = "Invalid json"
+        do {
+            let _ = try NSJSONSerialization.dataWithJSONObject(str, options: [])
+            XCTFail("Parsed string to JSON object")
+        } catch {
+        }
+        let doub = 4.0
+        do {
+            let _ = try NSJSONSerialization.dataWithJSONObject(doub, options: [])
+            XCTFail("Parsed double to JSON object")
+        } catch {
+        }
+        struct Temp {
+            var x : Int
+        }
+        let t = Temp(x: 1)
+        do {
+            let _ = try NSJSONSerialization.dataWithJSONObject(t, options: [])
+            XCTFail("Parsed non serializable object to JSON")
+        } catch {
+        }
+        let invalidJSON = ["some": t]
+        do {
+            let _ = try NSJSONSerialization.dataWithJSONObject(invalidJSON, options: [])
+            XCTFail("Parsed non serializable object in dictionary to JSON")
+        } catch {
+        }
+    }
 }
 
 // MARK: - isValidJSONObjectTests