diff options
| author |  zxu <zxu@google.com> | 2018-04-04 12:40:46 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-04 12:40:46 -0400 |
| commit | 5fa10a914334562564a26298f128bc852269077f (patch) | |
| tree | d3529b649230fdf617e492544670ced1191ca5d3 /Firestore/Example/Tests/Util | |
| parent | fbe9f9c30c025842a3657055f8dfabbc77f65bf2 (diff) | |
port FieldMask to C++ (#998)
* port FieldMask to C++
* address changes
* address changes
* fix test
* address change
* fix lint
* address changes
* Revert "address changes"
This reverts commit c75bb42851b785ab0838bb23679f87dfad9df4bb.
Diffstat (limited to 'Firestore/Example/Tests/Util')
| -rw-r--r-- | Firestore/Example/Tests/Util/FSTHelpers.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Firestore/Example/Tests/Util/FSTHelpers.mm b/Firestore/Example/Tests/Util/FSTHelpers.mm index 5751739..8a7306c 100644 --- a/Firestore/Example/Tests/Util/FSTHelpers.mm +++ b/Firestore/Example/Tests/Util/FSTHelpers.mm @@ -44,6 +44,7 @@ #include "Firestore/core/src/firebase/firestore/model/database_id.h" #include "Firestore/core/src/firebase/firestore/model/document_key.h" +#include "Firestore/core/src/firebase/firestore/model/field_mask.h" #include "Firestore/core/src/firebase/firestore/model/field_value.h" #include "Firestore/core/src/firebase/firestore/model/resource_path.h" #include "Firestore/core/src/firebase/firestore/util/string_apple.h" @@ -53,6 +54,7 @@ namespace util = firebase::firestore::util; namespace testutil = firebase::firestore::testutil; using firebase::firestore::model::DatabaseId; using firebase::firestore::model::DocumentKey; +using firebase::firestore::model::FieldMask; using firebase::firestore::model::FieldPath; using firebase::firestore::model::FieldValue; using firebase::firestore::model::ResourcePath; @@ -260,8 +262,8 @@ FSTPatchMutation *FSTTestPatchMutation(const absl::string_view path, } }]; - FSTDocumentKey *key = [FSTDocumentKey keyWithPath:testutil::Resource(path)]; - FSTFieldMask *mask = [[FSTFieldMask alloc] initWithFields:merge ? updateMask : fieldMaskPaths]; + DocumentKey key = testutil::Key(path); + FieldMask mask(merge ? updateMask : fieldMaskPaths); return [[FSTPatchMutation alloc] initWithKey:key fieldMask:mask value:objectValue |