Address code review comments.

Author: ehsannas

firestore/integration_test_internal/src/settings_test.cc

@@ -1,52 +1,61 @@
 // Copyright 2021 Google LLC
 
-#include <future>
-#include <map>
-#include <string>
+#include <stdint.h>
 
 #include "firebase/firestore.h"
-#include "firestore_integration_test.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace firebase {
 namespace firestore {
+namespace {
 
-using SettingsTest = FirestoreIntegrationTest;
+using SettingsTest = testing::Test;
 
 TEST_F(SettingsTest, Equality) {
-  int64_t five_mb = 5 * 1024 * 1024;
-  int64_t six_mb = 6 * 1024 * 1024;
+  constexpr int64_t kFiveMb = 5 * 1024 * 1024;
+  constexpr int64_t kSixMb = 6 * 1024 * 1024;
 
   Settings settings1;
   settings1.set_host("foo");
   settings1.set_ssl_enabled(true);
   settings1.set_persistence_enabled(true);
-  settings1.set_cache_size_bytes(five_mb);
+  settings1.set_cache_size_bytes(kFiveMb);
 
   Settings settings2;
   settings2.set_host("bar");
   settings2.set_ssl_enabled(true);
   settings2.set_persistence_enabled(true);
-  settings2.set_cache_size_bytes(five_mb);
+  settings2.set_cache_size_bytes(kFiveMb);
 
   Settings settings3;
   settings3.set_host("foo");
   settings3.set_ssl_enabled(false);
   settings3.set_persistence_enabled(true);
-  settings3.set_cache_size_bytes(five_mb);
+  settings3.set_cache_size_bytes(kFiveMb);
 
   Settings settings4;
   settings4.set_host("foo");
   settings4.set_ssl_enabled(true);
   settings4.set_persistence_enabled(false);
-  settings4.set_cache_size_bytes(five_mb);
+  settings4.set_cache_size_bytes(kFiveMb);
 
   Settings settings5;
   settings5.set_host("foo");
   settings5.set_ssl_enabled(true);
   settings5.set_persistence_enabled(true);
-  settings5.set_cache_size_bytes(six_mb);
+  settings5.set_cache_size_bytes(kSixMb);
+
+  // This is the same as settings4.
+  Settings settings6;
+  settings6.set_host("foo");
+  settings6.set_ssl_enabled(true);
+  settings6.set_persistence_enabled(false);
+  settings6.set_cache_size_bytes(kFiveMb);
 
   EXPECT_TRUE(settings1 == settings1);
+  EXPECT_TRUE(settings6 == settings4);
 
   EXPECT_FALSE(settings1 == settings2);
   EXPECT_FALSE(settings1 == settings3);
@@ -59,6 +68,9 @@ TEST_F(SettingsTest, Equality) {
   EXPECT_FALSE(settings3 == settings5);
   EXPECT_FALSE(settings4 == settings5);
 
+  EXPECT_FALSE(settings1 != settings1);
+  EXPECT_FALSE(settings6 != settings4);
+
   EXPECT_TRUE(settings1 != settings2);
   EXPECT_TRUE(settings1 != settings3);
   EXPECT_TRUE(settings1 != settings4);
@@ -70,5 +82,7 @@ TEST_F(SettingsTest, Equality) {
   EXPECT_TRUE(settings3 != settings5);
   EXPECT_TRUE(settings4 != settings5);
 }
+
+}  // anonymous namespace
 }  // namespace firestore
 }  // namespace firebase