From 7a4a2ea10844afd6a58dace46854fae74399f55c Mon Sep 17 00:00:00 2001
From: zxu <zxu@google.com>
Date: Tue, 20 Feb 2018 12:25:39 -0500
Subject: replacing FSTGetTokenResult by C++ Token implementation (#805)

* replacing Auth/FSTUser by C++ auth implementation

* address changes

* replacing FSTGetTokenResult by C++ Token implementation

* address changes

* address changes

* fix another const& v.s. dispatch bug

* fix more const& v.s. dispatch bug  zxu123 committed

* fix

* passing by value in callback
---
 .../test/firebase/firestore/auth/credentials_provider_test.cc     | 6 ++----
 .../firebase/firestore/auth/empty_credentials_provider_test.cc    | 5 ++---
 .../firebase/firestore/auth/firebase_credentials_provider_test.mm | 5 ++---
 Firestore/core/test/firebase/firestore/auth/token_test.cc         | 8 ++++++++
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'Firestore/core/test')

diff --git a/Firestore/core/test/firebase/firestore/auth/credentials_provider_test.cc b/Firestore/core/test/firebase/firestore/auth/credentials_provider_test.cc
index 1748422..9ae71ba 100644
--- a/Firestore/core/test/firebase/firestore/auth/credentials_provider_test.cc
+++ b/Firestore/core/test/firebase/firestore/auth/credentials_provider_test.cc
@@ -25,7 +25,7 @@ namespace auth {
 #define UNUSED(x) (void)(x)
 
 TEST(CredentialsProvider, Typedef) {
-  TokenListener token_listener = [](const Token& token,
+  TokenListener token_listener = [](Token token,
                                     const absl::string_view error) {
     UNUSED(token);
     UNUSED(error);
@@ -37,9 +37,7 @@ TEST(CredentialsProvider, Typedef) {
   EXPECT_EQ(nullptr, token_listener);
   EXPECT_FALSE(token_listener);
 
-  UserChangeListener user_change_listener = [](const User& user) {
-    UNUSED(user);
-  };
+  UserChangeListener user_change_listener = [](User user) { UNUSED(user); };
   EXPECT_NE(nullptr, user_change_listener);
   EXPECT_TRUE(user_change_listener);
 
diff --git a/Firestore/core/test/firebase/firestore/auth/empty_credentials_provider_test.cc b/Firestore/core/test/firebase/firestore/auth/empty_credentials_provider_test.cc
index 123f952..39012f0 100644
--- a/Firestore/core/test/firebase/firestore/auth/empty_credentials_provider_test.cc
+++ b/Firestore/core/test/firebase/firestore/auth/empty_credentials_provider_test.cc
@@ -25,8 +25,7 @@ namespace auth {
 TEST(EmptyCredentialsProvider, GetToken) {
   EmptyCredentialsProvider credentials_provider;
   credentials_provider.GetToken(
-      /*force_refresh=*/true,
-      [](const Token& token, const absl::string_view error) {
+      /*force_refresh=*/true, [](Token token, const absl::string_view error) {
         EXPECT_EQ("", token.token());
         const User& user = token.user();
         EXPECT_EQ("", user.uid());
@@ -37,7 +36,7 @@ TEST(EmptyCredentialsProvider, GetToken) {
 
 TEST(EmptyCredentialsProvider, SetListener) {
   EmptyCredentialsProvider credentials_provider;
-  credentials_provider.SetUserChangeListener([](const User& user) {
+  credentials_provider.SetUserChangeListener([](User user) {
     EXPECT_EQ("", user.uid());
     EXPECT_FALSE(user.is_authenticated());
   });
diff --git a/Firestore/core/test/firebase/firestore/auth/firebase_credentials_provider_test.mm b/Firestore/core/test/firebase/firestore/auth/firebase_credentials_provider_test.mm
index 8d2b361..e98d3d8 100644
--- a/Firestore/core/test/firebase/firestore/auth/firebase_credentials_provider_test.mm
+++ b/Firestore/core/test/firebase/firestore/auth/firebase_credentials_provider_test.mm
@@ -65,8 +65,7 @@ TEST_F(FirebaseCredentialsProviderTest, GetToken) {
 
   FirebaseCredentialsProvider credentials_provider([FIRApp defaultApp]);
   credentials_provider.GetToken(
-      /*force_refresh=*/true,
-      [](const Token& token, const absl::string_view error) {
+      /*force_refresh=*/true, [](Token token, const absl::string_view error) {
         EXPECT_EQ("", token.token());
         const User& user = token.user();
         EXPECT_EQ("I'm a fake uid.", user.uid());
@@ -82,7 +81,7 @@ TEST_F(FirebaseCredentialsProviderTest, SetListener) {
   }
 
   FirebaseCredentialsProvider credentials_provider([FIRApp defaultApp]);
-  credentials_provider.SetUserChangeListener([](const User& user) {
+  credentials_provider.SetUserChangeListener([](User user) {
     EXPECT_EQ("I'm a fake uid.", user.uid());
     EXPECT_TRUE(user.is_authenticated());
   });
diff --git a/Firestore/core/test/firebase/firestore/auth/token_test.cc b/Firestore/core/test/firebase/firestore/auth/token_test.cc
index a0f2c48..8f784d6 100644
--- a/Firestore/core/test/firebase/firestore/auth/token_test.cc
+++ b/Firestore/core/test/firebase/firestore/auth/token_test.cc
@@ -26,6 +26,14 @@ TEST(Token, Getter) {
   Token token("token", User("abc"));
   EXPECT_EQ("token", token.token());
   EXPECT_EQ(User("abc"), token.user());
+  EXPECT_TRUE(token.is_valid());
+}
+
+TEST(Token, InvalidToken) {
+  const Token& token = Token::Invalid();
+  EXPECT_ANY_THROW(token.token());
+  EXPECT_EQ(User::Unauthenticated(), token.user());
+  EXPECT_FALSE(token.is_valid());
 }
 
 }  // namespace auth
-- 
cgit v1.2.3