Merge pull request #367 from Countly/staging

arifBurakDemiray · web-flow · commit e3742a8a12df · 2025-11-18T15:45:38.000+03:00
Staging
diff --git a/example/integration_test/experimental_tests/visibility_prev_names_recording_test.dart b/example/integration_test/experimental_tests/visibility_prev_names_recording_test.dart
@@ -19,10 +19,10 @@ void main() {
     await Countly.initWithConfig(config);
 
     await createMixViewsAndEvents(inForeground: true);
-    sleep(Duration(seconds: 2)); // lets add duration to session
+    await Future.delayed(const Duration(seconds: 2)); // lets add duration to session
 
     FlutterForegroundTask.minimizeApp();
-    sleep(Duration(seconds: 2));
+    await Future.delayed(const Duration(seconds: 2));
 
     // record events and views in background
     await createMixViewsAndEvents(inForeground: false);
@@ -31,7 +31,7 @@ void main() {
     if (Platform.isIOS) {
       printMessageMultipleTimes('waiting for 3 seconds, now go to foreground', 3);
     }
-    sleep(Duration(seconds: 5));
+    await Future.delayed(const Duration(seconds: 5));
 
     // Get request and event queues from native side
     List<String> requestList = await getRequestQueue();
diff --git a/example/integration_test/sc-AP-appPerformanceMonit/AP_207A_enableFBAndStartTimeTracking_manual_test.dart b/example/integration_test/sc-AP-appPerformanceMonit/AP_207A_enableFBAndStartTimeTracking_manual_test.dart
@@ -1,4 +1,5 @@
 import 'package:countly_flutter/countly_flutter.dart';
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import '../utils.dart';
@@ -17,7 +18,14 @@ void main() {
 
     // go foreground and background
     // TODO: this automation is Android only, iOS automation is not supported yet
-    goBackgroundAndForeground();
+    FlutterForegroundTask.minimizeApp();
+
+    print('Waiting for 3 seconds in background');
+    await Future.delayed(const Duration(seconds: 3));
+
+    FlutterForegroundTask.launchApp();
+
+    await Future.delayed(const Duration(seconds: 2));
 
     // check if there is 3 apm related requests in the queue
     List<String> apmRequests = await getAndPrintWantedElementsWithParamFromAllQueues('apm');
diff --git a/example/integration_test/sc-AP-appPerformanceMonit/AP_207B_enableFBAndStartTimeTracking_manual_test.dart b/example/integration_test/sc-AP-appPerformanceMonit/AP_207B_enableFBAndStartTimeTracking_manual_test.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:countly_flutter/countly_flutter.dart';
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import '../utils.dart';
@@ -20,7 +21,15 @@ void main() {
 
     // go foreground and background
     // TODO: this automation is Android only, iOS automation is not supported yet
-    goBackgroundAndForeground();
+    FlutterForegroundTask.minimizeApp();
+
+    print('Waiting for 3 seconds in background');
+    await Future.delayed(const Duration(seconds: 3));
+
+    FlutterForegroundTask.launchApp();
+
+    await Future.delayed(const Duration(seconds: 2));
+
 
     // check if there is 3 apm related requests in the queue
     List<String> apmRequests = await getAndPrintWantedElementsWithParamFromAllQueues('apm');
diff --git a/example/integration_test/server_tests/BM_200_timeout_test.dart b/example/integration_test/server_tests/BM_200_timeout_test.dart
@@ -34,24 +34,16 @@ void main() {
     expect(eventList.isEmpty, true);
     expect(requestList[0], contains("begin_session"));
 
-    if (Platform.isAndroid) {
-      expect(requestArray.length, 5);
-      expect(requestArray[0]['method'], contains("sc"));
-      expect(requestArray[1]['begin_session'], ['1']);
-      expect(requestArray[2]['hc'], isNotNull);
-      expect(requestArray[3]['begin_session'], ['1']);
-      expect(requestArray[4]['method'], contains("sc"));
-    } else if (Platform.isIOS) {
-      expect(requestArray.length, 4);
-      int beginSessions = 0, scCount = 0, hcCount = 0;
-      for (final req in requestArray) {
-        if (req.containsKey('begin_session')) beginSessions++;
-        if (req.containsKey('method') && req['method']!.contains('sc')) scCount++;
-        if (req.containsKey('hc')) hcCount++;
-      }
-      expect(beginSessions, equals(2));
-      expect(scCount, equals(1));
-      expect(hcCount, equals(1));
+    expect(requestArray.length, 4);
+    int beginSessions = 0, scCount = 0, hcCount = 0;
+    for (final req in requestArray) {
+      print(req.toString());
+      if (req.containsKey('begin_session')) beginSessions++;
+      if (req.containsKey('method') && req['method']!.contains('sc')) scCount++;
+      if (req.containsKey('hc')) hcCount++;
     }
+    expect(beginSessions, equals(2));
+    expect(scCount, equals(1));
+    expect(hcCount, equals(1));
   });
 }
diff --git a/example/integration_test/server_tests/BM_201B_no_backoff_D_FQ_test.dart b/example/integration_test/server_tests/BM_201B_no_backoff_D_FQ_test.dart
@@ -54,7 +54,7 @@ void main() {
     requestList = await getRequestQueue(); // List of strings
     eventList = await getEventQueue(); // List of json objects
 
-    expect(requestList.length, Platform.isAndroid ? 4 : 5);
+    expect(requestList.length, 5);
     expect(eventList.length, 0);
   });
 }
diff --git a/example/integration_test/server_tests/BM_202B_no_backoff_FQ_test.dart b/example/integration_test/server_tests/BM_202B_no_backoff_FQ_test.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:countly_flutter/countly_flutter.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
@@ -22,7 +24,7 @@ void main() {
 
     List<String> requestList = await getRequestQueue(); // List of strings
     List<String> eventList = await getEventQueue(); // List of json objects
-    expect(requestList.length, 7);
+    expect(requestList.length, Platform.isAndroid ? 6 : 7);
     expect(eventList.length, 0);
 
     createServer(requestArray, delay: 1);
diff --git a/example/integration_test/session_tests/automatic_sessions/204_CNR_A_id_change_test.dart b/example/integration_test/session_tests/automatic_sessions/204_CNR_A_id_change_test.dart
@@ -60,9 +60,9 @@ void main() {
 
     var i = 0;
     var androidBeginSession = [0, 4, 7];
-    var iosBeginSession = [0, 3, 6];
+    var iosBeginSession = [0, 3, 7];
     var androidMerge = [1, 8];
-    var iosMerge = [1, 7];
+    var iosMerge = [1, 6];
     var androidOrientation = [2, 5];
     var iosOrientation = [4];
     var androidEndSession = [3, 6];
diff --git a/example/integration_test/session_tests/automatic_sessions/205_CR_CG_A_id_change_test.dart b/example/integration_test/session_tests/automatic_sessions/205_CR_CG_A_id_change_test.dart
@@ -66,10 +66,10 @@ void main() {
         // example:
         // consent: [{"sessions":true,"crashes":true,"users":true,"push":true,"feedback":true,"scrolls":true,"remote-config":true,"attribution":true,"clicks":true,"location":true,"star-rating":true,"events":true,"views":true,"apm":true}]
         Map<String, dynamic> consentInRequest = jsonDecode(queryParams['consent']![0]);
-        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
           expect(consentInRequest[key], true);
         }
-        expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+        expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
       } else if ((Platform.isAndroid && (i == 1 || i == 5)) || (Platform.isIOS && (i == 0 || i == 5))) {
         expect(queryParams['begin_session']?[0], '1');
       } else if (i == 2 || (Platform.isAndroid && (i == 10 || i == 9)) || (Platform.isIOS && (i == 8 || i == 9))) {
diff --git a/example/integration_test/session_tests/automatic_sessions/206_CR_CNG_A_id_change_test.dart b/example/integration_test/session_tests/automatic_sessions/206_CR_CNG_A_id_change_test.dart
@@ -60,10 +60,10 @@ void main() {
         // example:
         // consent: [{"sessions":true,"crashes":true,"users":true,"push":true,"feedback":true,"scrolls":true,"remote-config":true,"attribution":true,"clicks":true,"location":true,"star-rating":true,"events":true,"views":true,"apm":true}]
         Map<String, dynamic> consentInRequest = jsonDecode(queryParams['consent']![0]);
-        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
           expect(consentInRequest[key], false);
         }
-        expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+        expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
       } else if (i == 2 || i == 3 || i == 4) {
         expect(queryParams['old_device_id']?[0].isNotEmpty, true);
         expect(queryParams['device_id']?[0], 'newID');
diff --git a/example/integration_test/session_tests/background_tests/212_CR_CG_AS_init_in_background_test.dart b/example/integration_test/session_tests/background_tests/212_CR_CG_AS_init_in_background_test.dart
@@ -45,10 +45,10 @@ void main() {
 
     Map<String, List<String>> queryParamsConsent = Uri.parse("?" + requestList[0]).queryParametersAll;
     Map<String, dynamic> consentInRequest = jsonDecode(queryParamsConsent['consent']![0]);
-    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
       expect(consentInRequest[key], true);
     }
-    expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+    expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
 
     expect(eventList.length, 1); // orientation
 
diff --git a/example/integration_test/session_tests/background_tests/213_CR_CG_MS_init_in_background_test.dart b/example/integration_test/session_tests/background_tests/213_CR_CG_MS_init_in_background_test.dart
@@ -55,10 +55,10 @@ void main() {
 
     Map<String, List<String>> queryParamsConsent = Uri.parse("?" + requestList[0]).queryParametersAll;
     Map<String, dynamic> consentInRequest = jsonDecode(queryParamsConsent['consent']![0]);
-    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
       expect(consentInRequest[key], true);
     }
-    expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+    expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
     expect(eventList.length, Platform.isAndroid ? 2 : 1); // orientation
 
     Map<String, dynamic> event = json.decode(eventList[0]);
diff --git a/example/integration_test/session_tests/background_tests/214_CR_CNG_AS_init_in_background_test.dart b/example/integration_test/session_tests/background_tests/214_CR_CNG_AS_init_in_background_test.dart
@@ -45,10 +45,10 @@ void main() {
 
     Map<String, List<String>> queryParamsConsent = Uri.parse("?" + requestList[0]).queryParametersAll;
     Map<String, dynamic> consentInRequest = jsonDecode(queryParamsConsent['consent']![0]);
-    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
       expect(consentInRequest[key], false);
     }
-    expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+    expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
 
     expect(eventList.length, 0);
   });
diff --git a/example/integration_test/session_tests/background_tests/215_CR_CNG_MS_init_in_background_test.dart b/example/integration_test/session_tests/background_tests/215_CR_CNG_MS_init_in_background_test.dart
@@ -48,10 +48,10 @@ void main() {
 
     Map<String, List<String>> queryParamsConsent = Uri.parse("?" + requestList[0]).queryParametersAll;
     Map<String, dynamic> consentInRequest = jsonDecode(queryParamsConsent['consent']![0]);
-    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+    for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
       expect(consentInRequest[key], false);
     }
-    expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+    expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
 
     expect(eventList.length, 0);
   });
