[R] Always use default value for dataUsingEncoding

sschmidt · Feb 1, 2016 · 9647b38 · 9647b38
1 parent 89c82ba
commit 9647b38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/JsonPatchSwift/JPSJsonPatch.swift b/JsonPatchSwift/JPSJsonPatch.swift
@@ -74,7 +74,7 @@ extension JPSJsonPatch {
     static func applyPatch(jsonPatch: JPSJsonPatch, toJson json: JSON) -> JSON {
 //        let pointer = jsonPatch.operations[0].pointer
 //        json[pointer.pointerValue]// = jsonPatch.operation[0].value
-        return JSON(data: "{ \"bar\" : \"foo\" }".dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)
+        return JSON(data: "{ \"bar\" : \"foo\" }".dataUsingEncoding(NSUTF8StringEncoding)!)
     }
 
 }

diff --git a/JsonPatchSwiftTests/JPSAddOperationTests.swift b/JsonPatchSwiftTests/JPSAddOperationTests.swift
@@ -24,9 +24,9 @@ class JPSAddOperationTests: XCTestCase {
 
     func testIfPathToNonExistingMemberCreatesNewMember() {
         let patch = try! JPSJsonPatch("{ \"op\" : \"add\", \"path\" : \"/a\", \"value\" : \"foo\" }")
-        let json = JSON(data: "{\"b\" : \"bar\"}".dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)
+        let json = JSON(data: "{\"b\" : \"bar\"}".dataUsingEncoding(NSUTF8StringEncoding)!)
         let resultingJson = JPSJsonPatch.applyPatch(patch, toJson: json)
-        let expectedJson = JSON(data: "{ \"a\" : \"foo\", \"b\" : \"bar\" }".dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)
+        let expectedJson = JSON(data: "{ \"a\" : \"foo\", \"b\" : \"bar\" }".dataUsingEncoding(NSUTF8StringEncoding)!)
         XCTAssertEqual(resultingJson, expectedJson)
     }
 
@@ -40,7 +40,7 @@ class JPSAddOperationTests: XCTestCase {
         let json = JSON(data: " { \"foo\" : \"bar\" } ".dataUsingEncoding(NSUTF8StringEncoding)!)
         let jsonPatch = try! JPSJsonPatch("{ \"op\": \"add\", \"path\": \"\", \"value\": { \"bar\" : \"foo\" } }")
         let resultingJson = JPSJsonPatch.applyPatch(jsonPatch, toJson: json)
-        let expectedJson = JSON(data: "{ \"bar\" : \"foo\" }".dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)
+        let expectedJson = JSON(data: "{ \"bar\" : \"foo\" }".dataUsingEncoding(NSUTF8StringEncoding)!)
         XCTAssertEqual(resultingJson, expectedJson)
     }