Integrate Latest @ 138260531

Changes to all testapps ... - Increment Firebase C++ SDK version to 2.0.0, and Firebase Android to 9.8.0. Changes to admob/testapp ... - Add support for Native Express ads. Changes to auth/testapp ... - Add AuthStateListener API for callers to get auth state changes. - Minor fix of log message typo. Changes to database/testapp ... - Added Firebase Realtime Database test app. Changes to invites/testapp ... - Support simplified C++ Invites API, removing InvitesSender and InvitesReceiver. Changes to messaging/testapp ... - Update to use MessageForwardingService on Android. Changes to remote_config/testapp ... - Fixed assert in desktop build of remote config sample. CL: 138260531

Author: jonsimantov

admob/testapp/build.gradle

@@ -89,8 +89,8 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.firebase:firebase-ads:9.6.0'
- compile 'com.google.android.gms:play-services-base:9.6.0'
+ compile 'com.google.firebase:firebase-ads:9.8.0'
+ compile 'com.google.android.gms:play-services-base:9.8.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

admob/testapp/src/common_main.cc

@@ -15,6 +15,7 @@
 #include "firebase/admob.h"
 #include "firebase/admob/banner_view.h"
 #include "firebase/admob/interstitial_ad.h"
+#include "firebase/admob/native_express_ad_view.h"
 #include "firebase/admob/rewarded_video.h"
 #include "firebase/admob/types.h"
 #include "firebase/app.h"
@@ -53,6 +54,27 @@ class LoggingInterstitialAdListener
  }
 };
 