diff --git a/example/integration_test/session_tests/manual_sessions/200_CR_CG_M_test.dart b/example/integration_test/session_tests/manual_sessions/200_CR_CG_M_test.dart
@@ -74,10 +74,10 @@ void main() {
         // example:
         // consent: [{"sessions":true,"crashes":true,"users":true,"push":true,"feedback":true,"scrolls":true,"remote-config":true,"attribution":true,"clicks":true,"location":true,"star-rating":true,"events":true,"views":true,"apm":true}]
         Map<String, dynamic> consentInRequest = jsonDecode(queryParams['consent']![0]);
-        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
           expect(consentInRequest[key], true);
         }
-        expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+        expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
       }
       if (Platform.isIOS) {
         if (i == 1) {
diff --git a/example/integration_test/session_tests/manual_sessions/202_CR_CG_M_test.dart b/example/integration_test/session_tests/manual_sessions/202_CR_CG_M_test.dart
@@ -72,10 +72,10 @@ void main() {
         // example:
         // consent: [{"sessions":true,"crashes":true,"users":true,"push":true,"feedback":true,"scrolls":true,"remote-config":true,"attribution":true,"clicks":true,"location":true,"star-rating":true,"events":true,"views":true,"apm":true}]
         Map<String, dynamic> consentInRequest = jsonDecode(queryParams['consent']![0]);
-        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
           expect(consentInRequest[key], false);
         }
-        expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+        expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
       } else if (i == 1) {
         expect(queryParams['location'], ['']);
       }
diff --git a/example/integration_test/session_tests/manual_sessions/203_CR_CG_M_id_change_test.dart b/example/integration_test/session_tests/manual_sessions/203_CR_CG_M_id_change_test.dart
@@ -77,10 +77,10 @@ void main() {
         // example:
         // consent: [{"sessions":true,"crashes":true,"users":true,"push":true,"feedback":true,"scrolls":true,"remote-config":true,"attribution":true,"clicks":true,"location":true,"star-rating":true,"events":true,"views":true,"apm":true}]
         Map<String, dynamic> consentInRequest = jsonDecode(queryParams['consent']![0]);
-        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
           expect(consentInRequest[key], true);
         }
-        expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+        expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
       } else if ((Platform.isAndroid && (i == 3 || i == 8)) || (Platform.isIOS && i == 1)) {
         expect(queryParams['events']?[0].contains('[CLY]_orientation'), true);
       } else if ((Platform.isAndroid && i == 1) || (Platform.isIOS && i == 2)) {
diff --git a/example/integration_test/user_property_save_tests/simple_1_test.dart b/example/integration_test/user_property_save_tests/simple_1_test.dart
@@ -101,10 +101,10 @@ void main() {
         // example:
         // consent: [{"sessions":true,"crashes":true,"users":true,"push":true,"feedback":true,"scrolls":true,"remote-config":true,"attribution":true,"clicks":true,"location":true,"star-rating":true,"events":true,"views":true,"apm":true}]
         Map<String, dynamic> consentInRequest = jsonDecode(queryParams['consent']![0]);
-        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content']) {
+        for (var key in ['push', 'feedback', 'crashes', 'attribution', 'users', 'events', 'remote-config', 'sessions', 'location', 'views', 'apm', 'content', 'metrics']) {
           expect(consentInRequest[key], true);
         }
-        expect(consentInRequest.length, Platform.isAndroid ? 15 : 12);
+        expect(consentInRequest.length, Platform.isAndroid ? 16 : 13);
       } else if ((Platform.isAndroid && i == 1) || (Platform.isIOS && i == 0)) {
         expect(queryParams['begin_session']?[0], '1');
       } else if (i == 2) {
diff --git a/example/integration_test/utils.dart b/example/integration_test/utils.dart
@@ -111,8 +111,8 @@ Future<DeviceIdType> testDeviceIDType(DeviceIdType givenType) async {
   if (givenType == DeviceIdType.SDK_GENERATED) {
     String? id = await Countly.getCurrentDeviceId();
     String? newModuleId = await Countly.instance.deviceId.getID();
-    expect(id!.length, Platform.isIOS ? 36 : 16);
-    expect(newModuleId!.length, Platform.isIOS ? 36 : 16);
+    expect(id!.length, 36); // android does not use Android.SECURE_ID because of that now it uses UUID so length is 36
+    expect(newModuleId!.length, 36);
     expect(id, newModuleId);
   }
   return type!;
@@ -132,7 +132,16 @@ void createServer(List<Map<String, List<String>>> requestArray, {int delay = 0,
     final requestTime = DateTime.now();
     print('[Test Server][${requestTime.toIso8601String()}] Request received: ${request.method} ${request.uri}');
 
-    final queryParams = request.uri.queryParametersAll;
+    var queryParams;
+
+    if(request.method == 'POST'){
+      String content = await utf8.decoder.bind(request).join();
+      queryParams = Uri.parse('?'+content).queryParametersAll;
+    } else if(request.method == 'GET'){
+      queryParams = request.uri.queryParametersAll;
+    } else {
+      print('[Test Server][${DateTime.now().toIso8601String()}] Unsupported request method: ${request.method}');
+    }
     print(queryParams.toString());
 
     // Store the request parameters for later verification
diff --git a/example/integration_test/views_tests/auto_view_flow1_test.dart b/example/integration_test/views_tests/auto_view_flow1_test.dart
@@ -17,19 +17,19 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   testWidgets('Start auto stopped views and stop views', (WidgetTester tester) async {
     // Initialize the SDK
-    CountlyConfig config = CountlyConfig(SERVER_URL, APP_KEY);
+    CountlyConfig config = CountlyConfig(SERVER_URL, APP_KEY).setLoggingEnabled(true);
     await Countly.initWithConfig(config);
 
     await Countly.instance.views.startView("V1");
     await Countly.instance.views.startAutoStoppedView("V2");
 
     FlutterForegroundTask.minimizeApp();
-    sleep(Duration(seconds: 2));
+    await Future.delayed(const Duration(seconds: 2));
 
     await Countly.instance.views.startAutoStoppedView("V4");
     await Countly.instance.views.startView("V3");
 
-    sleep(Duration(seconds: 2));
+    await Future.delayed(const Duration(seconds: 2));
 
     FlutterForegroundTask.launchApp();
     if (Platform.isIOS) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ void main() {`
`54`	`54`	`requestList = await getRequestQueue(); // List of strings`
`55`	`55`	`eventList = await getEventQueue(); // List of json objects`
`56`	`56`
`57`		`- expect(requestList.length, Platform.isAndroid ? 4 : 5);`
	`57`	`+ expect(requestList.length, 5);`
`58`	`58`	`expect(eventList.length, 0);`
`59`	`59`	`});`
`60`	`60`	`}`