Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require explicit typing for DocumentSnapshot decoding. DocumentReference decoding. #9101

Merged
merged 12 commits into from
Feb 23, 2022
Merged

Require explicit typing for DocumentSnapshot decoding. DocumentReference decoding. #9101

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0e4769c
Require explicit typing for DocumentSnapshot decoding. Add DocumentRe…
mortenbekditlevsen Dec 14, 2021
7815580
Updated doc comments. Added async version of getDocument(as:)
mortenbekditlevsen Dec 15, 2021
4ff41d7
Ran style.sh
mortenbekditlevsen Dec 15, 2021
37fb5be
Added LLC to copyright notice
mortenbekditlevsen Jan 3, 2022
6a94a62
Fixed up comments
mortenbekditlevsen Jan 18, 2022
31e3341
Merge branch 'master' into firestore_documentreference_codable
mortenbekditlevsen Jan 23, 2022
2eb244f
Ran style.sh
mortenbekditlevsen Jan 23, 2022
1d2f5d4
Change defaulting mechanism
mortenbekditlevsen Jan 27, 2022
c3e8cb3
Changes after review from Peter Friese
mortenbekditlevsen Feb 17, 2022
848f5e2
Updated CodableIntegrationTests to match updated API
mortenbekditlevsen Feb 18, 2022
f6a3733
Added offline behavior description from Objective-C documentation and…
mortenbekditlevsen Feb 22, 2022
9ce7b61
Updated comment after review
mortenbekditlevsen Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated CodableIntegrationTests to match updated API
  • Loading branch information
@mortenbekditlevsen
mortenbekditlevsen committed Feb 18, 2022
commit 848f5e271e7fcc4f3c7fd3a6b9ba8cd2113d7006
34 changes: 17 additions & 17 deletions Firestore/Swift/Tests/Integration/CodableIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class CodableIntegrationTests: FSTIntegrationTestCase {

let readAfterWrite = try readDocument(forRef: docToWrite).data(as: Model.self)

XCTAssertEqual(readAfterWrite!, model, "Failed with flavor \(flavor)")
XCTAssertEqual(readAfterWrite, model, "Failed with flavor \(flavor)")
}
}

Expand All @@ -113,8 +113,8 @@ class CodableIntegrationTests: FSTIntegrationTestCase {

let decoded = try readDocument(forRef: docToWrite).data(as: Model.self)

XCTAssertNotNil(decoded?.ts, "Failed with flavor \(flavor)")
if let ts = decoded?.ts {
XCTAssertNotNil(decoded.ts, "Failed with flavor \(flavor)")
if let ts = decoded.ts {
XCTAssertGreaterThan(ts.seconds, 1_500_000_000, "Failed with flavor \(flavor)")
} else {
XCTFail("Expect server timestamp is set, but getting .pending")
Expand Down Expand Up @@ -145,17 +145,17 @@ class CodableIntegrationTests: FSTIntegrationTestCase {

let snapshot = readDocument(forRef: docToWrite)
var decoded = try snapshot.data(as: Model.self, with: .none)
XCTAssertNil(decoded?.ts)
XCTAssertNil(decoded.ts)

decoded = try snapshot.data(as: Model.self, with: .estimate)
XCTAssertNotNil(decoded?.ts)
XCTAssertNotNil(decoded?.ts?.seconds)
XCTAssertGreaterThanOrEqual(decoded!.ts!.seconds, now)
XCTAssertNotNil(decoded.ts)
XCTAssertNotNil(decoded.ts?.seconds)
XCTAssertGreaterThanOrEqual(decoded.ts!.seconds, now)

decoded = try snapshot.data(as: Model.self, with: .previous)
XCTAssertNotNil(decoded?.ts)
XCTAssertNotNil(decoded?.ts?.seconds)
XCTAssertEqual(decoded!.ts!.seconds, pastTimestamp.seconds)
XCTAssertNotNil(decoded.ts)
XCTAssertNotNil(decoded.ts?.seconds)
XCTAssertEqual(decoded.ts!.seconds, pastTimestamp.seconds)

enableNetwork()
awaitExpectations()
Expand Down Expand Up @@ -230,7 +230,7 @@ class CodableIntegrationTests: FSTIntegrationTestCase {

// Decoded result has "docId" auto-populated.
let decoded = try readDocument(forRef: docToWrite).data(as: Model.self)
XCTAssertEqual(decoded!, Model(name: "name", docId: docToWrite))
XCTAssertEqual(decoded, Model(name: "name", docId: docToWrite))
}

func testSelfDocumentIDWithCustomCodable() throws {
Expand Down Expand Up @@ -277,7 +277,7 @@ class CodableIntegrationTests: FSTIntegrationTestCase {

// Decoded result has "docId" auto-populated.
let decoded = try readDocument(forRef: docToWrite).data(as: Model.self)
XCTAssertEqual(decoded!, Model(name: "name", docId: docToWrite))
XCTAssertEqual(decoded, Model(name: "name", docId: docToWrite))
}

func testSetThenMerge() throws {
Expand All @@ -298,18 +298,18 @@ class CodableIntegrationTests: FSTIntegrationTestCase {

var readAfterUpdate = try readDocument(forRef: docToWrite).data(as: Model.self)

XCTAssertEqual(readAfterUpdate!, Model(name: "test",
age: 43, hobby: "No"), "Failed with flavor \(flavor)")
XCTAssertEqual(readAfterUpdate, Model(name: "test",
age: 43, hobby: "No"), "Failed with flavor \(flavor)")

let newUpdate = Model(name: "xxxx", age: 10, hobby: "Play")
// Note 'name' is not updated.
try setData(from: newUpdate, forDocument: docToWrite, withFlavor: flavor,
mergeFields: ["age", FieldPath(["hobby"])])

readAfterUpdate = try readDocument(forRef: docToWrite).data(as: Model.self)
XCTAssertEqual(readAfterUpdate!, Model(name: "test",
age: 10,
hobby: "Play"), "Failed with flavor \(flavor)")
XCTAssertEqual(readAfterUpdate, Model(name: "test",
age: 10,
hobby: "Play"), "Failed with flavor \(flavor)")
}
}

Expand Down