Integrate Latest @ 201420902

jonsimantov · jonsimantov · commit 2e5501e397af · 2018-06-22T09:28:55.000-07:00
Changes to auth/testapp ...
- Expect linking with the same credential to error.
Changes to dynamic_links/testapp ...
- Remove the explicit firebase-core Android dependency.
Changes to functions/testapp ...
- Change the testapp to verify the result of addNumbers.
Changes to invites/testapp ...
- Remove the explicit firebase-core Android dependency.
Changes to messaging/testapp ...
- Add instructions to readme about enabling push notifications.

CL: 201420902
diff --git a/auth/testapp/src/common_main.cc b/auth/testapp/src/common_main.cc
@@ -716,6 +716,35 @@ extern "C" int common_main(int argc, const char* argv[]) {
         }
       }
 
+      // Test User::UpdateUserProfile
+      {
+        Future<User*> sign_in_future = auth->SignInWithEmailAndPassword(
+            user_login.email(), user_login.password());
+        WaitForSignInFuture(
+            sign_in_future,
+            "Auth::SignInWithEmailAndPassword() existing email and password",
+            kAuthErrorNone, auth);
+        if (sign_in_future.error() == kAuthErrorNone) {
+          User* user = *sign_in_future.result();
+          const char* kDisplayName = "Hello World";
+          const char* kPhotoUrl = "http://test.com/image.jpg";
+          User::UserProfile user_profile;
+          user_profile.display_name = kDisplayName;
+          user_profile.photo_url = kPhotoUrl;
+          Future<void> update_profile_future =
+              user->UpdateUserProfile(user_profile);
+          WaitForFuture(update_profile_future, "User::UpdateUserProfile",
+                        kAuthErrorNone);
+          if (update_profile_future.error() == kAuthErrorNone) {
+            ExpectStringsEqual("User::display_name", kDisplayName,
+                               user->display_name().c_str());
+            ExpectStringsEqual("User::photo_url", kPhotoUrl,
+                               user->photo_url().c_str());
+          }
+        }
+      }
+
+
       // Sign in anonymously, link an email credential, reauthenticate with the
       // credential, unlink the credential and finally sign out.
       {
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -91,7 +91,6 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.1'
   compile 'com.google.firebase:firebase-invites:16.0.0'
   compile 'com.google.firebase:firebase-common:16.0.0'
 }
diff --git a/functions/testapp/src/common_main.cc b/functions/testapp/src/common_main.cc
@@ -128,8 +128,16 @@ extern "C" int common_main(int argc, const char* argv[]) {
     LogMessage("  Error %d: %s", future.error(), future.error_message());
   } else {
     firebase::Variant result = future.result()->data();
-    int64_t op_result = result.map()["operationResult"].int64_value();
-    LogMessage("Result: %d", op_result);
+    int op_result =
+        static_cast<int>(result.map()["operationResult"].int64_value());
+    const int expected = 12;
+    if (op_result != expected) {
+      LogMessage("FAILED!");
+      LogMessage("  Expected: %d, Actual: %d", expected, op_result);
+    } else {
+      LogMessage("SUCCESS.");
+      LogMessage("  Got expected result: %d", op_result);
+    }
   }
 
   LogMessage("Shutting down the Functions library.");
diff --git a/invites/testapp/build.gradle b/invites/testapp/build.gradle
@@ -91,7 +91,6 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.1'
   compile 'com.google.firebase:firebase-invites:16.0.0'
   compile 'com.google.firebase:firebase-common:16.0.0'
 }
diff --git a/messaging/testapp/readme.md b/messaging/testapp/readme.md
@@ -66,6 +66,19 @@ Building and Running the testapp
             [APNs](https://developer.apple.com/library/ios/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/ApplePushService.html)
             certificate. If you don't already have one, see
             [Provisioning APNs SSL Certificates.](https://firebase.google.com/docs/cloud-messaging/ios/certs)
+  - Configure the Xcode project for push messaging.
+      - Select the `testapp` project from the `Navigator area`.
+      - Select the `testapp` target from the `Editor area`.
+      - Select the `General` tab from the `Editor area`.
+      - Scroll down to `Linked Frameworks and Libraries` and click the `+`
+        button to add a framework.
+        - In the window that appears, scroll to `UserNotifications.framework`
+          and click on that entry, then click on `Add`. This framework will only
+          appear in Xcode version 8 and higher, required by this library.
+      - Select the `Capabilities` tab from the `Editor area`.
+      - Switch `Push Notifications` to `On`.
+      - Scroll down to `Background Modes` and switch it to `On`.
+      - Tick the `Remote notifications` box under `Background Modes`.
   - In XCode, build & run the sample on an iOS device or simulator.
   - The testapp has no user interface. The output of the app can be viewed
     via the console.  In Xcode,  select

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@ android {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`dependencies {`
`94`		`- compile 'com.google.firebase:firebase-core:16.0.1'`
`95`	`94`	`compile 'com.google.firebase:firebase-invites:16.0.0'`
`96`	`95`	`compile 'com.google.firebase:firebase-common:16.0.0'`
`97`	`96`	`}`