From b76df6a6f62eaea93d7bf288cb59f5773b4f92b6 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 20 Jan 2026 15:50:25 +0700 Subject: [PATCH] TF-4236 Set `setUp` and `tearDown` for Patrol --- integration_test/base/base_test_scenario.dart | 6 ------ integration_test/base/test_base.dart | 13 +++++++++++++ .../display_empty_view_when_open_tag_scenario.dart | 11 ----------- ...splay_view_with_all_email_with_tag_scenario.dart | 11 ----------- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/integration_test/base/base_test_scenario.dart b/integration_test/base/base_test_scenario.dart index b69d867b7..30ed32f58 100644 --- a/integration_test/base/base_test_scenario.dart +++ b/integration_test/base/base_test_scenario.dart @@ -10,15 +10,9 @@ abstract class BaseTestScenario extends BaseScenario @override Future execute() async { - await setupPreLogin(); await executeLoginScenario(); await runTestLogic(); - await disposeAfterTest(); } - Future setupPreLogin() async {} - Future runTestLogic(); - - Future disposeAfterTest() async {} } diff --git a/integration_test/base/test_base.dart b/integration_test/base/test_base.dart index 2f49c0fdc..fd74af23c 100644 --- a/integration_test/base/test_base.dart +++ b/integration_test/base/test_base.dart @@ -1,3 +1,4 @@ +import 'package:core/utils/platform_info.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:patrol/patrol.dart'; @@ -15,6 +16,10 @@ class TestBase { required String description, required BaseScenario Function(PatrolIntegrationTester $) scenarioBuilder, }) { + patrolSetUp(_setupAll); + + patrolTearDown(_tearDown); + patrolTest( description, config: const PatrolTesterConfig( @@ -41,4 +46,12 @@ class TestBase { originalOnError(details); }; } + + Future _setupAll() async { + PlatformInfo.isIntegrationTesting = true; + } + + Future _tearDown() async { + PlatformInfo.isIntegrationTesting = false; + } } \ No newline at end of file diff --git a/integration_test/scenarios/labels/display_empty_view_when_open_tag_scenario.dart b/integration_test/scenarios/labels/display_empty_view_when_open_tag_scenario.dart index 4a5364df1..52cb2691e 100644 --- a/integration_test/scenarios/labels/display_empty_view_when_open_tag_scenario.dart +++ b/integration_test/scenarios/labels/display_empty_view_when_open_tag_scenario.dart @@ -1,4 +1,3 @@ -import 'package:core/utils/platform_info.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:labels/labels.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/labels/label_list_view.dart'; @@ -14,11 +13,6 @@ class DisplayEmptyViewWhenOpenTagScenario extends BaseTestScenario with ProvisioningLabelScenarioMixin { const DisplayEmptyViewWhenOpenTagScenario(super.$); - @override - Future setupPreLogin() async { - PlatformInfo.isIntegrationTesting = true; - } - @override Future runTestLogic() async { const emailUser = String.fromEnvironment('BASIC_AUTH_EMAIL'); @@ -89,9 +83,4 @@ class DisplayEmptyViewWhenOpenTagScenario extends BaseTestScenario $(find.text(AppLocalizations().youDoNotHaveAnyEmailTaggedWithThis)), ); } - - @override - Future disposeAfterTest() async { - PlatformInfo.isIntegrationTesting = false; - } } diff --git a/integration_test/scenarios/labels/display_view_with_all_email_with_tag_scenario.dart b/integration_test/scenarios/labels/display_view_with_all_email_with_tag_scenario.dart index 7be286bec..1ef3cff99 100644 --- a/integration_test/scenarios/labels/display_view_with_all_email_with_tag_scenario.dart +++ b/integration_test/scenarios/labels/display_view_with_all_email_with_tag_scenario.dart @@ -1,4 +1,3 @@ -import 'package:core/utils/platform_info.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:labels/labels.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/labels/label_list_view.dart'; @@ -13,11 +12,6 @@ class DisplayViewWithAllEmailWithTagScenario extends BaseTestScenario with ProvisioningLabelScenarioMixin { const DisplayViewWithAllEmailWithTagScenario(super.$); - @override - Future setupPreLogin() async { - PlatformInfo.isIntegrationTesting = true; - } - @override Future runTestLogic() async { const emailUser = String.fromEnvironment('BASIC_AUTH_EMAIL'); @@ -74,9 +68,4 @@ class DisplayViewWithAllEmailWithTagScenario extends BaseTestScenario expect(listEmailTileWithTag.length, greaterThanOrEqualTo(emailCount)); } - - @override - Future disposeAfterTest() async { - PlatformInfo.isIntegrationTesting = false; - } }