development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate dev/integration_tests/ui to null safety (#80624)

Browse source
This commit is contained in:
Abhishek Ghaskata 2021-04-28 07:20:51 +05:30 committed by GitHub
parent 0379dcd0be
commit a195bcc0cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dev/integration_tests/ui/ios/Flutter/Debug.xcconfig
View file

@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"

1
dev/integration_tests/ui/ios/Flutter/Release.xcconfig
View file

@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"

4
dev/integration_tests/ui/lib/commands.dart
View file

@ -11,14 +11,14 @@ void main() {
}
class Test extends SingleChildRenderObjectWidget {
const Test({ Key key }) : super(key: key);
const Test({ Key? key }) : super(key: key);
@override
RenderTest createRenderObject(BuildContext context) => RenderTest();
}
class RenderTest extends RenderProxyBox {
RenderTest({ RenderBox child }) : super(child);
RenderTest({ RenderBox? child }) : super(child);
@override
void debugPaintSize(PaintingContext context, Offset offset) {

6
dev/integration_tests/ui/lib/driver.dart
View file

@ -11,7 +11,7 @@ void main() {
}
class DriverTestApp extends StatefulWidget {
const DriverTestApp({Key key}) : super(key: key);
const DriverTestApp({Key? key}) : super(key: key);
@override
State<StatefulWidget> createState() {
@ -59,9 +59,9 @@ class DriverTestAppState extends State<DriverTestApp> {
DropdownButton<Letter>(
key: const ValueKey<String>('dropdown'),
value: _selectedValue,
onChanged: (Letter newValue) {
onChanged: (Letter? newValue) {
setState(() {
_selectedValue = newValue;
_selectedValue = newValue!;
});
},
items: const <DropdownMenuItem<Letter>>[

2
dev/integration_tests/ui/lib/empty.dart
View file

@ -12,7 +12,7 @@ void main() {
}
class Empty extends StatelessWidget {
const Empty({Key key}) : super(key: key);
const Empty({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) => Container();

8
dev/integration_tests/ui/lib/keyboard_resize.dart
View file

@ -8,7 +8,7 @@ import 'package:flutter_driver/driver_extension.dart';
import 'keys.dart' as keys;
void main() {
enableFlutterDriverExtension(handler: (String message) async {
enableFlutterDriverExtension(handler: (String? message) async {
// TODO(cbernaschina): remove when test flakiness is resolved
return 'keyboard_resize';
});
@ -16,7 +16,7 @@ void main() {
}
class MyApp extends StatelessWidget {
const MyApp({Key key}) : super(key: key);
const MyApp({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -29,7 +29,7 @@ class MyApp extends StatelessWidget {
}
class MyHomePage extends StatefulWidget {
const MyHomePage({Key key}) : super(key: key);
const MyHomePage({Key? key}) : super(key: key);
@override
_MyHomePageState createState() => _MyHomePageState();
@ -60,7 +60,7 @@ class _MyHomePageState extends State<MyHomePage> {
),
floatingActionButton: FloatingActionButton(
key: const Key(keys.kUnfocusButton),
onPressed: () { textField.focusNode.unfocus(); },
onPressed: () { textField.focusNode!.unfocus(); },
tooltip: 'Unfocus',
child: const Icon(Icons.done),
),

4
dev/integration_tests/ui/lib/keyboard_textfield.dart
View file

@ -14,7 +14,7 @@ void main() {
}
class MyApp extends StatelessWidget {
const MyApp({Key key}) : super(key: key);
const MyApp({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -27,7 +27,7 @@ class MyApp extends StatelessWidget {
}
class MyHomePage extends StatefulWidget {
const MyHomePage({Key key}) : super(key: key);
const MyHomePage({Key? key}) : super(key: key);
@override
_MyHomePageState createState() => _MyHomePageState();

24
dev/integration_tests/ui/lib/license_check.dart
View file

@ -14,13 +14,13 @@ void main() {
}
class ShowLicenses extends StatelessWidget {
const ShowLicenses({Key key}) : super(key: key);
const ShowLicenses({Key? key}) : super(key: key);
Widget _buildTestResultWidget(
BuildContext context,
AsyncSnapshot<List<LicenseEntry>> snapshot,
) {
final List<LicenseEntry> entries = snapshot.data;
final List<LicenseEntry> entries = snapshot.data ?? <LicenseEntry>[];
String flutterPackage = '';
final List<String> flutterParagraphs = <String>[];
String enginePackage = '';
@ -41,17 +41,15 @@ class ShowLicenses extends StatelessWidget {
}
final List<Widget> result = <Widget>[];
if (entries.isNotEmpty) {
result.addAll(<Widget>[
const Text('License Check Test', key: ValueKey<String>('Header')),
Text(flutterPackage, key: const ValueKey<String>('FlutterPackage')),
Text(flutterParagraphs.join(' '), key: const ValueKey<String>('FlutterLicense')),
Text('${flutterParagraphs.length}', key: const ValueKey<String>('FlutterCount')),
Text(enginePackage, key: const ValueKey<String>('EnginePackage')),
Text(engineParagraphs.join(' '), key: const ValueKey<String>('EngineLicense')),
Text('${engineParagraphs.length}', key: const ValueKey<String>('EngineCount')),
]);
}
result.addAll(<Widget>[
const Text('License Check Test', key: ValueKey<String>('Header')),
Text(flutterPackage, key: const ValueKey<String>('FlutterPackage')),
Text(flutterParagraphs.join(' '), key: const ValueKey<String>('FlutterLicense')),
Text('${flutterParagraphs.length}', key: const ValueKey<String>('FlutterCount')),
Text(enginePackage, key: const ValueKey<String>('EnginePackage')),
Text(engineParagraphs.join(' '), key: const ValueKey<String>('EngineLicense')),
Text('${engineParagraphs.length}', key: const ValueKey<String>('EngineCount')),
]);
return ListView(
children: result,

4
dev/integration_tests/ui/lib/main.dart
View file

@ -18,9 +18,9 @@ void main() {
textDirection: TextDirection.ltr,
),
onPressed: () {
Navigator.push<Object>(
Navigator.push<Object?>(
context,
MaterialPageRoute<dynamic>(
MaterialPageRoute<Object?>(
builder: (BuildContext context) {
return const Material(
child: Center(

2
dev/integration_tests/ui/lib/overflow.dart
View file

@ -9,7 +9,7 @@ void main() {
}
class Test extends StatefulWidget {
const Test({ Key key }) : super(key: key);
const Test({ Key? key }) : super(key: key);
@override
State<Test> createState() => _TestState();

2
dev/integration_tests/ui/lib/route.dart
View file

@ -9,7 +9,7 @@ import 'package:flutter_driver/driver_extension.dart';
// To use this test: "flutter drive --route '/smuggle-it' lib/route.dart"
void main() {
enableFlutterDriverExtension(handler: (String message) async {
enableFlutterDriverExtension(handler: (String? message) async {
return ui.window.defaultRouteName;
});
}

2
dev/integration_tests/ui/lib/screenshot.dart
View file

@ -16,7 +16,7 @@ void main() {
}
class Toggler extends StatefulWidget {
const Toggler({Key key}) : super(key: key);
const Toggler({Key? key}) : super(key: key);
@override
State<Toggler> createState() => TogglerState();

2
dev/integration_tests/ui/pubspec.yaml
View file

@ -2,7 +2,7 @@ name: integration_ui
description: Flutter non-plugin UI integration tests.
environment:
sdk: ">=2.8.0 <3.0.0"
sdk: ">=2.12.0 <3.0.0"
# The "image" dependency below seems to only be needed for test_driver/screenshot_test.dart
# It can probably be removed, see the comment in that file.

4
dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart
View file

@ -6,14 +6,14 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
});
tearDownAll(() async {
await driver?.close();
await driver.close();
});
test('check that we are painting in debugPaintSize mode', () async {

4
dev/integration_tests/ui/test_driver/commands_none_test.dart
View file

@ -6,14 +6,14 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
});
tearDownAll(() async {
await driver?.close();
await driver.close();
});
test('check that we are in normal mode', () async {

4
dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart
View file

@ -6,14 +6,14 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
});
tearDownAll(() async {
await driver?.close();
await driver.close();
});
test('check that we are showing the performance overlay', () async {

2
dev/integration_tests/ui/test_driver/defines_test.dart
View file

@ -6,7 +6,7 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();

2
dev/integration_tests/ui/test_driver/driver_test.dart
View file

@ -11,7 +11,7 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
group('FlutterDriver', () {
final SerializableFinder presentText = find.text('present');
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();

2
dev/integration_tests/ui/test_driver/empty_test.dart
View file

@ -8,7 +8,7 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
// Connect and disconnect from the empty app.
void main() {
group('FlutterDriver', () {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();

4
dev/integration_tests/ui/test_driver/keyboard_resize_test.dart
View file

@ -8,14 +8,14 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
group('end-to-end test', () {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
});
tearDownAll(() async {
await driver?.close();
await driver.close();
});
test('Ensure keyboard dismissal resizes the view to original size', () async {

4
dev/integration_tests/ui/test_driver/keyboard_textfield_test.dart
View file

@ -8,14 +8,14 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
group('end-to-end test', () {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
});
tearDownAll(() async {
await driver?.close();
await driver.close();
});
test('Textfield scrolls back into view after covered by keyboard', () async {

6
dev/integration_tests/ui/test_driver/license_check_test.dart
View file

@ -20,7 +20,7 @@ void main() {
final String license = licenseFile.readAsStringSync().split(newlineSplit).join(' ').trim();
group('License file check', () {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
@ -28,9 +28,7 @@ void main() {
});
tearDownAll(() async {
if (driver != null) {
await driver.close();
}
await driver.close();
});
test('flutter license', () async {

4
dev/integration_tests/ui/test_driver/route_test.dart
View file

@ -8,14 +8,14 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
group('flutter run test --route', () {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
});
tearDownAll(() async {
await driver?.close();
await driver.close();
});
test('sanity check flutter drive --route', () async {

14
dev/integration_tests/ui/test_driver/screenshot_test.dart
View file

@ -15,7 +15,7 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() {
group('FlutterDriver', () {
FlutterDriver driver;
late FlutterDriver driver;
setUpAll(() async {
driver = await FlutterDriver.connect();
@ -32,18 +32,18 @@ void main() {
await driver.waitFor(toggleBtn);
bool cardsShouldBeVisible = false;
Image imageBefore = decodePng(await driver.screenshot());
Image? imageBefore = decodePng(await driver.screenshot());
for (int i = 0; i < 10; i += 1) {
await driver.tap(toggleBtn);
cardsShouldBeVisible = !cardsShouldBeVisible;
final Image imageAfter = decodePng(await driver.screenshot());
final Image? imageAfter = decodePng(await driver.screenshot());
if (cardsShouldBeVisible) {
expect(imageBefore.data, isNot(cardsAreVisible));
expect(imageAfter.data, cardsAreVisible);
expect(imageBefore?.data, isNot(cardsAreVisible));
expect(imageAfter?.data, cardsAreVisible);
} else {
expect(imageBefore.data, cardsAreVisible);
expect(imageAfter.data, isNot(cardsAreVisible));
expect(imageBefore?.data, cardsAreVisible);
expect(imageAfter?.data, isNot(cardsAreVisible));
}
imageBefore = imageAfter;