From 137ce37363d72ac1d643ea9f93bc6e6665367e57 Mon Sep 17 00:00:00 2001 From: rsgowman Date: Fri, 22 Jun 2018 16:17:25 -0400 Subject: Fix a few implicit converstion warnings (#1439) Were showing up in xcode build (but not cmake build) --- .../firestore/local/local_serializer_test.cc | 6 +++-- .../firebase/firestore/remote/serializer_test.cc | 28 ++++++++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) (limited to 'Firestore/core/test') diff --git a/Firestore/core/test/firebase/firestore/local/local_serializer_test.cc b/Firestore/core/test/firebase/firestore/local/local_serializer_test.cc index 76e2ef5..a4543ab 100644 --- a/Firestore/core/test/firebase/firestore/local/local_serializer_test.cc +++ b/Firestore/core/test/firebase/firestore/local/local_serializer_test.cc @@ -102,7 +102,8 @@ class LocalSerializerTest : public ::testing::Test { EXPECT_EQ(type, model.type()); std::vector bytes = EncodeMaybeDocument(&serializer, model); firestore::client::MaybeDocument actual_proto; - bool ok = actual_proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = actual_proto.ParseFromArray(bytes.data(), + static_cast(bytes.size())); EXPECT_TRUE(ok); EXPECT_TRUE(msg_diff.Compare(proto, actual_proto)) << message_differences; } @@ -112,7 +113,8 @@ class LocalSerializerTest : public ::testing::Test { const firestore::client::MaybeDocument& proto, MaybeDocument::Type type) { std::vector bytes(proto.ByteSizeLong()); - bool status = proto.SerializeToArray(bytes.data(), bytes.size()); + bool status = + proto.SerializeToArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(status); StatusOr> actual_model_status = serializer.DecodeMaybeDocument(bytes); diff --git a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc index 1125fb4..fb08488 100644 --- a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc @@ -165,7 +165,8 @@ class SerializerTest : public ::testing::Test { std::vector bytes = EncodeFieldValue(&serializer, FieldValue::NullValue()); v1beta1::Value proto; - bool ok = proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = + proto.ParseFromArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(ok); return proto; } @@ -199,7 +200,8 @@ class SerializerTest : public ::testing::Test { std::vector bytes = EncodeFieldValue(&serializer, FieldValue::BooleanValue(b)); v1beta1::Value proto; - bool ok = proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = + proto.ParseFromArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(ok); return proto; } @@ -208,7 +210,8 @@ class SerializerTest : public ::testing::Test { std::vector bytes = EncodeFieldValue(&serializer, FieldValue::IntegerValue(i)); v1beta1::Value proto; - bool ok = proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = + proto.ParseFromArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(ok); return proto; } @@ -221,7 +224,8 @@ class SerializerTest : public ::testing::Test { std::vector bytes = EncodeFieldValue(&serializer, FieldValue::StringValue(s)); v1beta1::Value proto; - bool ok = proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = + proto.ParseFromArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(ok); return proto; } @@ -230,7 +234,8 @@ class SerializerTest : public ::testing::Test { std::vector bytes = EncodeFieldValue(&serializer, FieldValue::TimestampValue(ts)); v1beta1::Value proto; - bool ok = proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = + proto.ParseFromArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(ok); return proto; } @@ -266,7 +271,8 @@ class SerializerTest : public ::testing::Test { EXPECT_EQ(type, model.type()); std::vector bytes = EncodeFieldValue(&serializer, model); v1beta1::Value actual_proto; - bool ok = actual_proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = actual_proto.ParseFromArray(bytes.data(), + static_cast(bytes.size())); EXPECT_TRUE(ok); EXPECT_TRUE(msg_diff.Compare(proto, actual_proto)) << message_differences; } @@ -276,7 +282,7 @@ class SerializerTest : public ::testing::Test { FieldValue::Type type) { size_t size = proto.ByteSizeLong(); std::vector bytes(size); - bool status = proto.SerializeToArray(bytes.data(), size); + bool status = proto.SerializeToArray(bytes.data(), static_cast(size)); EXPECT_TRUE(status); StatusOr actual_model_status = serializer.DecodeFieldValue(bytes); @@ -293,7 +299,8 @@ class SerializerTest : public ::testing::Test { const v1beta1::BatchGetDocumentsResponse& proto) { std::vector bytes = EncodeDocument(&serializer, key, value); v1beta1::Document actual_proto; - bool ok = actual_proto.ParseFromArray(bytes.data(), bytes.size()); + bool ok = actual_proto.ParseFromArray(bytes.data(), + static_cast(bytes.size())); EXPECT_TRUE(ok); // Note that the client can only serialize Documents (and cannot serialize @@ -325,7 +332,7 @@ class SerializerTest : public ::testing::Test { const v1beta1::BatchGetDocumentsResponse& proto) { size_t size = proto.ByteSizeLong(); std::vector bytes(size); - bool status = proto.SerializeToArray(bytes.data(), size); + bool status = proto.SerializeToArray(bytes.data(), static_cast(size)); EXPECT_TRUE(status); StatusOr> actual_model_status = serializer.DecodeMaybeDocument(bytes); @@ -893,7 +900,8 @@ TEST_F(SerializerTest, DecodeMaybeDocWithoutFoundOrMissingSetShouldFail) { v1beta1::BatchGetDocumentsResponse proto; std::vector bytes(proto.ByteSizeLong()); - bool status = proto.SerializeToArray(bytes.data(), bytes.size()); + bool status = + proto.SerializeToArray(bytes.data(), static_cast(bytes.size())); EXPECT_TRUE(status); ExpectFailedStatusDuringMaybeDocumentDecode( -- cgit v1.2.3