diff options
Diffstat (limited to 'Firestore/Example/Tests/Core/FSTQueryTests.mm')
| -rw-r--r-- | Firestore/Example/Tests/Core/FSTQueryTests.mm | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/Firestore/Example/Tests/Core/FSTQueryTests.mm b/Firestore/Example/Tests/Core/FSTQueryTests.mm index c0b2cd9..5f6d279 100644 --- a/Firestore/Example/Tests/Core/FSTQueryTests.mm +++ b/Firestore/Example/Tests/Core/FSTQueryTests.mm @@ -26,10 +26,16 @@ #import "Firestore/Example/Tests/Util/FSTHelpers.h" #include "Firestore/core/src/firebase/firestore/model/database_id.h" +#include "Firestore/core/src/firebase/firestore/model/field_path.h" +#include "Firestore/core/src/firebase/firestore/model/resource_path.h" #include "Firestore/core/src/firebase/firestore/util/string_apple.h" +#include "Firestore/core/test/firebase/firestore/testutil/testutil.h" +namespace testutil = firebase::firestore::testutil; namespace util = firebase::firestore::util; using firebase::firestore::model::DatabaseId; +using firebase::firestore::model::FieldPath; +using firebase::firestore::model::ResourcePath; NS_ASSUME_NONNULL_BEGIN @@ -41,8 +47,10 @@ NS_ASSUME_NONNULL_BEGIN @implementation FSTQuery (Tests) - (FSTQuery *)queryByAddingSortBy:(NSString *)key ascending:(BOOL)ascending { - return [self queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(key) - ascending:ascending]]; + return [self + queryByAddingSortOrder:[FSTSortOrder + sortOrderWithFieldPath:testutil::Field(util::MakeStringView(key)) + ascending:ascending]]; } @end @@ -55,11 +63,11 @@ NS_ASSUME_NONNULL_BEGIN - (void)testConstructor { FSTResourcePath *path = [FSTResourcePath pathWithSegments:@[ @"rooms", @"Firestore", @"messages", @"0001" ]]; - FSTQuery *query = [FSTQuery queryWithPath:path]; + FSTQuery *query = [FSTQuery queryWithPath:[path toCPPResourcePath]]; XCTAssertNotNil(query); XCTAssertEqual(query.sortOrders.count, 1); - XCTAssertEqualObjects(query.sortOrders[0].field.canonicalString, kDocumentKeyPath); + XCTAssertEqual(query.sortOrders[0].field.CanonicalString(), FieldPath::kDocumentKeyPath); XCTAssertEqual(query.sortOrders[0].ascending, YES); XCTAssertEqual(query.explicitSortOrders.count, 0); @@ -68,17 +76,17 @@ NS_ASSUME_NONNULL_BEGIN - (void)testOrderBy { FSTQuery *query = FSTTestQuery(@"rooms/Firestore/messages"); query = - [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"length") + [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("length") ascending:NO]]; XCTAssertEqual(query.sortOrders.count, 2); - XCTAssertEqualObjects(query.sortOrders[0].field.canonicalString, @"length"); + XCTAssertEqual(query.sortOrders[0].field.CanonicalString(), "length"); XCTAssertEqual(query.sortOrders[0].ascending, NO); - XCTAssertEqualObjects(query.sortOrders[1].field.canonicalString, kDocumentKeyPath); + XCTAssertEqual(query.sortOrders[1].field.CanonicalString(), FieldPath::kDocumentKeyPath); XCTAssertEqual(query.sortOrders[1].ascending, NO); XCTAssertEqual(query.explicitSortOrders.count, 1); - XCTAssertEqualObjects(query.explicitSortOrders[0].field.canonicalString, @"length"); + XCTAssertEqual(query.explicitSortOrders[0].field.CanonicalString(), "length"); XCTAssertEqual(query.explicitSortOrders[0].ascending, NO); } @@ -211,7 +219,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)testDoesntRemoveComplexObjectsWithOrderBy { FSTQuery *query1 = [FSTTestQuery(@"collection") - queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"sort") + queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("sort") ascending:YES]]; FSTDocument *doc1 = FSTTestDoc(@"collection/1", 0, @{ @"sort" : @2 }, NO); @@ -305,9 +313,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)testSortsDocumentsInTheCorrectOrder { FSTQuery *query = FSTTestQuery(@"collection"); - query = - [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"sort") - ascending:YES]]; + query = [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("sort") + ascending:YES]]; // clang-format off NSArray<FSTDocument *> *docs = @[ @@ -335,10 +342,10 @@ NS_ASSUME_NONNULL_BEGIN - (void)testSortsDocumentsUsingMultipleFields { FSTQuery *query = FSTTestQuery(@"collection"); query = - [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"sort1") + [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("sort1") ascending:YES]]; query = - [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"sort2") + [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("sort2") ascending:YES]]; // clang-format off @@ -362,10 +369,10 @@ NS_ASSUME_NONNULL_BEGIN - (void)testSortsDocumentsWithDescendingToo { FSTQuery *query = FSTTestQuery(@"collection"); query = - [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"sort1") + [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("sort1") ascending:NO]]; query = - [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:FSTTestFieldPath(@"sort2") + [query queryByAddingSortOrder:[FSTSortOrder sortOrderWithFieldPath:testutil::Field("sort2") ascending:NO]]; // clang-format off |