fix: android tests for getSessionId

Author: Salakar

packages/firebase_analytics/firebase_analytics/android/src/main/java/io/flutter/plugins/firebase/analytics/FlutterFirebaseAnalyticsPlugin.java

@@ -165,7 +165,6 @@ private Task<Long> handleGetSessionId() {
     cachedThreadPool.execute(
       () -> {
         try {
-          Log.d("ANALYTICS: ", analytics.getSessionId().toString());
           taskCompletionSource.setResult(Tasks.await(analytics.getSessionId()));
         } catch (Exception e) {
           taskCompletionSource.setException(e);

tests/integration_test/firebase_analytics/firebase_analytics_e2e_test.dart

@@ -19,6 +19,29 @@ void main() {
       );
     });
 
+    // getSessionId has to be first, else Android returns null
+    test(
+      'getSessionId',
+      () async {
+        if (kIsWeb) {
+          await expectLater(
+            FirebaseAnalytics.instance.getSessionId(),
+            throwsA(isA<UnimplementedError>()),
+          );
+        } else {
+          await expectLater(
+            FirebaseAnalytics.instance.setConsent(
+              analyticsStorageConsentGranted: true,
+            ),
+            completes,
+          );
+
+          final result = await FirebaseAnalytics.instance.getSessionId();
+          expect(result, isA<int>());
+        }
+      },
+    );
+
     test('isSupported', () async {
       final result = await FirebaseAnalytics.instance.isSupported();
       expect(result, isA<bool>());
@@ -272,31 +295,5 @@ void main() {
         expect(result2, isA<String>());
       }
     });
-
-    test(
-      'getSessionId',
-      () async {
-        // FIXME: Android returns null for getSessionId in tests,
-        // but works when running in the context of an app.
-        // Need to investigate why this is the case.
-        if (kIsWeb) {
-          await expectLater(
-            FirebaseAnalytics.instance.getSessionId(),
-            throwsA(isA<UnimplementedError>()),
-          );
-        } else {
-          await expectLater(
-            FirebaseAnalytics.instance.setConsent(
-              analyticsStorageConsentGranted: true,
-              adStorageConsentGranted: true,
-            ),
-            completes,
-          );
-
-          final result = await FirebaseAnalytics.instance.getSessionId();
-          expect(result, isA<int>());
-        }
-      },
-    );
   });
 }