Skip to content

Commit fdf69ee

Browse files
committed
add more tests part 1
1 parent a367798 commit fdf69ee

File tree

4 files changed

+362
-12
lines changed

4 files changed

+362
-12
lines changed

Firestore/Source/API/FIRPipelineBridge.mm

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ @implementation FIRFieldBridge {
100100
std::shared_ptr<Field> field;
101101
}
102102

103-
- (id)init:(NSString *)name {
103+
- (id)initWithName:(NSString *)name {
104104
self = [super init];
105105
if (self) {
106106
field_path = [FIRFieldPath pathWithDotSeparatedString:name];
@@ -109,6 +109,15 @@ - (id)init:(NSString *)name {
109109
return self;
110110
}
111111

112+
- (id)initWithPath:(FIRFieldPath *)path {
113+
self = [super init];
114+
if (self) {
115+
field_path = path;
116+
field = std::make_shared<Field>([field_path internalValue].CanonicalString());
117+
}
118+
return self;
119+
}
120+
112121
- (std::shared_ptr<api::Expr>)cppExprWithReader:(FSTUserDataReader *)reader {
113122
return field;
114123
}

Firestore/Source/Public/FirebaseFirestore/FIRPipelineBridge.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
@class FIRTimestamp;
2424
@class FIRVectorValue;
2525
@class FIRPipelineBridge;
26+
@class FIRFieldPath;
2627

2728
NS_ASSUME_NONNULL_BEGIN
2829

@@ -34,7 +35,8 @@ NS_SWIFT_NAME(ExprBridge)
3435
NS_SWIFT_SENDABLE
3536
NS_SWIFT_NAME(FieldBridge)
3637
@interface FIRFieldBridge : FIRExprBridge
37-
- (id)init:(NSString *)name;
38+
- (id)initWithName:(NSString *)name;
39+
- (id)initWithPath:(FIRFieldPath *)path;
3840
- (NSString *)field_name;
3941
@end
4042

Firestore/Swift/Source/SwiftAPI/Pipeline/Expr/Field.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,17 @@ public class Field: ExprBridge, Expr, Selectable, BridgeWrapper, SelectableWrapp
2424

2525
public let fieldName: String
2626

27-
public init(_ fieldName: String) {
28-
let fieldBridge = FieldBridge(fieldName)
27+
public init(_ name: String) {
28+
let fieldBridge = FieldBridge(name: name)
2929
bridge = fieldBridge
30-
self.fieldName = fieldBridge.field_name()
31-
alias = self.fieldName
30+
fieldName = fieldBridge.field_name()
31+
alias = fieldName
32+
}
33+
34+
public init(_ path: FieldPath) {
35+
let fieldBridge = FieldBridge(path: path)
36+
bridge = fieldBridge
37+
fieldName = fieldBridge.field_name()
38+
alias = fieldName
3239
}
3340
}

0 commit comments

Comments
 (0)