Skip to content

Commit d974a0c

Browse files
authored
[material_ui] Remove widgets/clipboard_utils.dart imports from date_picker_test.dart, input_date_picker_form_field_test.dart, search_test.dart, selectable_text_test.dart, text_form_field_test.dart, text_selection_test.dart (#12030)
~**Test failures are expected. This PR should land after #12022 Part of flutter/flutter#182636 and flutter/flutter#188395 This PR: * Removed the cross-import of `widgets/clipboard_utils.dart`. * Removed @Skip tag, all tests in this file has passed. `semantics_tester.dart` has existed in material_ui, so we can directly import `semantics_tester.dart`; * Moved the file to `test/` folder. This PR is to port over the changes in flutter/flutter#184278 ## Pre-Review Checklist
1 parent ac93e1a commit d974a0c

6 files changed

Lines changed: 38 additions & 48 deletions

File tree

packages/material_ui/temporarily_disabled_tests/date_picker_test.dart renamed to packages/material_ui/test/date_picker_test.dart

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
// This file is run as part of a reduced test set in CI on Mac and Windows
96
// machines.
107
@Tags(<String>['reduced-test-set'])
118
library;
129

10+
import 'dart:async';
1311
import 'dart:ui';
1412

15-
import 'package:material_ui/material_ui.dart';
1613
import 'package:flutter/rendering.dart';
1714
import 'package:flutter/services.dart';
1815
import 'package:flutter_test/flutter_test.dart';
19-
import '../widgets/clipboard_utils.dart';
16+
import 'package:material_ui/material_ui.dart';
17+
18+
import 'clipboard_utils.dart';
2019

2120
void main() {
2221
TestWidgetsFlutterBinding.ensureInitialized();
@@ -2191,12 +2190,14 @@ void main() {
21912190
);
21922191

21932192
final BuildContext context = tester.element(find.text('Test'));
2194-
showDatePicker(
2195-
context: context,
2196-
initialDate: DateTime.now(),
2197-
firstDate: DateTime(2018),
2198-
lastDate: DateTime(2030),
2199-
anchorPoint: const Offset(1000, 0),
2193+
unawaited(
2194+
showDatePicker(
2195+
context: context,
2196+
initialDate: DateTime.now(),
2197+
firstDate: DateTime(2018),
2198+
lastDate: DateTime(2030),
2199+
anchorPoint: const Offset(1000, 0),
2200+
),
22002201
);
22012202
await tester.pumpAndSettle();
22022203

@@ -2229,11 +2230,13 @@ void main() {
22292230
);
22302231

22312232
final BuildContext context = tester.element(find.text('Test'));
2232-
showDatePicker(
2233-
context: context,
2234-
initialDate: DateTime.now(),
2235-
firstDate: DateTime(2018),
2236-
lastDate: DateTime(2030),
2233+
unawaited(
2234+
showDatePicker(
2235+
context: context,
2236+
initialDate: DateTime.now(),
2237+
firstDate: DateTime(2018),
2238+
lastDate: DateTime(2030),
2239+
),
22372240
);
22382241
await tester.pumpAndSettle();
22392242

@@ -2266,11 +2269,13 @@ void main() {
22662269
);
22672270

22682271
final BuildContext context = tester.element(find.text('Test'));
2269-
showDatePicker(
2270-
context: context,
2271-
initialDate: DateTime.now(),
2272-
firstDate: DateTime(2018),
2273-
lastDate: DateTime(2030),
2272+
unawaited(
2273+
showDatePicker(
2274+
context: context,
2275+
initialDate: DateTime.now(),
2276+
firstDate: DateTime(2018),
2277+
lastDate: DateTime(2030),
2278+
),
22742279
);
22752280
await tester.pumpAndSettle();
22762281

packages/material_ui/temporarily_disabled_tests/input_date_picker_form_field_test.dart renamed to packages/material_ui/test/input_date_picker_form_field_test.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'package:flutter/foundation.dart';
9-
import 'package:material_ui/material_ui.dart';
106
import 'package:flutter/semantics.dart';
117
import 'package:flutter/services.dart';
128
import 'package:flutter_test/flutter_test.dart';
9+
import 'package:material_ui/material_ui.dart';
1310

14-
import '../widgets/clipboard_utils.dart';
11+
import 'clipboard_utils.dart';
1512

1613
class TestMaterialLocalizations extends DefaultMaterialLocalizations {
1714
@override

packages/material_ui/temporarily_disabled_tests/search_test.dart renamed to packages/material_ui/test/search_test.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'dart:ui';
96

107
import 'package:flutter/foundation.dart';
11-
import 'package:material_ui/material_ui.dart';
128
import 'package:flutter/services.dart';
139
import 'package:flutter_test/flutter_test.dart';
10+
import 'package:material_ui/material_ui.dart';
1411

15-
import '../widgets/clipboard_utils.dart';
16-
import '../widgets/semantics_tester.dart';
12+
import 'clipboard_utils.dart';
13+
import 'semantics_tester.dart';
1714

1815
void main() {
1916
TestWidgetsFlutterBinding.ensureInitialized();

packages/material_ui/temporarily_disabled_tests/selectable_text_test.dart renamed to packages/material_ui/test/selectable_text_test.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
// This file is run as part of a reduced test set in CI on Mac and Windows
96
// machines.
107
@Tags(<String>['reduced-test-set'])
@@ -17,15 +14,15 @@ import 'dart:ui';
1714
import 'package:cupertino_ui/cupertino_ui.dart';
1815
import 'package:flutter/foundation.dart';
1916
import 'package:flutter/gestures.dart';
20-
import 'package:material_ui/material_ui.dart';
2117
import 'package:flutter/rendering.dart';
2218
import 'package:flutter/services.dart';
2319
import 'package:flutter_test/flutter_test.dart';
2420
import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
21+
import 'package:material_ui/material_ui.dart';
2522

26-
import '../widgets/clipboard_utils.dart';
27-
import '../widgets/semantics_tester.dart';
23+
import 'clipboard_utils.dart';
2824
import 'editable_text_utils.dart' show textOffsetToPosition;
25+
import 'semantics_tester.dart';
2926

3027
class MaterialLocalizationsDelegate extends LocalizationsDelegate<MaterialLocalizations> {
3128
@override

packages/material_ui/temporarily_disabled_tests/text_form_field_test.dart renamed to packages/material_ui/test/text_form_field_test.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'dart:ui';
96

107
import 'package:cupertino_ui/cupertino_ui.dart';
118
import 'package:flutter/foundation.dart';
129
import 'package:flutter/gestures.dart';
13-
import 'package:material_ui/material_ui.dart';
1410
import 'package:flutter/rendering.dart';
1511
import 'package:flutter/services.dart';
1612
import 'package:flutter_test/flutter_test.dart';
13+
import 'package:material_ui/material_ui.dart';
1714

18-
import '../widgets/clipboard_utils.dart';
15+
import 'clipboard_utils.dart';
1916
import 'editable_text_utils.dart';
2017

2118
void main() {

packages/material_ui/temporarily_disabled_tests/text_selection_test.dart renamed to packages/material_ui/test/text_selection_test.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
// This file is run as part of a reduced test set in CI on Mac and Windows
96
// machines.
107
@Tags(<String>['reduced-test-set'])
118
library;
129

13-
import 'package:material_ui/material_ui.dart';
1410
import 'package:flutter/rendering.dart';
1511
import 'package:flutter/services.dart';
1612
import 'package:flutter_test/flutter_test.dart';
13+
import 'package:material_ui/material_ui.dart';
1714

18-
import '../widgets/clipboard_utils.dart';
15+
import 'clipboard_utils.dart';
1916
import 'editable_text_utils.dart' show findRenderEditable, globalize, textOffsetToPosition;
2017

2118
void main() {

0 commit comments

Comments
 (0)