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

fix bad indentations(mainly around collection literals) (#41355)

Browse source
This commit is contained in:
Alexandre Ardhuin 2019-09-27 10:46:45 +02:00 committed by GitHub
parent 62571b4b9f
commit f11c34109c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 255 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/flutter/test/cupertino/nav_bar_test.dart
View file

@ -334,8 +334,8 @@ void main() {
});
expect(opacities, <double> [
0.0, // Initially the smaller font title is invisible.
1.0, // The larger font title is visible.
0.0, // Initially the smaller font title is invisible.
1.0, // The larger font title is visible.
]);
expect(tester.getTopLeft(find.widgetWithText(OverflowBox, 'Title')).dy, 44.0);
@ -359,8 +359,8 @@ void main() {
});
expect(opacities, <double> [
1.0, // Smaller font title now visible
0.0, // Larger font title invisible.
1.0, // Smaller font title now visible
0.0, // Larger font title invisible.
]);
// The persistent toolbar doesn't move or change size.

4
packages/flutter/test/cupertino/route_test.dart
View file

@ -95,8 +95,8 @@ void main() {
});
expect(opacities, <double> [
0.0, // Initially the smaller font title is invisible.
1.0, // The larger font title is visible.
0.0, // Initially the smaller font title is invisible.
1.0, // The larger font title is visible.
]);
// Check that the large font title is at the right spot.

27
packages/flutter/test/material/bottom_navigation_bar_test.dart
View file

@ -1431,18 +1431,21 @@ void main() {
testWidgets('BottomNavigationBar item title should not be nullable', (WidgetTester tester) async {
expect(() {
MaterialApp(
home: Scaffold(
bottomNavigationBar: BottomNavigationBar(
type: BottomNavigationBarType.shifting,
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.ac_unit),
title: Text('AC'),
),
BottomNavigationBarItem(
icon: Icon(Icons.access_alarm),
),
])));
home: Scaffold(
bottomNavigationBar: BottomNavigationBar(
type: BottomNavigationBarType.shifting,
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.ac_unit),
title: Text('AC'),
),
BottomNavigationBarItem(
icon: Icon(Icons.access_alarm),
),
],
),
),
);
}, throwsA(isInstanceOf<AssertionError>()));
});

36
packages/flutter/test/material/raw_material_button_test.dart
View file

@ -52,23 +52,25 @@ void main() {
expect(semantics, hasSemantics(
TestSemantics.root(
children: <TestSemantics>[
TestSemantics(
id: 1,
flags: <SemanticsFlag>[
SemanticsFlag.isButton,
SemanticsFlag.hasEnabledState,
SemanticsFlag.isEnabled,
],
actions: <SemanticsAction>[
SemanticsAction.tap,
],
label: '+',
textDirection: TextDirection.ltr,
rect: const Rect.fromLTRB(0.0, 0.0, 48.0, 48.0),
children: <TestSemantics>[],
),
]
), ignoreTransform: true));
TestSemantics(
id: 1,
flags: <SemanticsFlag>[
SemanticsFlag.isButton,
SemanticsFlag.hasEnabledState,
SemanticsFlag.isEnabled,
],
actions: <SemanticsAction>[
SemanticsAction.tap,
],
label: '+',
textDirection: TextDirection.ltr,
rect: const Rect.fromLTRB(0.0, 0.0, 48.0, 48.0),
children: <TestSemantics>[],
),
]
),
ignoreTransform: true,
));
semantics.dispose();
});

13
packages/flutter/test/rendering/platform_view_test.dart
View file

