Check Google Play services version in Analytics test (#1235)

* Add code to get Google Play services version.

* Add check for gmscore version to Analytics GetSessionID test.

* Log event before GetSessionId.

Author: jonsimantov

analytics/integration_test/src/integration_test.cc

@@ -107,18 +107,8 @@ TEST_F(FirebaseAnalyticsTest, TestGetAnalyticsInstanceID) {
 }
 
 TEST_F(FirebaseAnalyticsTest, TestGetSessionID) {
-#if defined(__ANDROID__)
-  // Android continues to have random failures on this test despite the
-  // workarounds below, so just skip it for now.
-  LogInfo("Skipping TestGetSessionID on Android");
-  GTEST_SKIP();
-  return;
-#endif
-
-  // Android emulator tests are currently not working due to getSessionId being
-  // disabled on virtual FTL devices, due to an older version of Google Play
-  // services.
-  SKIP_TEST_ON_ANDROID_EMULATOR;
+  // Don't run this test if Google Play services is < 23.0.0.
+  SKIP_TEST_ON_ANDROID_GOOGLE_PLAY_SERVICES_BELOW(230000);
 
   // iOS simulator tests are currently extra flaky, occasionally failing with an
   // "Analytics uninitialized" error even after multiple attempts.
@@ -128,6 +118,9 @@ TEST_F(FirebaseAnalyticsTest, TestGetSessionID) {
   // needs to be restarted after consent is denied or it won't generate a new
   // sessionID. To not break the tests, skip this test in that case.
 #if defined(__ANDROID__)
+  // Log the Google Play services version for debugging in case this test fails.
+  LogInfo("Google Play services version: %d", GetGooglePlayServicesVersion());
+
   if (did_test_setconsent_) {
     LogInfo(
         "Skipping TestGetSessionID after TestSetConsent, as GetSessionId() "
@@ -136,6 +129,10 @@ TEST_F(FirebaseAnalyticsTest, TestGetSessionID) {
     return;
   }
 #endif
+  // Log an event once, to ensure that there is currently an active Analytics
+  // session.
+  firebase::analytics::LogEvent(firebase::analytics::kEventSignUp);
+
   firebase::Future<int64_t> future;
 
   // Give Analytics a moment to initialize and create a session.

testing/test_framework/src/android/android_firebase_test_framework.cc

@@ -244,4 +244,27 @@ bool FirebaseTest::IsRunningOnEmulator() {
   return result ? true : false;
 }
 
+int FirebaseTest::GetGooglePlayServicesVersion() {
+  JNIEnv* env = app_framework::GetJniEnv();
+  jobject activity = app_framework::GetActivity();
+  jclass test_helper_class = app_framework::FindClass(
+      env, activity, "com/google/firebase/example/TestHelper");
+  if (env->ExceptionCheck()) {
+    env->ExceptionDescribe();
+    env->ExceptionClear();
+    return false;
+  }
+  jmethodID get_google_play_services_version =
+      env->GetStaticMethodID(test_helper_class, "getGooglePlayServicesVersion",
+                             "(Landroid/content/Context;)I");
+  jint result = env->CallStaticIntMethod(
+      test_helper_class, get_google_play_services_version, activity);
+  if (env->ExceptionCheck()) {
+    env->ExceptionDescribe();
+    env->ExceptionClear();
+    return false;
+  }
+  return static_cast<int>(result);
+}
+
 }  // namespace firebase_test_framework

testing/test_framework/src/android/java/com/google/firebase/example/TestHelper.java

@@ -14,7 +14,9 @@
 
 package com.google.firebase.example;
 
+import android.content.Context;
 import android.os.Build;
+import com.google.android.gms.common.GoogleApiAvailability;
 
 /**
  * A simple class with test helper methods.
@@ -28,4 +30,7 @@ public static boolean isRunningOnEmulator() {
         || Build.MANUFACTURER.contains("Genymotion") || Build.PRODUCT.contains("vbox86p")
         || Build.DEVICE.contains("vbox86p") || Build.HARDWARE.contains("vbox86");
   }
+  public static int getGooglePlayServicesVersion(Context context) {
+    return GoogleApiAvailability.getInstance().getApkVersion(context);
+  }
 }

testing/test_framework/src/desktop/desktop_firebase_test_framework.cc

@@ -54,4 +54,9 @@ bool FirebaseTest::IsRunningOnEmulator() {
   return false;
 }
 
+int FirebaseTest::GetGooglePlayServicesVersion() {
+  // No Google Play services on desktop.
+  return 0;
+}
+
 }  // namespace firebase_test_framework

testing/test_framework/src/firebase_test_framework.h

@@ -205,6 +205,28 @@ namespace firebase_test_framework {
 #define SKIP_TEST_ON_ANDROID_EMULATOR ((void)0)
 #endif
 
+#if defined(ANDROID)
+#define SKIP_TEST_ON_ANDROID_GOOGLE_PLAY_SERVICES_BELOW(x)                \
+  {                                                                       \
+    int _required_ver_ = (x);                                             \
+    /* Example: 23.1.2 has version code 230102???. */                     \
+    /* Allow specifying version as 230102 or as 230102000. */             \
+    if (_required_ver_ < 10000000) {                                      \
+      _required_ver_ *= 1000;                                             \
+    }                                                                     \
+    int _actual_ver_ = GetGooglePlayServicesVersion();                    \
+    if (_actual_ver_ < _required_ver_) {                                  \
+      app_framework::LogInfo(                                             \
+          "Skipping %s, as Google Play services %d is below required %d", \
+          test_info_->name(), _actual_ver_, _required_ver_);              \
+      GTEST_SKIP();                                                       \
+      return;                                                             \
+    }                                                                     \
+  }
+#else
+#define SKIP_TEST_ON_ANDROID_GOOGLE_PLAY_SERVICES_BELOW(x) ((void)0)
+#endif  // defined(ANDROID)
+
 #if defined(STLPORT)
 #define SKIP_TEST_IF_USING_STLPORT                                             \
   {                                                                            \
@@ -332,6 +354,9 @@ class FirebaseTest : public testing::Test {
   // on a real device (or on desktop).
   static bool IsRunningOnEmulator();
 
+  // Return Google Play services version on Android, 0 elsewhere.
+  static int GetGooglePlayServicesVersion();
+
   // Returns true if the future completed as expected, fails the test and
   // returns false otherwise.
   static bool WaitForCompletion(const firebase::FutureBase& future,

testing/test_framework/src/ios/ios_firebase_test_framework.mm

@@ -200,4 +200,9 @@ static bool SendHttpRequest(const char* method, const char* url,
 #endif
 }
 
+int FirebaseTest::GetGooglePlayServicesVersion() {
+  // No Google Play services on iOS.
+  return 0;
+}
+
 }  // namespace firebase_test_framework