+// A simple listener that logs changes to a NativeExpressAdView.
+class LoggingNativeExpressAdViewListener
+ : public firebase::admob::NativeExpressAdView::Listener {
+ public:
+ LoggingNativeExpressAdViewListener() {}
+ void OnPresentationStateChanged(
+ firebase::admob::NativeExpressAdView* native_express_ad_view,
+ firebase::admob::NativeExpressAdView::PresentationState state) override {
+ ::LogMessage("NativeExpressAdView PresentationState has changed to %d.",
+ state);
+ }
+ void OnBoundingBoxChanged(
+ firebase::admob::NativeExpressAdView* native_express_ad_view,
+ firebase::admob::BoundingBox box) override {
+ ::LogMessage(
+ "NativeExpressAdView BoundingBox has changed to (x: %d, y: %d, width: "
+ "%d, height %d).",
+ box.x, box.y, box.width, box.height);
+ }
+};
+
 // A simple listener that logs changes to rewarded video state.
 class LoggingRewardedVideoListener
  : public firebase::admob::rewarded_video::Listener {
@@ -79,17 +101,23 @@ const char* kAdMobAppID = "ca-app-pub-3940256099942544~1458002511";
 #if defined(__ANDROID__)
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/6300978111";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/1033173712";
+const char* kNativeExpressAdUnit = "ca-app-pub-3940256099942544/1072772517";
 const char* kRewardedVideoAdUnit = "YOUR_REWARDED_VIDEO_AD_UNIT_ID";
 #else
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/2934735716";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/4411468910";
+const char* kNativeExpressAdUnit = "ca-app-pub-3940256099942544/2562852117";
 const char* kRewardedVideoAdUnit = "YOUR_REWARDED_VIDEO_AD_UNIT_ID";
 #endif
 
 // Standard mobile banner size is 320x50.
 static const int kBannerWidth = 320;
 static const int kBannerHeight = 50;
 
+// The native express ad's width and height.
+static const int kNativeExpressAdWidth = 320;
+static const int kNativeExpressAdHeight = 220;
+
 // Sample keywords to use in making the request.
 static const char* kKeywords[] = {"AdMob", "C++", "Fun"};
 
@@ -121,10 +149,9 @@ extern "C" int common_main(int argc, const char* argv[]) {
  LogMessage("Initializing the AdMob library.");
 
 #if defined(__ANDROID__)
- app =
- firebase::App::Create(firebase::AppOptions(), GetJniEnv(), GetActivity());
+ app = ::firebase::App::Create(GetJniEnv(), GetActivity());
 #else
- app = firebase::App::Create(firebase::AppOptions());
+ app = ::firebase::App::Create();
 #endif // defined(__ANDROID__)
 
  LogMessage("Created the Firebase App %x.",
@@ -174,33 +201,33 @@ extern "C" int common_main(int argc, const char* argv[]) {
  request.test_device_ids = kTestDeviceIDs;
 
  // Create an ad size for the BannerView.
- firebase::admob::AdSize ad_size;
- ad_size.ad_size_type = firebase::admob::kAdSizeStandard;
- ad_size.width = kBannerWidth;
- ad_size.height = kBannerHeight;
+ firebase::admob::AdSize banner_ad_size;
+ banner_ad_size.ad_size_type = firebase::admob::kAdSizeStandard;
+ banner_ad_size.width = kBannerWidth;
+ banner_ad_size.height = kBannerHeight;
 
  LogMessage("Creating the BannerView.");
  firebase::admob::BannerView* banner = new firebase::admob::BannerView();
- banner->Initialize(GetWindowContext(), kBannerAdUnit, ad_size);
+ banner->Initialize(GetWindowContext(), kBannerAdUnit, banner_ad_size);
 
  WaitForFutureCompletion(banner->InitializeLastResult());
 
  // Set the listener.
  LoggingBannerViewListener banner_listener;
  banner->SetListener(&banner_listener);
 
+ // Load the banner ad.
+ LogMessage("Loading a banner ad.");
+ banner->LoadAd(request);
+
+ WaitForFutureCompletion(banner->LoadAdLastResult());
+
  // Make the BannerView visible.
  LogMessage("Showing the banner ad.");
  banner->Show();
 
  WaitForFutureCompletion(banner->ShowLastResult());
 
- // When the BannerView is visible, load an ad into it.
- LogMessage("Loading a banner ad.");
- banner->LoadAd(request);
-
- WaitForFutureCompletion(banner->LoadAdLastResult());
-
  // Move to each of the six pre-defined positions.
  LogMessage("Moving the banner ad to top-center.");
  banner->MoveTo(firebase::admob::BannerView::kPositionTop);
@@ -301,6 +328,110 @@ extern "C" int common_main(int argc, const char* argv[]) {
  ProcessEvents(1000);
  }
 
+ // Create an ad size for the NativeExpressAdView.
+ firebase::admob::AdSize native_express_ad_size;
+ native_express_ad_size.ad_size_type = firebase::admob::kAdSizeStandard;
+ native_express_ad_size.width = kNativeExpressAdWidth;
+ native_express_ad_size.height = kNativeExpressAdHeight;
+
+ LogMessage("Creating the NativeExpressAdView.");
+ firebase::admob::NativeExpressAdView* native_express_ad =
+ new firebase::admob::NativeExpressAdView();
+ native_express_ad->Initialize(GetWindowContext(), kNativeExpressAdUnit,
+ native_express_ad_size);
+
+ WaitForFutureCompletion(native_express_ad->InitializeLastResult());
+
+ // Set the listener.
+ LoggingNativeExpressAdViewListener native_express_ad_listener;
+ native_express_ad->SetListener(&native_express_ad_listener);
+
+ // Load the native express ad.
+ LogMessage("Loading a native express ad.");
+ native_express_ad->LoadAd(request);
+
+ WaitForFutureCompletion(native_express_ad->LoadAdLastResult());
+
+ // Make the NativeExpressAdView visible.
+ LogMessage("Showing the native express ad.");
+ native_express_ad->Show();
+
+ WaitForFutureCompletion(native_express_ad->ShowLastResult());
+
+ // Move to each of the six pre-defined positions.
+ LogMessage("Moving the native express ad to top-center.");
+ native_express_ad->MoveTo(firebase::admob::NativeExpressAdView::kPositionTop);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to top-left.");
+ native_express_ad->MoveTo(
+ firebase::admob::NativeExpressAdView::kPositionTopLeft);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to top-right.");
+ native_express_ad->MoveTo(
+ firebase::admob::NativeExpressAdView::kPositionTopRight);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to bottom-center.");
+ native_express_ad->MoveTo(
+ firebase::admob::NativeExpressAdView::kPositionBottom);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to bottom-left.");
+ native_express_ad->MoveTo(
+ firebase::admob::NativeExpressAdView::kPositionBottomLeft);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to bottom-right.");
+ native_express_ad->MoveTo(
+ firebase::admob::NativeExpressAdView::kPositionBottomRight);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ // Try some coordinate moves.
+ LogMessage("Moving the native express ad to (100, 300).");
+ native_express_ad->MoveTo(100, 300);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to (100, 400).");
+ native_express_ad->MoveTo(100, 400);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ // Try hiding and showing the NativeExpressAdView.
+ LogMessage("Hiding the native express ad.");
+ native_express_ad->Hide();
+
+ WaitForFutureCompletion(native_express_ad->HideLastResult());
+
+ LogMessage("Showing the native express ad.");
+ native_express_ad->Show();
+
+ WaitForFutureCompletion(native_express_ad->ShowLastResult());
+
+ // A few last moves after showing it again.
+ LogMessage("Moving the native express ad to (100, 300).");
+ native_express_ad->MoveTo(100, 300);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Moving the native express ad to (100, 400).");
+ native_express_ad->MoveTo(100, 400);
+
+ WaitForFutureCompletion(native_express_ad->MoveToLastResult());
+
+ LogMessage("Hiding the native express ad now that we're done with it.");
+ native_express_ad->Hide();
+
+ WaitForFutureCompletion(native_express_ad->HideLastResult());
+
  // Start up rewarded video ads and associated mediation adapters.
  LogMessage("Initializing rewarded video.");
  namespace rewarded_video = firebase::admob::rewarded_video;
@@ -355,6 +486,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
 
  delete banner;
  delete interstitial;
+ delete native_express_ad;
  rewarded_video::Destroy();
  firebase::admob::Terminate();
  delete app;

analytics/testapp/build.gradle

@@ -90,8 +90,8 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.firebase:firebase-analytics:9.6.0'
- compile 'com.google.android.gms:play-services-base:9.6.0'
+ compile 'com.google.firebase:firebase-analytics:9.8.0'
+ compile 'com.google.android.gms:play-services-base:9.8.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

analytics/testapp/src/common_main.cc

@@ -27,21 +27,12 @@ extern "C" int common_main(int argc, const char* argv[]) {
  ::firebase::App* app;
 
  LogMessage("Initialize the Analytics library");
- do {
 #if defined(__ANDROID__)
- app = ::firebase::App::Create(::firebase::AppOptions(), GetJniEnv(),
- GetActivity());
+ app = ::firebase::App::Create(GetJniEnv(), GetActivity());
 #else
-  app = ::firebase::App::Create(::firebase::AppOptions());
+ app = ::firebase::App::Create();
 #endif // defined(__ANDROID__)
 
- if (app == nullptr) {
- LogMessage("Couldn't create firebase app, try again.");
- // Wait a few moments, and try to create app again.
- ProcessEvents(1000);
- }
- } while (app == nullptr);
-
  LogMessage("Created the firebase app %x",
  static_cast<int>(reinterpret_cast<intptr_t>(app)));
  analytics::Initialize(*app);

auth/testapp/build.gradle

@@ -90,8 +90,8 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.firebase:firebase-auth:9.6.0'
- compile 'com.google.android.gms:play-services-base:9.6.0'
+ compile 'com.google.firebase:firebase-auth:9.8.0'
+ compile 'com.google.android.gms:play-services-base:9.8.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

auth/testapp/src/common_main.cc

@@ -155,11 +155,38 @@ static void ExpectStringsEqual(const char* test, const char* expected,
  }
 }
 
+class AuthStateChangeCounter : public firebase::auth::AuthStateListener {
+ public:
+ AuthStateChangeCounter() : num_state_changes_(0) {}
+
+ virtual void OnAuthStateChanged(Auth* auth) { num_state_changes_++; }
+
+ void CompleteTest(const char* test_name, int expected_state_changes) {
+ CompleteTest(test_name, expected_state_changes, expected_state_changes);
+ }
+
+ void CompleteTest(const char* test_name, int min_state_changes,
+ int max_state_changes) {
+ const bool success = min_state_changes <= num_state_changes_ &&
+ num_state_changes_ <= max_state_changes;
+ LogMessage("%sAuthStateListener called %d time%s on %s.",
+ success ? "" : "ERROR: ", num_state_changes_,
+ num_state_changes_ == 1 ? "" : "s", test_name);
+ num_state_changes_ = 0;
+ }
+
+ private:
+ int num_state_changes_;
+};
+
 // Utility class for holding a user's login credentials.
 class UserLogin {
  public:
  UserLogin(Auth* auth, const std::string& email, const std::string& password)
- : auth_(auth), email_(email), password_(password), user_(nullptr),
+ : auth_(auth),
+ email_(email),
+ password_(password),
+ user_(nullptr),
  log_errors_(true) {}
 
  explicit UserLogin(Auth* auth) : auth_(auth) {
@@ -225,12 +252,11 @@ class UserLogin {
 extern "C" int common_main(int argc, const char* argv[]) {
  App* app;
  LogMessage("Starting Auth tests.");
-// Create the App wrapper.
 
 #if defined(__ANDROID__)
- app = App::Create(AppOptions(), GetJniEnv(), GetActivity());
+ app = App::Create(GetJniEnv(), GetActivity());
 #else
- app = App::Create(AppOptions());
+ app = App::Create();
 #endif // defined(__ANDROID__)
 
  LogMessage("Created the Firebase app %x.",
@@ -290,12 +316,39 @@ extern "C" int common_main(int argc, const char* argv[]) {
  }
  }
 
+ // --- StateChange tests -----------------------------------------------------
+ {
+ AuthStateChangeCounter counter;
+
+ // Test notification on registration.
+ auth->AddAuthStateListener(&counter);
+ counter.CompleteTest("registration", 0);
+
+ // Test notification on SignOut(), when already signed-out.
+ auth->SignOut();
+ counter.CompleteTest("SignOut() when already signed-out", 0);
+
+ // Test notification on SignIn().
+ Future<User*> sign_in_future = auth->SignInAnonymously();
+ WaitForSignInFuture(sign_in_future, "Auth::SignInAnonymously()",
+ kAuthErrorNone, auth);
+ counter.CompleteTest("SignInAnonymously()", 1, 4);
+
+ // Test notification on SignOut(), when signed-in.
+ // TODO(jsanmiya): Change the minimum expected callbacks to 1 once
+ // b/32179003 is fixed.
+ auth->SignOut();
+ counter.CompleteTest("SignOut()", 0, 4);
+
+ auth->RemoveAuthStateListener(&counter);
+ }
+
  // --- Auth tests ------------------------------------------------------------
  {
  UserLogin user_login(auth); // Generate a random name/password
  user_login.Register();
  if (!user_login.user()) {
- LogMessage("Error - Could not create in with user.");
+ LogMessage("ERROR: Could not register new user.");
  } else {
  // Test Auth::SignInAnonymously().
  {