@ -21,12 +21,13 @@ void main() {
controller: fakePlatformViewController,
hitTestBehavior: PlatformViewHitTestBehavior.opaque,
gestureRecognizers: <Factory<OneSequenceGestureRecognizer>>{
Factory<VerticalDragGestureRecognizer>(
() {
return VerticalDragGestureRecognizer();
},
),
},);
Factory<VerticalDragGestureRecognizer>(
() {
return VerticalDragGestureRecognizer();
},
),
},
);
});
test('layout should size to max constraint', () {

30
packages/flutter/test/rendering/table_test.dart
View file

@ -176,15 +176,21 @@ void main() {
final RenderBox child2 = RenderPositionedBox();
final RenderBox child3 = RenderPositionedBox();
table = RenderTable(textDirection: TextDirection.ltr);
table.setFlatChildren(3, <RenderBox>[child1, RenderPositionedBox(), child2,
RenderPositionedBox(), child3, RenderPositionedBox()]);
table.setFlatChildren(3, <RenderBox>[
child1, RenderPositionedBox(), child2,
RenderPositionedBox(), child3, RenderPositionedBox(),
]);
expect(table.rows, equals(2));
layout(table);
table.setFlatChildren(3, <RenderBox>[RenderPositionedBox(), child1, RenderPositionedBox(),
child2, RenderPositionedBox(), child3]);
table.setFlatChildren(3, <RenderBox>[
RenderPositionedBox(), child1, RenderPositionedBox(),
child2, RenderPositionedBox(), child3,
]);
pumpFrame();
table.setFlatChildren(3, <RenderBox>[RenderPositionedBox(), child1, RenderPositionedBox(),
child2, RenderPositionedBox(), child3]);
table.setFlatChildren(3, <RenderBox>[
RenderPositionedBox(), child1, RenderPositionedBox(),
child2, RenderPositionedBox(), child3,
]);
pumpFrame();
expect(table.columns, equals(3));
expect(table.rows, equals(2));
@ -208,12 +214,16 @@ void main() {
table.setFlatChildren(2, <RenderBox>[ RenderPositionedBox(), RenderPositionedBox() ]);
pumpFrame();
expect(table, paints..path()..path()..path()..path()..path());
table.setFlatChildren(2, <RenderBox>[ RenderPositionedBox(), RenderPositionedBox(),
RenderPositionedBox(), RenderPositionedBox() ]);
table.setFlatChildren(2, <RenderBox>[
RenderPositionedBox(), RenderPositionedBox(),
RenderPositionedBox(), RenderPositionedBox(),
]);
pumpFrame();
expect(table, paints..path()..path()..path()..path()..path()..path());
table.setFlatChildren(3, <RenderBox>[ RenderPositionedBox(), RenderPositionedBox(), RenderPositionedBox(),
RenderPositionedBox(), RenderPositionedBox(), RenderPositionedBox() ]);
table.setFlatChildren(3, <RenderBox>[
RenderPositionedBox(), RenderPositionedBox(), RenderPositionedBox(),
RenderPositionedBox(), RenderPositionedBox(), RenderPositionedBox(),
]);
pumpFrame();
expect(table, paints..path()..path()..path()..path()..path()..path());
});

6
packages/flutter/test/services/message_codecs_test.dart
View file

@ -148,8 +148,10 @@ void main() {
checkEncoding<dynamic>(
standard,
1.0,
<int>[6, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xf0, 0x3f],
<int>[
6, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xf0, 0x3f,
],
);
});
});

24
packages/flutter/test/widgets/draggable_test.dart
View file

@ -158,18 +158,20 @@ void main() {
onTap: () {
events.add('tap');
},
child: Container(child: const Text('Button'),
child: Container(
child: const Text('Button'),
),
),
DragTarget<int>(
builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
return IgnorePointer(
child: Container(child: const Text('Target')),
);
},
onAccept: (int data) {
events.add('drop');
},
),
),
DragTarget<int>(
builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
return IgnorePointer(
child: Container(child: const Text('Target')),
);
},
onAccept: (int data) {
events.add('drop');
}),
],
),
],

14
packages/flutter/test/widgets/navigator_test.dart
View file

