From ea3369c192c998d947a2fb6caed7df336f028d98 Mon Sep 17 00:00:00 2001 From: Gil Date: Tue, 19 Dec 2017 07:44:28 -0800 Subject: Use angle brackets for nonlocal #includes in Firestore (#580) --- Firestore/Example/Firestore.xcodeproj/project.pbxproj | 2 ++ Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm | 3 ++- Firestore/Port/string_util_test.cc | 5 ++--- Firestore/core/test/firebase/firestore/util/autoid_test.cc | 2 +- Firestore/core/test/firebase/firestore/util/secure_random_test.cc | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'Firestore') diff --git a/Firestore/Example/Firestore.xcodeproj/project.pbxproj b/Firestore/Example/Firestore.xcodeproj/project.pbxproj index 437b661..6823ab1 100644 --- a/Firestore/Example/Firestore.xcodeproj/project.pbxproj +++ b/Firestore/Example/Firestore.xcodeproj/project.pbxproj @@ -1451,6 +1451,7 @@ "$(inherited)", "\"${PODS_ROOT}/../../..\"", "\"${PODS_ROOT}/leveldb-library/include\"", + "\"${PODS_ROOT}/GoogleTest/googletest/include\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; @@ -1482,6 +1483,7 @@ "$(inherited)", "\"${PODS_ROOT}/../../..\"", "\"${PODS_ROOT}/leveldb-library/include\"", + "\"${PODS_ROOT}/GoogleTest/googletest/include\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; diff --git a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm index 4fc77ed..18dfaf3 100644 --- a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm +++ b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm @@ -17,8 +17,9 @@ #import #import +#include + #include "Firestore/Source/Util/FSTAssert.h" -#include "gtest/gtest.h" /** * An XCTest test case that finds C++ test cases written in the GoogleTest framework, runs them, and diff --git a/Firestore/Port/string_util_test.cc b/Firestore/Port/string_util_test.cc index ac8ce56..331f96e 100644 --- a/Firestore/Port/string_util_test.cc +++ b/Firestore/Port/string_util_test.cc @@ -16,9 +16,8 @@ #include "Firestore/Port/string_util.h" -#include "leveldb/db.h" - -#include "gtest/gtest.h" +#include +#include using Firestore::PrefixSuccessor; using Firestore::ImmediateSuccessor; diff --git a/Firestore/core/test/firebase/firestore/util/autoid_test.cc b/Firestore/core/test/firebase/firestore/util/autoid_test.cc index 730c683..e55a8e9 100644 --- a/Firestore/core/test/firebase/firestore/util/autoid_test.cc +++ b/Firestore/core/test/firebase/firestore/util/autoid_test.cc @@ -18,7 +18,7 @@ #include -#include "gtest/gtest.h" +#include using firebase::firestore::util::CreateAutoId; diff --git a/Firestore/core/test/firebase/firestore/util/secure_random_test.cc b/Firestore/core/test/firebase/firestore/util/secure_random_test.cc index f96f3de..ee2ae00 100644 --- a/Firestore/core/test/firebase/firestore/util/secure_random_test.cc +++ b/Firestore/core/test/firebase/firestore/util/secure_random_test.cc @@ -16,7 +16,7 @@ #include "Firestore/core/src/firebase/firestore/util/secure_random.h" -#include "gtest/gtest.h" +#include using firebase::firestore::util::SecureRandom; -- cgit v1.2.3