aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/core/test/firebase/firestore/model
diff options
context:
space:
mode:
authorGravatar rsgowman <rgowman@google.com>2018-01-27 19:16:41 -0500
committerGravatar Gil <mcg@google.com>2018-01-27 16:16:41 -0800
commita74d39f02b93c2e7bf121b33ab2164a9ac34e66b (patch)
tree98c9dbf488e6e548a64a0341c6a2e8cd5df878f8 /Firestore/core/test/firebase/firestore/model
parent856c3a09f1d8022fc5a06b086644118fd62efbb0 (diff)
Fix a number of c++ build errors (#715)
* Move -fvisibility-inlines-hidden from common_flags to cxx_flags This option isn't supported by C (and causes the build to fail under at least rodete). Manifested error was: ``` -- Looking for include file openssl/rand.h -- Looking for include file openssl/rand.h - not found CMake Error at core/src/firebase/firestore/util/CMakeLists.txt:94 (message): No implementation for SecureRandom available. -- Configuring incomplete, errors occurred! ``` which is completely misleading. :( * Fix exception include for std::logic_error Was causing compiler error on (at least) rodete. (http://en.cppreference.com/w/cpp/error/logic_error suggests that stdexcept is the correct header.) * Remove 'const' from vector contents. vectors cannot contain const objects as the contained objects are required to be assignable and copy constructable. (Not *quite* strictly true; since c++11, this requirement now depends on the operations performed on the container. But my compiler objects at any rate.) http://en.cppreference.com/w/cpp/container/vector https://stackoverflow.com/questions/8685257/why-cant-you-put-a-const-object-into-a-stl-container * Add brackets as suggested (required) by my compiler. * Add missing include For LLONG_MIN, etc. * Enable gnu extension to c++11 for firestore/util *test*. We disable them by default (in cmake/CompilerSetup.cmake) but our tests requires hexidecimal floating point, which is not supported in c++11 (though is supported in C++17, gnu++11, and others). http://en.cppreference.com/w/cpp/language/floating_literal https://bugzilla.redhat.com/show_bug.cgi?id=1321986 * Fix printf format for uint64_t http://en.cppreference.com/w/cpp/types/integer https://stackoverflow.com/questions/9225567/how-to-print-a-int64-t-type-in-c * Allow 0 length printf template strings in tests. * Get rid of a multi line comment. The backslash is apparently interpreted by the compiler cause the next line to be ignored too. In this case, the next line is (currently) a comment, and would be ignored anyways. (But that doesn't stop the compiler from yelling.) * Run ./scripts/style.sh
Diffstat (limited to 'Firestore/core/test/firebase/firestore/model')
-rw-r--r--Firestore/core/test/firebase/firestore/model/field_value_test.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/Firestore/core/test/firebase/firestore/model/field_value_test.cc b/Firestore/core/test/firebase/firestore/model/field_value_test.cc
index a006d46..702c0f6 100644
--- a/Firestore/core/test/firebase/firestore/model/field_value_test.cc
+++ b/Firestore/core/test/firebase/firestore/model/field_value_test.cc
@@ -16,6 +16,8 @@
#include "Firestore/core/src/firebase/firestore/model/field_value.h"
+#include <limits.h>
+
#include <vector>
#include "gtest/gtest.h"
@@ -152,15 +154,14 @@ TEST(FieldValue, GeoPointType) {
}
TEST(FieldValue, ArrayType) {
- const FieldValue empty =
- FieldValue::ArrayValue(std::vector<const FieldValue>{});
- std::vector<const FieldValue> array{FieldValue::NullValue(),
- FieldValue::BooleanValue(true),
- FieldValue::BooleanValue(false)};
+ const FieldValue empty = FieldValue::ArrayValue(std::vector<FieldValue>{});
+ std::vector<FieldValue> array{FieldValue::NullValue(),
+ FieldValue::BooleanValue(true),
+ FieldValue::BooleanValue(false)};
// copy the array
const FieldValue small = FieldValue::ArrayValue(array);
- std::vector<const FieldValue> another_array{FieldValue::BooleanValue(true),
- FieldValue::BooleanValue(false)};
+ std::vector<FieldValue> another_array{FieldValue::BooleanValue(true),
+ FieldValue::BooleanValue(false)};
// move the array
const FieldValue large = FieldValue::ArrayValue(std::move(another_array));
EXPECT_EQ(Type::Array, empty.type());
@@ -288,18 +289,17 @@ TEST(FieldValue, Copy) {
clone = null_value;
EXPECT_EQ(FieldValue::NullValue(), clone);
- const FieldValue array_value =
- FieldValue::ArrayValue(std::vector<const FieldValue>{
- FieldValue::TrueValue(), FieldValue::FalseValue()});
+ const FieldValue array_value = FieldValue::ArrayValue(std::vector<FieldValue>{
+ FieldValue::TrueValue(), FieldValue::FalseValue()});
clone = array_value;
- EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{
+ EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{
FieldValue::TrueValue(), FieldValue::FalseValue()}),
clone);
- EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{
+ EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{
FieldValue::TrueValue(), FieldValue::FalseValue()}),
array_value);
clone = clone;
- EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{
+ EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{
FieldValue::TrueValue(), FieldValue::FalseValue()}),
clone);
clone = null_value;
@@ -385,10 +385,10 @@ TEST(FieldValue, Move) {
clone = null_value;
EXPECT_EQ(FieldValue::NullValue(), clone);
- FieldValue array_value = FieldValue::ArrayValue(std::vector<const FieldValue>{
+ FieldValue array_value = FieldValue::ArrayValue(std::vector<FieldValue>{
FieldValue::TrueValue(), FieldValue::FalseValue()});
clone = std::move(array_value);
- EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{
+ EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{
FieldValue::TrueValue(), FieldValue::FalseValue()}),
clone);
clone = FieldValue::NullValue();
@@ -417,7 +417,7 @@ TEST(FieldValue, CompareMixedType) {
const FieldValue blob_value = FieldValue::BlobValue(Bytes("abc"), 4);
const FieldValue geo_point_value = FieldValue::GeoPointValue({1, 2});
const FieldValue array_value =
- FieldValue::ArrayValue(std::vector<const FieldValue>());
+ FieldValue::ArrayValue(std::vector<FieldValue>());
const FieldValue object_value =
FieldValue::ObjectValue(std::map<const std::string, const FieldValue>());
EXPECT_TRUE(null_value < true_value);