This repository has been archived by the owner on Oct 19, 2024. It is now read-only.
Improve tests and fix encoding of NSNumber #84
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 6, 2024 15:16
|
Also related: #76, but this PR should do a better job at preventing future regressions |
gsabran
commented
Aug 6, 2024
| try container.encode(nsnumber.boolValue) | ||
| case "c": | ||
| try container.encode(nsnumber.int8Value) |
There was a problem hiding this comment.
this case is now mapped to a boolean
gsabran
commented
Aug 6, 2024
| try container.encode(nsnumber.int64Value) | ||
| case "C": |
There was a problem hiding this comment.
this case is now mapped to a boolean
gsabran
commented
Aug 6, 2024
| @@ -20,10 +20,12 @@ class AnyEncodableTests: XCTestCase { | |||
| func testJSONEncoding() throws { | |||
|
|
|||
| let someEncodable = AnyEncodable(SomeEncodable(string: "String", int: 100, bool: true, hasUnderscore: "another string")) | |||
|
|
|||
| let nsNumber = AnyEncodable(1 as NSNumber) | |||
There was a problem hiding this comment.
Added NSNumber here to ensure there is no future regressions
gsabran
commented
Aug 6, 2024
Comment on lines
-108
to
-124
|
|
||
| XCTAssertEqual(encodedJSONObject, expectedJSONObject) | ||
| XCTAssert(encodedJSONObject["boolean"] is Bool) | ||
|
|
||
| XCTAssert(encodedJSONObject["char"] is Int8) | ||
| XCTAssert(encodedJSONObject["int"] is Int16) | ||
| XCTAssert(encodedJSONObject["short"] is Int32) | ||
| XCTAssert(encodedJSONObject["long"] is Int32) | ||
| XCTAssert(encodedJSONObject["longlong"] is Int64) | ||
|
|
||
| XCTAssert(encodedJSONObject["uchar"] is UInt8) | ||
| XCTAssert(encodedJSONObject["uint"] is UInt16) | ||
| XCTAssert(encodedJSONObject["ushort"] is UInt32) | ||
| XCTAssert(encodedJSONObject["ulong"] is UInt32) | ||
| XCTAssert(encodedJSONObject["ulonglong"] is UInt64) | ||
|
|
||
| XCTAssert(encodedJSONObject["double"] is Double) |
There was a problem hiding this comment.
Removed this part that is not testing decoding
gsabran
commented
Aug 6, 2024
|
|
||
|
|
||
|
|
||
| func XCTAssertJsonAreIdentical(_ expression1: String, _ expression2: String, options: JSONSerialization.WritingOptions? = nil) throws { |
There was a problem hiding this comment.
Helper functions to test that two serialized JSON (either String or Data) are equivalent (ie ignoring keys ordering and spaces).
gsabran
commented
Aug 6, 2024
| @@ -108,28 +108,24 @@ extension _AnyEncodable { | |||
|
|
|||
| #if canImport(Foundation) | |||
| private func encode(nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws { | |||
| switch Character(Unicode.Scalar(UInt8(nsnumber.objCType.pointee))) { | |||
There was a problem hiding this comment.
for applications where performance matters, this change should help make the code run faster.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
NSDictionaryis very permissive. For instance this test will pass:Instead if we compare the serialized value (
{ "k": true }) to that of the expectation ({ "k": 1 }) this test will logically fail.I added util function to ease the comparison of serialized JSON strings.
NSNumber. There were two issues:as? Boolbefore testingas? NSNumber. ANSNumbercan always be casted as aBoolso the later case was never hitSwift.Boolare represented as a char type in ObjC and the mapping was incorrectNSNumber's serialization.NSNumber, which after this fix might be more frequent