4 files changed, 20 insertions, 24 deletions
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
index e51bb51..7f0539c 100644
--- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
@@ -14,33 +14,30 @@
 
 cc_test(
   firebase_firestore_util_test
-  autoid_test.cc
-  secure_random_test.cc
-  string_printf_test.cc
-)
-target_link_libraries(
-  firebase_firestore_util_test
-  firebase_firestore_util
+  SOURCES
+    autoid_test.cc
+    secure_random_test.cc
+    string_printf_test.cc
+  DEPENDS
+    firebase_firestore_util
 )
 
 if(APPLE)
   cc_test(
     firebase_firestore_util_apple_test
-    assert_test.cc
-    log_test.cc
-  )
-  target_link_libraries(
-    firebase_firestore_util_apple_test
-    firebase_firestore_util_apple
+    SOURCES
+      assert_test.cc
+      log_test.cc
+    DEPENDS
+      firebase_firestore_util_apple
   )
 endif(APPLE)
 
 cc_test(
   firebase_firestore_util_stdio_test
-  assert_test.cc
-  log_test.cc
-)
-target_link_libraries(
-  firebase_firestore_util_stdio_test
-  firebase_firestore_util_stdio
+  SOURCES
+    assert_test.cc
+    log_test.cc
+  DEPENDS
+    firebase_firestore_util_stdio
 )
diff --git a/Firestore/core/test/firebase/firestore/util/assert_test.cc b/Firestore/core/test/firebase/firestore/util/assert_test.cc
index 7c49462..fb15e61 100644
--- a/Firestore/core/test/firebase/firestore/util/assert_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/assert_test.cc
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
-
 #include <exception>
 
+#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
 #include "gtest/gtest.h"
 
 namespace firebase {
diff --git a/Firestore/core/test/firebase/firestore/util/autoid_test.cc b/Firestore/core/test/firebase/firestore/util/autoid_test.cc
index e55a8e9..079b990 100644
--- a/Firestore/core/test/firebase/firestore/util/autoid_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/autoid_test.cc
@@ -25,8 +25,8 @@ using firebase::firestore::util::CreateAutoId;
 TEST(AutoId, IsSane) {
   for (int i = 0; i < 50; i++) {
     std::string auto_id = CreateAutoId();
-    EXPECT_EQ(20, auto_id.length());
-    for (int pos = 0; pos < 20; pos++) {
+    EXPECT_EQ(20u, auto_id.length());
+    for (size_t pos = 0; pos < 20; pos++) {
       char c = auto_id[pos];
       EXPECT_TRUE(isalpha(c) || isdigit(c))
           << "Should be printable ascii character: '" << c << "' in \""
diff --git a/Firestore/core/test/firebase/firestore/util/string_printf_test.cc b/Firestore/core/test/firebase/firestore/util/string_printf_test.cc
index 76f7cde..085be84 100644
--- a/Firestore/core/test/firebase/firestore/util/string_printf_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/string_printf_test.cc
@@ -64,7 +64,7 @@ TEST(StringPrintf, DontOverwriteErrno) {
 
 TEST(StringPrintf, LargeBuf) {
   // Check that the large buffer is handled correctly.
-  int n = 2048;
+  size_t n = 2048;
   char* buf = new char[n + 1];
   memset(buf, ' ', n);
   buf[n] = 0;