@ -294,7 +294,7 @@ void main() {
testWidgets('popAndPushNamed', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { Navigator.popAndPushNamed(context, '/B'); }),
'/B': (BuildContext context) => OnTapPage(id: 'B', onTap: () { Navigator.pop(context); }),
};
@ -321,7 +321,7 @@ void main() {
testWidgets('Push and pop should trigger the observers', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { Navigator.pop(context); }),
};
bool isPushed = false;
@ -381,7 +381,7 @@ void main() {
testWidgets('Add and remove an observer should work', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { Navigator.pop(context); }),
};
bool isPushed = false;
@ -428,7 +428,7 @@ void main() {
testWidgets('replaceNamed', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushReplacementNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushReplacementNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { Navigator.pushReplacementNamed(context, '/B'); }),
'/B': (BuildContext context) => const OnTapPage(id: 'B'),
};
@ -452,7 +452,7 @@ void main() {
Future<String> value;
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { value = Navigator.pushReplacementNamed(context, '/B', result: 'B'); }),
'/B': (BuildContext context) => OnTapPage(id: 'B', onTap: () { Navigator.pop(context, 'B'); }),
};
@ -499,7 +499,7 @@ void main() {
testWidgets('removeRoute', (WidgetTester tester) async {
final Map<String, WidgetBuilder> pageBuilders = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { Navigator.pushNamed(context, '/B'); }),
'/B': (BuildContext context) => const OnTapPage(id: 'B'),
};
@ -683,7 +683,7 @@ void main() {
testWidgets('didStartUserGesture observable', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/' : (BuildContext context) => OnTapPage(id: '/', onTap: () { Navigator.pushNamed(context, '/A'); }),
'/A': (BuildContext context) => OnTapPage(id: 'A', onTap: () { Navigator.pop(context); }),
};

2
packages/flutter/test/widgets/overscroll_indicator_test.dart
View file

@ -72,7 +72,7 @@ void main() {
width: 600.0,
child: const CustomScrollView(
slivers: <Widget>[
SliverToBoxAdapter(child: SizedBox(height: 2000.0)),
SliverToBoxAdapter(child: SizedBox(height: 2000.0)),
],
),
),

10
packages/flutter/test/widgets/sliver_fill_remaining_test.dart
View file

@ -104,11 +104,11 @@ void main() {
testWidgets('scrolls beyond viewport by default', (WidgetTester tester) async {
final ScrollController controller = ScrollController();
final List<Widget> slivers = <Widget>[
sliverBox,
SliverFillRemaining(
child: Container(color: Colors.white),
),
];
sliverBox,
SliverFillRemaining(
child: Container(color: Colors.white),
),
];
await tester.pumpWidget(boilerplate(slivers, controller: controller));
expect(controller.offset, 0.0);
expect(find.byType(Container), findsNWidgets(2));

2
packages/flutter/test/widgets/sliver_semantics_test.dart
View file

@ -55,7 +55,7 @@ void _tests() {
expandedHeight: appBarExpandedHeight,
title: Text('Semantics Test with Slivers'),
),
SliverList(
SliverList(
delegate: SliverChildListDelegate(listChildren),
),
],

4
packages/flutter_tools/lib/src/build_runner/build_runner.dart
View file

@ -163,8 +163,8 @@ class BuildRunner extends CodeGenerator {
'--packages=$scriptPackagesPath',
buildSnapshot.path,
'daemon',
'--skip-build-script-check',
'--delete-conflicting-outputs',
'--skip-build-script-check',
'--delete-conflicting-outputs',
];
buildDaemonClient = await BuildDaemonClient.connect(
flutterProject.directory.path,

35
packages/flutter_tools/lib/src/build_runner/build_script.dart
View file

@ -58,8 +58,7 @@ const Set<String> skipPlatformCheckPackages = <String>{
'video_player',
};
final DartPlatform flutterWebPlatform =
DartPlatform.register('flutter_web', <String>[
final DartPlatform flutterWebPlatform = DartPlatform.register('flutter_web', <String>[
'async',
'collection',
'convert',
@ -208,14 +207,14 @@ class FlutterWebTestEntrypointBuilder implements Builder {
@override
Map<String, List<String>> get buildExtensions => const <String, List<String>>{
'.dart': <String>[
ddcBootstrapExtension,
jsEntrypointExtension,
jsEntrypointSourceMapExtension,
jsEntrypointArchiveExtension,
digestsEntrypointExtension,
],
};
'.dart': <String>[
ddcBootstrapExtension,
jsEntrypointExtension,
jsEntrypointSourceMapExtension,
jsEntrypointArchiveExtension,
digestsEntrypointExtension,
],
};
@override
Future<void> build(BuildStep buildStep) async {
@ -235,14 +234,14 @@ class FlutterWebEntrypointBuilder implements Builder {
@override
Map<String, List<String>> get buildExtensions => const <String, List<String>>{
'.dart': <String>[
ddcBootstrapExtension,
jsEntrypointExtension,
jsEntrypointSourceMapExtension,
jsEntrypointArchiveExtension,
digestsEntrypointExtension,
],
};
'.dart': <String>[
ddcBootstrapExtension,
jsEntrypointExtension,
jsEntrypointSourceMapExtension,
jsEntrypointArchiveExtension,
digestsEntrypointExtension,
],
};
@override
Future<void> build(BuildStep buildStep) async {

6
packages/flutter_tools/lib/src/build_system/targets/dart.dart
View file

@ -73,7 +73,7 @@ class CopyFlutterBundle extends Target {
Source.artifact(Artifact.vmSnapshotData, mode: BuildMode.debug),
Source.artifact(Artifact.isolateSnapshotData, mode: BuildMode.debug),
Source.pattern('{BUILD_DIR}/app.dill'),
Source.behavior(AssetOutputBehavior())
Source.behavior(AssetOutputBehavior()),
];
@override
@ -84,7 +84,7 @@ class CopyFlutterBundle extends Target {
Source.pattern('{OUTPUT_DIR}/AssetManifest.json'),
Source.pattern('{OUTPUT_DIR}/FontManifest.json'),
Source.pattern('{OUTPUT_DIR}/LICENSE'),
Source.behavior(AssetOutputBehavior())
Source.behavior(AssetOutputBehavior()),
];
@override
@ -157,7 +157,7 @@ class ReleaseCopyFlutterBundle extends CopyFlutterBundle {
Source.pattern('{OUTPUT_DIR}/AssetManifest.json'),
Source.pattern('{OUTPUT_DIR}/FontManifest.json'),
Source.pattern('{OUTPUT_DIR}/LICENSE'),
Source.behavior(AssetOutputBehavior())
Source.behavior(AssetOutputBehavior()),
];
@override

2
packages/flutter_tools/lib/src/bundle.dart
View file

@ -163,7 +163,7 @@ Future<void> buildWithAssemble({
kTargetFile: mainPath,
kBuildMode: getNameForBuildMode(buildMode),
kTargetPlatform: getNameForTargetPlatform(targetPlatform),
}
},
);
final Target target = buildMode == BuildMode.debug
? const CopyFlutterBundle()

3
packages/flutter_tools/lib/src/commands/unpack.dart
View file

@ -12,8 +12,7 @@ import '../globals.dart';
import '../runner/flutter_command.dart';
/// The directory in the Flutter cache for each platform's artifacts.
const Map<TargetPlatform, String> flutterArtifactPlatformDirectory =
<TargetPlatform, String>{
const Map<TargetPlatform, String> flutterArtifactPlatformDirectory = <TargetPlatform, String>{
TargetPlatform.linux_x64: 'linux-x64',
TargetPlatform.darwin_x64: 'darwin-x64',
TargetPlatform.windows_x64: 'windows-x64',

2
packages/flutter_tools/lib/src/doctor.dart
View file

@ -802,7 +802,7 @@ class IntelliJValidatorOnMac extends IntelliJValidator {
validators.add(ValidatorWithResult(
userMessages.intellijMacUnknownResult,
ValidationResult(ValidationType.missing, <ValidationMessage>[
ValidationMessage.error(e.message),
ValidationMessage.error(e.message),
]),
));
}

13
packages/flutter_tools/lib/src/test/flutter_web_platform.dart
View file

@ -245,11 +245,11 @@ class FlutterWebPlatform extends PlatformPlugin {
_webSocketHandler.create(webSocketHandler(completer.complete));
final Uri webSocketUrl = url.replace(scheme: 'ws').resolve(path);
final Uri hostUrl = url
.resolve('static/index.html')
.replace(queryParameters: <String, String>{
'managerUrl': webSocketUrl.toString(),
'debug': _config.pauseAfterLoad.toString(),
});
.resolve('static/index.html')
.replace(queryParameters: <String, String>{
'managerUrl': webSocketUrl.toString(),
'debug': _config.pauseAfterLoad.toString(),
});
printTrace('Serving tests at $hostUrl');
@ -559,8 +559,7 @@ class BrowserManager {
Object message, {
StackTraceMapper mapper,
}) async {
url = url.replace(
fragment: Uri.encodeFull(jsonEncode(<String, Object>{
url = url.replace(fragment: Uri.encodeFull(jsonEncode(<String, Object>{
'metadata': suiteConfig.metadata.serialize(),
'browser': _runtime.identifier,
})));

16
packages/flutter_tools/lib/src/version.dart
View file

@ -120,14 +120,14 @@ class FlutterVersion {
}
Map<String, Object> toJson() => <String, Object>{
'frameworkVersion': frameworkVersion ?? 'unknown',
'channel': channel,
'repositoryUrl': repositoryUrl ?? 'unknown source',
'frameworkRevision': frameworkRevision,
'frameworkCommitDate': frameworkCommitDate,
'engineRevision': engineRevision,
'dartSdkVersion': dartSdkVersion,
};
'frameworkVersion': frameworkVersion ?? 'unknown',
'channel': channel,
'repositoryUrl': repositoryUrl ?? 'unknown source',
'frameworkRevision': frameworkRevision,
'frameworkCommitDate': frameworkCommitDate,
'engineRevision': engineRevision,
'dartSdkVersion': dartSdkVersion,
};
/// A date String describing the last framework commit.
String get frameworkCommitDate => _latestGitCommitDate();

4
packages/flutter_tools/lib/src/vmservice.dart
View file

@ -331,8 +331,8 @@ class VMService {
Map<String, dynamic> params,
) {
return Future.any<Map<String, dynamic>>(<Future<Map<String, dynamic>>>[
_peer.sendRequest(method, params).then<Map<String, dynamic>>(castStringKeyedMap),
_connectionError.future,
_peer.sendRequest(method, params).then<Map<String, dynamic>>(castStringKeyedMap),
_connectionError.future,
]);
}

4
packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
View file

@ -88,8 +88,8 @@ void main() {
testUsingContext('licensesAccepted works for all licenses accepted', () async {
when(sdk.sdkManagerPath).thenReturn('/foo/bar/sdkmanager');
processManager.processFactory = processMetaFactory(<String>[
'[=======================================] 100% Computing updates... ',
'All SDK package licenses accepted.',
'[=======================================] 100% Computing updates... ',
'All SDK package licenses accepted.',
]);
final AndroidLicenseValidator licenseValidator = AndroidLicenseValidator();

16
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View file

@ -1401,14 +1401,14 @@ plugin2=${plugin2.path}
expect(actualGradlewCall, contains('/path/to/project/.android/gradlew'));
expect(actualGradlewCall, contains('-PlocalEngineOut=out/android_arm'));
}, overrides: <Type, Generator>{
AndroidSdk: () => mockAndroidSdk,
AndroidStudio: () => mockAndroidStudio,
Artifacts: () => mockArtifacts,
Cache: () => cache,
ProcessManager: () => mockProcessManager,
Platform: () => android,
FileSystem: () => fs,
});
AndroidSdk: () => mockAndroidSdk,
AndroidStudio: () => mockAndroidStudio,
Artifacts: () => mockArtifacts,
Cache: () => cache,
ProcessManager: () => mockProcessManager,
Platform: () => android,
FileSystem: () => fs,
});
});
}

62
packages/flutter_tools/test/general.shard/base/build_test.dart
View file

@ -118,14 +118,15 @@ void main() {
SnapshotType(TargetPlatform.android_x64, BuildMode.release),
darwinArch: null,
additionalArgs: <String>['--additional_arg']);
verify(mockProcessManager.start(<String>[
'gen_snapshot',
'--causal_async_stacks',
'--additional_arg'
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment')))
.called(1);
verify(mockProcessManager.start(
<String>[
'gen_snapshot',
'--causal_async_stacks',
'--additional_arg',
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).called(1);
}, overrides: contextOverrides);
testUsingContext('iOS armv7', () async {
@ -142,14 +143,15 @@ void main() {
snapshotType: SnapshotType(TargetPlatform.ios, BuildMode.release),
darwinArch: DarwinArch.armv7,
additionalArgs: <String>['--additional_arg']);
verify(mockProcessManager.start(<String>[
'gen_snapshot_armv7',
'--causal_async_stacks',
'--additional_arg'
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment')))
.called(1);
verify(mockProcessManager.start(
<String>[
'gen_snapshot_armv7',
'--causal_async_stacks',
'--additional_arg',
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment')),
).called(1);
}, overrides: contextOverrides);
testUsingContext('iOS arm64', () async {
@ -166,14 +168,15 @@ void main() {
snapshotType: SnapshotType(TargetPlatform.ios, BuildMode.release),
darwinArch: DarwinArch.arm64,
additionalArgs: <String>['--additional_arg']);
verify(mockProcessManager.start(<String>[
'gen_snapshot_arm64',
'--causal_async_stacks',
'--additional_arg'
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment')))
.called(1);
verify(mockProcessManager.start(
<String>[
'gen_snapshot_arm64',
'--causal_async_stacks',
'--additional_arg',
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).called(1);
}, overrides: contextOverrides);
testUsingContext('--strip filters outputs', () async {
@ -187,11 +190,12 @@ void main() {
.thenAnswer((_) => Future<Process>.value(mockProc));
when(mockProc.stdout).thenAnswer((_) => const Stream<List<int>>.empty());
when(mockProc.stderr)
.thenAnswer((_) => Stream<String>.fromIterable(<String>[
'--ABC\n',
'Warning: Generating ELF library without DWARF debugging information.\n',
'--XYZ\n'
]).transform<List<int>>(utf8.encoder));
.thenAnswer((_) => Stream<String>.fromIterable(<String>[
'--ABC\n',
'Warning: Generating ELF library without DWARF debugging information.\n',
'--XYZ\n',
])
.transform<List<int>>(utf8.encoder));
await genSnapshot.run(
snapshotType:
SnapshotType(TargetPlatform.android_x64, BuildMode.release),

12
packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
View file

@ -188,12 +188,12 @@ flutter_tools:lib/''');
});
await const KernelSnapshot().build(Environment(
outputDir: fs.currentDirectory,
projectDir: fs.currentDirectory,
defines: <String, String>{
kBuildMode: 'debug',
kTargetPlatform: getNameForTargetPlatform(TargetPlatform.android_arm),
}));
outputDir: fs.currentDirectory,
projectDir: fs.currentDirectory,
defines: <String, String>{
kBuildMode: 'debug',
kTargetPlatform: getNameForTargetPlatform(TargetPlatform.android_arm),
}));
}, overrides: <Type, Generator>{
KernelCompilerFactory: () => MockKernelCompilerFactory(),
}));

2
packages/flutter_tools/test/general.shard/commands/build_linux_test.dart
View file

@ -170,7 +170,7 @@ BINARY_NAME=fizz_bar
expect(BuildLinuxCommand().hidden, true);
}, overrides: <Type, Generator>{
FeatureFlags: () => TestFeatureFlags(isLinuxEnabled: false),
Platform: () => MockPlatform(),
Platform: () => MockPlatform(),
});
testUsingContext('Not hidden when enabled and on Linux host', () {

2
packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
View file

@ -187,7 +187,7 @@ void main() {
expect(BuildMacosCommand().hidden, true);
}, overrides: <Type, Generator>{
FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: false),
Platform: () => MockPlatform(),
Platform: () => MockPlatform(),
});
testUsingContext('Not hidden when enabled and on macOS host', () {

2
packages/flutter_tools/test/general.shard/commands/build_windows_test.dart
View file

@ -181,7 +181,7 @@ void main() {
expect(BuildWindowsCommand().hidden, true);
}, overrides: <Type, Generator>{
FeatureFlags: () => TestFeatureFlags(isWindowsEnabled: false),
Platform: () => MockPlatform(),
Platform: () => MockPlatform(),
});
testUsingContext('Not hidden when enabled and on Windows host', () {

22
packages/flutter_tools/test/general.shard/commands/precache_test.dart
View file

@ -114,17 +114,17 @@ void main() {
applyMocksToCommand(command);
await createTestCommandRunner(command).run(
const <String>[
'precache',
'--ios',
'--android_gen_snapshot',
'--android_maven',
'--android_internal_build',
'--web',
'--macos',
'--linux',
'--windows',
'--fuchsia',
'--flutter_runner',
'precache',
'--ios',
'--android_gen_snapshot',
'--android_maven',
'--android_internal_build',
'--web',
'--macos',
'--linux',
'--windows',
'--fuchsia',
'--flutter_runner',
]
);
expect(artifacts, unorderedEquals(<DevelopmentArtifact>{

4
packages/flutter_tools/test/general.shard/flutter_manifest_test.dart
View file

@ -208,8 +208,8 @@ flutter:
''';
final FlutterManifest flutterManifest = FlutterManifest.createFromString(manifest);
final dynamic expectedFontsDescriptor = <dynamic>[
{'fonts': [{'asset': 'a/bar'}, {'style': 'italic', 'weight': 400, 'asset': 'a/bar'}], 'family': 'foo'}, // ignore: always_specify_types
{'fonts': [{'asset': 'a/baz'}, {'style': 'italic', 'weight': 400, 'asset': 'a/baz'}], 'family': 'bar'}, // ignore: always_specify_types
{'fonts': [{'asset': 'a/bar'}, {'style': 'italic', 'weight': 400, 'asset': 'a/bar'}], 'family': 'foo'}, // ignore: always_specify_types
{'fonts': [{'asset': 'a/baz'}, {'style': 'italic', 'weight': 400, 'asset': 'a/baz'}], 'family': 'bar'}, // ignore: always_specify_types
];
expect(flutterManifest.fontsDescriptor, expectedFontsDescriptor);
final List<Font> fonts = flutterManifest.fonts;

12
packages/flutter_tools/test/general.shard/ios/simulators_test.dart
View file

@ -222,12 +222,12 @@ void main() {
await deviceUnderTest.takeScreenshot(mockFile);
verify(mockProcessManager.run(
<String>[
'/usr/bin/xcrun',
'simctl',
'io',
'x',
'screenshot',
fs.path.join('some', 'path', 'to', 'screenshot.png'),
'/usr/bin/xcrun',
'simctl',
'io',
'x',
'screenshot',
fs.path.join('some', 'path', 'to', 'screenshot.png'),
],
environment: null,
workingDirectory: null,

3
packages/flutter_tools/test/general.shard/ios/xcode_backend_test.dart
View file

@ -35,8 +35,7 @@ const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
};
// Can't use a debug build with a profile engine.
const Map<String, String> localEngineProfileBuildeModeRelease =
<String, String>{
const Map<String, String> localEngineProfileBuildeModeRelease = <String, String>{
'SOURCE_ROOT': '../../../examples/hello_world',
'FLUTTER_ROOT': '../../..',
'LOCAL_ENGINE': '/engine/src/out/ios_profile',

6
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file

@ -174,9 +174,9 @@ void main() {
testUsingContext('creates swift Podfile if swift', () async {
when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true);
when(mockXcodeProjectInterpreter.getBuildSettings(any, any))
.thenAnswer((_) async => <String, String>{
'SWIFT_VERSION': '4.0',
});
.thenAnswer((_) async => <String, String>{
'SWIFT_VERSION': '4.0',
});
final FlutterProject project = FlutterProject.fromPath('project');
await cocoaPodsUnderTest.setupPodfile(project.ios);

6
packages/flutter_tools/test/general.shard/project_test.dart
View file

@ -323,9 +323,9 @@ apply plugin: 'kotlin-android'
expect(await project.ios.isSwift, isTrue);
expect(project.android.isKotlin, isTrue);
}, overrides: <Type, Generator>{
FileSystem: () => fs,
XcodeProjectInterpreter: () => mockXcodeProjectInterpreter,
FlutterProjectFactory: () => flutterProjectFactory,
FileSystem: () => fs,
XcodeProjectInterpreter: () => mockXcodeProjectInterpreter,
FlutterProjectFactory: () => flutterProjectFactory,
});
});

23
packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart
View file

@ -38,18 +38,19 @@ void main() {
);
},
overrides: <Type, Generator>{
WebFsFactory: () => ({
@required String target,
@required FlutterProject flutterProject,
@required BuildInfo buildInfo,
@required bool skipDwds,
@required bool initializePlatform,
@required String hostname,
@required String port,
}) async {
return mockWebFs;
WebFsFactory: () => ({
@required String target,
@required FlutterProject flutterProject,
@required BuildInfo buildInfo,
@required bool skipDwds,
@required bool initializePlatform,
@required String hostname,
@required String port,
}) async {
return mockWebFs;
},
},
});
);
});
void _setupMocks() {

23
packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
View file

@ -50,18 +50,19 @@ void main() {
);
},
overrides: <Type, Generator>{
WebFsFactory: () => ({
@required String target,
@required FlutterProject flutterProject,
@required BuildInfo buildInfo,
@required bool skipDwds,
@required bool initializePlatform,
@required String hostname,
@required String port,
}) async {
return mockWebFs;
WebFsFactory: () => ({
@required String target,
@required FlutterProject flutterProject,
@required BuildInfo buildInfo,
@required bool skipDwds,
@required bool initializePlatform,
@required String hostname,
@required String port,
}) async {
return mockWebFs;
},
},
});
);
});
void _setupMocks() {

3
packages/flutter_tools/test/general.shard/tester/flutter_tester_test.dart
View file

@ -156,8 +156,7 @@ void main() {
testUsingContext('start', () async {
final Uri observatoryUri = Uri.parse('http://127.0.0.1:6666/');
mockProcess = MockProcess(
stdout: Stream<List<int>>.fromIterable(<List<int>>[
mockProcess = MockProcess(stdout: Stream<List<int>>.fromIterable(<List<int>>[
'''
Observatory listening on $observatoryUri
Hello!

16
packages/flutter_tools/test/general.shard/windows/visual_studio_test.dart
View file

@ -43,7 +43,7 @@ void main() {
'isPrerelease': false,
'catalog': <String, dynamic>{
'productDisplayVersion': '16.2.5',
}
},
};
// A version of a response that doesn't include certain installation status
@ -87,12 +87,12 @@ void main() {
when(mockProcessManager.runSync(
<String>[
vswherePath,
'-format',
'json',
'-utf8',
'-latest',
...?additionalArguments,
...?requirementArguments,
'-format',
'json',
'-utf8',
'-latest',
...?additionalArguments,
...?requirementArguments,
],
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
@ -415,7 +415,7 @@ void main() {
'installationVersion': '15.9.28307.665',
'catalog': <String, dynamic>{
'productDisplayVersion': '15.9.12',
}
},
};
setMockCompatibleVisualStudioInstallation(olderButCompleteVersionResponse);

10
packages/flutter_tools/test/integration.shard/test_driver.dart
View file

@ -620,11 +620,11 @@ class FlutterTestTestDriver extends FlutterTestDriver {
Future<void> Function() beforeStart,
}) async {
await _setupProcess(<String>[
'test',
'--disable-service-auth-codes',
'--machine',
'-d',
'flutter-tester',
'test',
'--disable-service-auth-codes',
'--machine',
'-d',
'flutter-tester',
], script: testFile, withDebugger: withDebugger, pauseOnExceptions: pauseOnExceptions, pidFile: pidFile, beforeStart: beforeStart);
}