Skip to content

Commit 8e37cfe

Browse files
rsgowmanrsgowman
authored
Alter testutil::*Doc to return shared_ptrs. (#2546)
1 parent 675e74a commit 8e37cfe

File tree

5 files changed

+100
-98
lines changed

5 files changed

+100
-98
lines changed

‎Firestore/core/test/firebase/firestore/core/query_test.cc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ using testutil::Doc;
3636
using testutil::Filter;
3737

3838
TEST(QueryTest, MatchesBasedOnDocumentKey) {
39-
Document doc1 = Doc("rooms/eros/messages/1");
40-
Document doc2 = Doc("rooms/eros/messages/2");
41-
Document doc3 = Doc("rooms/other/messages/1");
39+
Document doc1 = *Doc("rooms/eros/messages/1");
40+
Document doc2 = *Doc("rooms/eros/messages/2");
41+
Document doc3 = *Doc("rooms/other/messages/1");
4242

4343
Query query = Query::AtPath({"rooms", "eros", "messages", "1"});
4444
EXPECT_TRUE(query.Matches(doc1));
@@ -47,10 +47,10 @@ TEST(QueryTest, MatchesBasedOnDocumentKey) {
4747
}
4848

4949
TEST(QueryTest, MatchesShallowAncestorQuery) {
50-
Document doc1 = Doc("rooms/eros/messages/1");
51-
Document doc1_meta = Doc("rooms/eros/messages/1/meta/1");
52-
Document doc2 = Doc("rooms/eros/messages/2");
53-
Document doc3 = Doc("rooms/other/messages/1");
50+
Document doc1 = *Doc("rooms/eros/messages/1");
51+
Document doc1_meta = *Doc("rooms/eros/messages/1/meta/1");
52+
Document doc2 = *Doc("rooms/eros/messages/2");
53+
Document doc3 = *Doc("rooms/other/messages/1");
5454

5555
Query query = Query::AtPath({"rooms", "eros", "messages"});
5656
EXPECT_TRUE(query.Matches(doc1));
@@ -60,9 +60,9 @@ TEST(QueryTest, MatchesShallowAncestorQuery) {
6060
}
6161

6262
TEST(QueryTest, EmptyFieldsAreAllowedForQueries) {
63-
Document doc1 = Doc("rooms/eros/messages/1", 0,
64-
{{"text", FieldValue::FromString("msg1")}});
65-
Document doc2 = Doc("rooms/eros/messages/2");
63+
Document doc1 = *Doc("rooms/eros/messages/1", 0,
64+
{{"text", FieldValue::FromString("msg1")}});
65+
Document doc2 = *Doc("rooms/eros/messages/2");
6666

6767
Query query = Query::AtPath({"rooms", "eros", "messages"})
6868
.Filter(Filter("text", "==", "msg1"));
@@ -77,14 +77,14 @@ TEST(QueryTest, PrimitiveValueFilter) {
7777
.Filter(Filter("sort", "<=", 2));
7878

7979
Document doc1 =
80-
Doc("collection/1", 0, {{"sort", FieldValue::FromInteger(1)}});
80+
*Doc("collection/1", 0, {{"sort", FieldValue::FromInteger(1)}});
8181
Document doc2 =
82-
Doc("collection/2", 0, {{"sort", FieldValue::FromInteger(2)}});
82+
*Doc("collection/2", 0, {{"sort", FieldValue::FromInteger(2)}});
8383
Document doc3 =
84-
Doc("collection/3", 0, {{"sort", FieldValue::FromInteger(3)}});
85-
Document doc4 = Doc("collection/4", 0, {{"sort", FieldValue::False()}});
84+
*Doc("collection/3", 0, {{"sort", FieldValue::FromInteger(3)}});
85+
Document doc4 = *Doc("collection/4", 0, {{"sort", FieldValue::False()}});
8686
Document doc5 =
87-
Doc("collection/5", 0, {{"sort", FieldValue::FromString("string")}});
87+
*Doc("collection/5", 0, {{"sort", FieldValue::FromString("string")}});
8888

8989
EXPECT_FALSE(query1.Matches(doc1));
9090
EXPECT_TRUE(query1.Matches(doc2));
@@ -103,14 +103,14 @@ TEST(QueryTest, NanFilter) {
103103
Query query = Query::AtPath(ResourcePath::FromString("collection"))
104104
.Filter(Filter("sort", "==", NAN));
105105

106-
Document doc1 = Doc("collection/1", 0, {{"sort", FieldValue::Nan()}});
106+
Document doc1 = *Doc("collection/1", 0, {{"sort", FieldValue::Nan()}});
107107
Document doc2 =
108-
Doc("collection/2", 0, {{"sort", FieldValue::FromInteger(2)}});
108+
*Doc("collection/2", 0, {{"sort", FieldValue::FromInteger(2)}});
109109
Document doc3 =
110-
Doc("collection/3", 0, {{"sort", FieldValue::FromDouble(3.1)}});
111-
Document doc4 = Doc("collection/4", 0, {{"sort", FieldValue::False()}});
110+
*Doc("collection/3", 0, {{"sort", FieldValue::FromDouble(3.1)}});
111+
Document doc4 = *Doc("collection/4", 0, {{"sort", FieldValue::False()}});
112112
Document doc5 =
113-
Doc("collection/5", 0, {{"sort", FieldValue::FromString("string")}});
113+
*Doc("collection/5", 0, {{"sort", FieldValue::FromString("string")}});
114114

115115
EXPECT_TRUE(query.Matches(doc1));
116116
EXPECT_FALSE(query.Matches(doc2));

‎Firestore/core/test/firebase/firestore/local/local_serializer_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ TEST_F(LocalSerializerTest, EncodesMutationBatch) {
310310
}
311311

312312
TEST_F(LocalSerializerTest, EncodesDocumentAsMaybeDocument) {
313-
Document doc = Doc("some/path", /*version=*/42,
314-
{{"foo", FieldValue::FromString("bar")}});
313+
Document doc = *Doc("some/path", /*version=*/42,
314+
{{"foo", FieldValue::FromString("bar")}});
315315

316316
::firestore::client::MaybeDocument maybe_doc_proto;
317317
maybe_doc_proto.mutable_document()->set_name(
@@ -327,7 +327,7 @@ TEST_F(LocalSerializerTest, EncodesDocumentAsMaybeDocument) {
327327
}
328328

329329
TEST_F(LocalSerializerTest, EncodesNoDocumentAsMaybeDocument) {
330-
NoDocument no_doc = DeletedDoc("some/path", /*version=*/42);
330+
NoDocument no_doc = *DeletedDoc("some/path", /*version=*/42);
331331

332332
::firestore::client::MaybeDocument maybe_doc_proto;
333333
maybe_doc_proto.mutable_no_document()->set_name(
@@ -339,7 +339,7 @@ TEST_F(LocalSerializerTest, EncodesNoDocumentAsMaybeDocument) {
339339
}
340340

341341
TEST_F(LocalSerializerTest, EncodesUnknownDocumentAsMaybeDocument) {
342-
UnknownDocument unknown_doc = UnknownDoc("some/path", /*version=*/42);
342+
UnknownDocument unknown_doc = *UnknownDoc("some/path", /*version=*/42);
343343

344344
::firestore::client::MaybeDocument maybe_doc_proto;
345345
maybe_doc_proto.mutable_unknown_document()->set_name(

‎Firestore/core/test/firebase/firestore/model/mutation_test.cc

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "Firestore/core/src/firebase/firestore/model/document.h"
2222
#include "Firestore/core/src/firebase/firestore/model/field_value.h"
23+
#include "Firestore/core/src/firebase/firestore/model/maybe_document.h"
2324
#include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
2425
#include "gtest/gtest.h"
2526

@@ -35,45 +36,45 @@ using testutil::PatchMutation;
3536
using testutil::SetMutation;
3637

3738
TEST(Mutation, AppliesSetsToDocuments) {
38-
auto base_doc = std::make_shared<Document>(
39+
MaybeDocumentPtr base_doc =
3940
Doc("collection/key", 0,
4041
{{"foo", FieldValue::FromString("foo-value")},
41-
{"baz", FieldValue::FromString("baz-value")}}));
42+
{"baz", FieldValue::FromString("baz-value")}});
4243

4344
std::unique_ptr<Mutation> set = SetMutation(
4445
"collection/key", {{"bar", FieldValue::FromString("bar-value")}});
4546
MaybeDocumentPtr set_doc =
4647
set->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
4748
ASSERT_NE(set_doc, nullptr);
4849
ASSERT_EQ(set_doc->type(), MaybeDocument::Type::Document);
49-
EXPECT_EQ(*set_doc.get(), Doc("collection/key", 0,
50-
{{"bar", FieldValue::FromString("bar-value")}},
51-
DocumentState::kLocalMutations));
50+
EXPECT_EQ(*set_doc, *Doc("collection/key", 0,
51+
{{"bar", FieldValue::FromString("bar-value")}},
52+
DocumentState::kLocalMutations));
5253
}
5354

5455
TEST(Mutation, AppliesPatchToDocuments) {
55-
auto base_doc = std::make_shared<Document>(Doc(
56+
MaybeDocumentPtr base_doc = Doc(
5657
"collection/key", 0,
5758
{{"foo",
5859
FieldValue::FromMap({{"bar", FieldValue::FromString("bar-value")}})},
59-
{"baz", FieldValue::FromString("baz-value")}}));
60+
{"baz", FieldValue::FromString("baz-value")}});
6061

6162
std::unique_ptr<Mutation> patch = PatchMutation(
6263
"collection/key", {{"foo.bar", FieldValue::FromString("new-bar-value")}});
6364
MaybeDocumentPtr local =
6465
patch->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
6566
ASSERT_NE(local, nullptr);
6667
EXPECT_EQ(
67-
*local.get(),
68-
Doc("collection/key", 0,
69-
{{"foo", FieldValue::FromMap(
70-
{{"bar", FieldValue::FromString("new-bar-value")}})},
71-
{"baz", FieldValue::FromString("baz-value")}},
72-
DocumentState::kLocalMutations));
68+
*local,
69+
*Doc("collection/key", 0,
70+
{{"foo", FieldValue::FromMap(
71+
{{"bar", FieldValue::FromString("new-bar-value")}})},
72+
{"baz", FieldValue::FromString("baz-value")}},
73+
DocumentState::kLocalMutations));
7374
}
7475

7576
TEST(Mutation, AppliesPatchWithMergeToDocuments) {
76-
auto base_doc = std::make_shared<NoDocument>(DeletedDoc("collection/key", 0));
77+
MaybeDocumentPtr base_doc = DeletedDoc("collection/key", 0);
7778

7879
std::unique_ptr<Mutation> upsert = PatchMutation(
7980
"collection/key", {{"foo.bar", FieldValue::FromString("new-bar-value")}},
@@ -82,11 +83,11 @@ TEST(Mutation, AppliesPatchWithMergeToDocuments) {
8283
upsert->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
8384
ASSERT_NE(new_doc, nullptr);
8485
EXPECT_EQ(
85-
*new_doc.get(),
86-
Doc("collection/key", 0,
87-
{{"foo", FieldValue::FromMap(
88-
{{"bar", FieldValue::FromString("new-bar-value")}})}},
89-
DocumentState::kLocalMutations));
86+
*new_doc,
87+
*Doc("collection/key", 0,
88+
{{"foo", FieldValue::FromMap(
89+
{{"bar", FieldValue::FromString("new-bar-value")}})}},
90+
DocumentState::kLocalMutations));
9091
}
9192

9293
TEST(Mutation, AppliesPatchToNullDocWithMergeToDocuments) {
@@ -99,38 +100,38 @@ TEST(Mutation, AppliesPatchToNullDocWithMergeToDocuments) {
99100
upsert->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
100101
ASSERT_NE(new_doc, nullptr);
101102
EXPECT_EQ(
102-
*new_doc.get(),
103-
Doc("collection/key", 0,
104-
{{"foo", FieldValue::FromMap(
105-
{{"bar", FieldValue::FromString("new-bar-value")}})}},
106-
DocumentState::kLocalMutations));
103+
*new_doc,
104+
*Doc("collection/key", 0,
105+
{{"foo", FieldValue::FromMap(
106+
{{"bar", FieldValue::FromString("new-bar-value")}})}},
107+
DocumentState::kLocalMutations));
107108
}
108109

109110
TEST(Mutation, DeletesValuesFromTheFieldMask) {
110-
auto base_doc = std::make_shared<Document>(Doc(
111+
MaybeDocumentPtr base_doc = Doc(
111112
"collection/key", 0,
112113
{{"foo",
113114
FieldValue::FromMap({{"bar", FieldValue::FromString("bar-value")},
114-
{"baz", FieldValue::FromString("baz-value")}})}}));
115+
{"baz", FieldValue::FromString("baz-value")}})}});
115116

116117
std::unique_ptr<Mutation> patch =
117118
PatchMutation("collection/key", FieldValue::Map(), {Field("foo.bar")});
118119

119120
MaybeDocumentPtr patch_doc =
120121
patch->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
121122
ASSERT_NE(patch_doc, nullptr);
122-
EXPECT_EQ(*patch_doc.get(),
123-
Doc("collection/key", 0,
124-
{{"foo", FieldValue::FromMap(
125-
{{"baz", FieldValue::FromString("baz-value")}})}},
126-
DocumentState::kLocalMutations));
123+
EXPECT_EQ(*patch_doc,
124+
*Doc("collection/key", 0,
125+
{{"foo", FieldValue::FromMap(
126+
{{"baz", FieldValue::FromString("baz-value")}})}},
127+
DocumentState::kLocalMutations));
127128
}
128129

129130
TEST(Mutation, PatchesPrimitiveValue) {
130-
auto base_doc = std::make_shared<Document>(
131+
MaybeDocumentPtr base_doc =
131132
Doc("collection/key", 0,
132133
{{"foo", FieldValue::FromString("foo-value")},
133-
{"baz", FieldValue::FromString("baz-value")}}));
134+
{"baz", FieldValue::FromString("baz-value")}});
134135

135136
std::unique_ptr<Mutation> patch = PatchMutation(
136137
"collection/key", {{"foo.bar", FieldValue::FromString("new-bar-value")}});
@@ -139,17 +140,16 @@ TEST(Mutation, PatchesPrimitiveValue) {
139140
patch->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
140141
ASSERT_NE(patched_doc, nullptr);
141142
EXPECT_EQ(
142-
*patched_doc.get(),
143-
Doc("collection/key", 0,
144-
{{"foo", FieldValue::FromMap(
145-
{{"bar", FieldValue::FromString("new-bar-value")}})},
146-
{"baz", FieldValue::FromString("baz-value")}},
147-
DocumentState::kLocalMutations));
143+
*patched_doc,
144+
*Doc("collection/key", 0,
145+
{{"foo", FieldValue::FromMap(
146+
{{"bar", FieldValue::FromString("new-bar-value")}})},
147+
{"baz", FieldValue::FromString("baz-value")}},
148+
DocumentState::kLocalMutations));
148149
}
149150

150151
TEST(Mutation, PatchingDeletedDocumentsDoesNothing) {
151-
auto base_doc =
152-
std::make_shared<NoDocument>(testutil::DeletedDoc("collection/key", 0));
152+
MaybeDocumentPtr base_doc = testutil::DeletedDoc("collection/key", 0);
153153
std::unique_ptr<Mutation> patch =
154154
PatchMutation("collection/key", {{"foo", FieldValue::FromString("bar")}});
155155
MaybeDocumentPtr patched_doc =
@@ -251,45 +251,45 @@ TEST(Mutation, AppliesServerAckedArrayTransformsToDocuments) {
251251
}
252252

253253
TEST(Mutation, DeleteDeletes) {
254-
auto base_doc = std::make_shared<Document>(
255-
Doc("collection/key", 0, {{"foo", FieldValue::FromString("bar")}}));
254+
MaybeDocumentPtr base_doc =
255+
Doc("collection/key", 0, {{"foo", FieldValue::FromString("bar")}});
256256

257257
std::unique_ptr<Mutation> del = testutil::DeleteMutation("collection/key");
258258
MaybeDocumentPtr deleted_doc =
259259
del->ApplyToLocalView(base_doc, base_doc.get(), Timestamp::Now());
260260

261261
ASSERT_NE(deleted_doc, nullptr);
262-
EXPECT_EQ(*deleted_doc.get(), testutil::DeletedDoc("collection/key", 0));
262+
EXPECT_EQ(*deleted_doc, *testutil::DeletedDoc("collection/key", 0));
263263
}
264264

265265
TEST(Mutation, SetWithMutationResult) {
266-
auto base_doc = std::make_shared<Document>(
267-
Doc("collection/key", 0, {{"foo", FieldValue::FromString("bar")}}));
266+
MaybeDocumentPtr base_doc =
267+
Doc("collection/key", 0, {{"foo", FieldValue::FromString("bar")}});
268268

269269
std::unique_ptr<Mutation> set = SetMutation(
270270
"collection/key", {{"foo", FieldValue::FromString("new-bar")}});
271271
MaybeDocumentPtr set_doc =
272272
set->ApplyToRemoteDocument(base_doc, MutationResult(4));
273273

274274
ASSERT_NE(set_doc, nullptr);
275-
EXPECT_EQ(*set_doc.get(), Doc("collection/key", 4,
276-
{{"foo", FieldValue::FromString("new-bar")}},
277-
DocumentState::kCommittedMutations));
275+
EXPECT_EQ(*set_doc, *Doc("collection/key", 4,
276+
{{"foo", FieldValue::FromString("new-bar")}},
277+
DocumentState::kCommittedMutations));
278278
}
279279

280280
TEST(Mutation, PatchWithMutationResult) {
281-
auto base_doc = std::make_shared<Document>(
282-
Doc("collection/key", 0, {{"foo", FieldValue::FromString("bar")}}));
281+
MaybeDocumentPtr base_doc =
282+
Doc("collection/key", 0, {{"foo", FieldValue::FromString("bar")}});
283283

284284
std::unique_ptr<Mutation> patch = PatchMutation(
285285
"collection/key", {{"foo", FieldValue::FromString("new-bar")}});
286286
MaybeDocumentPtr patch_doc =
287287
patch->ApplyToRemoteDocument(base_doc, MutationResult(4));
288288

289289
ASSERT_NE(patch_doc, nullptr);
290-
EXPECT_EQ(*patch_doc.get(), Doc("collection/key", 4,
291-
{{"foo", FieldValue::FromString("new-bar")}},
292-
DocumentState::kCommittedMutations));
290+
EXPECT_EQ(*patch_doc, *Doc("collection/key", 4,
291+
{{"foo", FieldValue::FromString("new-bar")}},
292+
DocumentState::kCommittedMutations));
293293
}
294294

295295
TEST(Mutation, Transitions) {

‎Firestore/core/test/firebase/firestore/model/precondition_test.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,30 @@ namespace firestore {
2828
namespace model {
2929

3030
TEST(Precondition, None) {
31-
const Precondition none = Precondition::None();
31+
Precondition none = Precondition::None();
3232
EXPECT_EQ(Precondition::Type::None, none.type());
3333
EXPECT_TRUE(none.IsNone());
3434
EXPECT_EQ(SnapshotVersion::None(), none.update_time());
3535

36-
const NoDocument deleted_doc = testutil::DeletedDoc("foo/doc", 1234567);
37-
const Document doc = testutil::Doc("bar/doc", 7654321);
36+
NoDocument deleted_doc = *testutil::DeletedDoc("foo/doc", 1234567);
37+
Document doc = *testutil::Doc("bar/doc", 7654321);
3838
EXPECT_TRUE(none.IsValidFor(&deleted_doc));
3939
EXPECT_TRUE(none.IsValidFor(&doc));
4040
EXPECT_TRUE(none.IsValidFor(nullptr));
4141
}
4242

4343
TEST(Precondition, Exists) {
44-
const Precondition exists = Precondition::Exists(true);
45-
const Precondition no_exists = Precondition::Exists(false);
44+
Precondition exists = Precondition::Exists(true);
45+
Precondition no_exists = Precondition::Exists(false);
4646
EXPECT_EQ(Precondition::Type::Exists, exists.type());
4747
EXPECT_EQ(Precondition::Type::Exists, no_exists.type());
4848
EXPECT_FALSE(exists.IsNone());
4949
EXPECT_FALSE(no_exists.IsNone());
5050
EXPECT_EQ(SnapshotVersion::None(), exists.update_time());
5151
EXPECT_EQ(SnapshotVersion::None(), no_exists.update_time());
5252

53-
const NoDocument deleted_doc = testutil::DeletedDoc("foo/doc", 1234567);
54-
const Document doc = testutil::Doc("bar/doc", 7654321);
53+
NoDocument deleted_doc = *testutil::DeletedDoc("foo/doc", 1234567);
54+
Document doc = *testutil::Doc("bar/doc", 7654321);
5555
EXPECT_FALSE(exists.IsValidFor(&deleted_doc));
5656
EXPECT_TRUE(exists.IsValidFor(&doc));
5757
EXPECT_FALSE(exists.IsValidFor(nullptr));
@@ -61,15 +61,15 @@ TEST(Precondition, Exists) {
6161
}
6262

6363
TEST(Precondition, UpdateTime) {
64-
const Precondition update_time =
64+
Precondition update_time =
6565
Precondition::UpdateTime(testutil::Version(1234567));
6666
EXPECT_EQ(Precondition::Type::UpdateTime, update_time.type());
6767
EXPECT_FALSE(update_time.IsNone());
6868
EXPECT_EQ(testutil::Version(1234567), update_time.update_time());
6969

70-
const NoDocument deleted_doc = testutil::DeletedDoc("foo/doc", 1234567);
71-
const Document not_match = testutil::Doc("bar/doc", 7654321);
72-
const Document match = testutil::Doc("baz/doc", 1234567);
70+
NoDocument deleted_doc = *testutil::DeletedDoc("foo/doc", 1234567);
71+
Document not_match = *testutil::Doc("bar/doc", 7654321);
72+
Document match = *testutil::Doc("baz/doc", 1234567);
7373
EXPECT_FALSE(update_time.IsValidFor(&deleted_doc));
7474
EXPECT_FALSE(update_time.IsValidFor(&not_match));
7575
EXPECT_TRUE(update_time.IsValidFor(&match));

0 commit comments

Comments
 (0)