Unverified Commit 890b9394 authored by Alexandre Ardhuin's avatar Alexandre Ardhuin Committed by GitHub

indent formal parameters correctly (#41644)

parent dc03c443
...@@ -164,9 +164,7 @@ class MatrixUtils { ...@@ -164,9 +164,7 @@ class MatrixUtils {
} }
static Float64List _minMax; static Float64List _minMax;
static void _accumulate(Float64List m, double x, double y, static void _accumulate(Float64List m, double x, double y, bool first, bool isAffine) {
bool first, bool isAffine)
{
final double w = isAffine ? 1.0 : 1.0 / (m[3] * x + m[7] * y + m[15]); final double w = isAffine ? 1.0 : 1.0 / (m[3] * x + m[7] * y + m[15]);
final double tx = (m[0] * x + m[4] * y + m[12]) * w; final double tx = (m[0] * x + m[4] * y + m[12]) * w;
final double ty = (m[1] * x + m[5] * y + m[13]) * w; final double ty = (m[1] * x + m[5] * y + m[13]) * w;
......
...@@ -99,9 +99,10 @@ abstract class ShaderWarmUp { ...@@ -99,9 +99,10 @@ abstract class ShaderWarmUp {
/// issues seen so far. /// issues seen so far.
class DefaultShaderWarmUp extends ShaderWarmUp { class DefaultShaderWarmUp extends ShaderWarmUp {
/// Allow [DefaultShaderWarmUp] to be used as the default value of parameters. /// Allow [DefaultShaderWarmUp] to be used as the default value of parameters.
const DefaultShaderWarmUp( const DefaultShaderWarmUp({
{this.drawCallSpacing = 0.0, this.drawCallSpacing = 0.0,
this.canvasSize = const ui.Size(100.0, 100.0)}); this.canvasSize = const ui.Size(100.0, 100.0),
});
/// Constant that can be used to space out draw calls for visualizing the draws /// Constant that can be used to space out draw calls for visualizing the draws
/// for debugging purposes (example: 80.0). Be sure to also change your canvas /// for debugging purposes (example: 80.0). Be sure to also change your canvas
......
...@@ -1291,9 +1291,7 @@ void main() { ...@@ -1291,9 +1291,7 @@ void main() {
expect(selectedIndex, 13); expect(selectedIndex, 13);
}); });
testWidgets('Dropdown button will accept widgets as its underline', ( testWidgets('Dropdown button will accept widgets as its underline', (WidgetTester tester) async {
WidgetTester tester) async {
const BoxDecoration decoration = BoxDecoration( const BoxDecoration decoration = BoxDecoration(
border: Border(bottom: BorderSide(color: Color(0xFFCCBB00), width: 4.0)), border: Border(bottom: BorderSide(color: Color(0xFFCCBB00), width: 4.0)),
); );
......
...@@ -104,30 +104,55 @@ class TestRecordingPaintingContext extends ClipContext implements PaintingContex ...@@ -104,30 +104,55 @@ class TestRecordingPaintingContext extends ClipContext implements PaintingContex
} }
@override @override
ClipRectLayer pushClipRect(bool needsCompositing, Offset offset, Rect clipRect, ClipRectLayer pushClipRect(
PaintingContextCallback painter, { Clip clipBehavior = Clip.hardEdge, ClipRectLayer oldLayer }) { bool needsCompositing,
Offset offset,
Rect clipRect,
PaintingContextCallback painter, {
Clip clipBehavior = Clip.hardEdge,
ClipRectLayer oldLayer,
}) {
clipRectAndPaint(clipRect.shift(offset), clipBehavior, clipRect.shift(offset), () => painter(this, offset)); clipRectAndPaint(clipRect.shift(offset), clipBehavior, clipRect.shift(offset), () => painter(this, offset));
return null; return null;
} }
@override @override
ClipRRectLayer pushClipRRect(bool needsCompositing, Offset offset, Rect bounds, RRect clipRRect, ClipRRectLayer pushClipRRect(
PaintingContextCallback painter, { Clip clipBehavior = Clip.antiAlias, ClipRRectLayer oldLayer }) { bool needsCompositing,
Offset offset,
Rect bounds,
RRect clipRRect,
PaintingContextCallback painter, {
Clip clipBehavior = Clip.antiAlias,
ClipRRectLayer oldLayer,
}) {
assert(clipBehavior != null); assert(clipBehavior != null);
clipRRectAndPaint(clipRRect.shift(offset), clipBehavior, bounds.shift(offset), () => painter(this, offset)); clipRRectAndPaint(clipRRect.shift(offset), clipBehavior, bounds.shift(offset), () => painter(this, offset));
return null; return null;
} }
@override @override
ClipPathLayer pushClipPath(bool needsCompositing, Offset offset, Rect bounds, Path clipPath, ClipPathLayer pushClipPath(
PaintingContextCallback painter, { Clip clipBehavior = Clip.antiAlias, ClipPathLayer oldLayer }) { bool needsCompositing,
Offset offset,
Rect bounds,
Path clipPath,
PaintingContextCallback painter, {
Clip clipBehavior = Clip.antiAlias,
ClipPathLayer oldLayer,
}) {
clipPathAndPaint(clipPath.shift(offset), clipBehavior, bounds.shift(offset), () => painter(this, offset)); clipPathAndPaint(clipPath.shift(offset), clipBehavior, bounds.shift(offset), () => painter(this, offset));
return null; return null;
} }
@override @override
TransformLayer pushTransform(bool needsCompositing, Offset offset, Matrix4 transform, TransformLayer pushTransform(
PaintingContextCallback painter, { TransformLayer oldLayer }) { bool needsCompositing,
Offset offset,
Matrix4 transform,
PaintingContextCallback painter, {
TransformLayer oldLayer,
}) {
canvas.save(); canvas.save();
canvas.transform(transform.storage); canvas.transform(transform.storage);
painter(this, offset); painter(this, offset);
......
...@@ -227,7 +227,8 @@ class AndroidDevice extends Device { ...@@ -227,7 +227,8 @@ class AndroidDevice extends Device {
List<String> params, { List<String> params, {
String workingDirectory, String workingDirectory,
bool allowReentrantFlutter = false, bool allowReentrantFlutter = false,
Map<String, String> environment}) { Map<String, String> environment,
}) {
return processUtils.runSync( return processUtils.runSync(
adbCommandForDevice(params), adbCommandForDevice(params),
throwOnError: true, throwOnError: true,
......
...@@ -79,9 +79,10 @@ import 'dart:async'; ...@@ -79,9 +79,10 @@ import 'dart:async';
/// [onError] must have type `FutureOr<T> Function(Object error)` or /// [onError] must have type `FutureOr<T> Function(Object error)` or
/// `FutureOr<T> Function(Object error, StackTrace stackTrace)` otherwise an /// `FutureOr<T> Function(Object error, StackTrace stackTrace)` otherwise an
/// [ArgumentError] will be thrown synchronously. /// [ArgumentError] will be thrown synchronously.
Future<T> asyncGuard<T>(Future<T> Function() fn, { Future<T> asyncGuard<T>(
Future<T> Function() fn, {
Function onError, Function onError,
}) { }) {
if (onError != null && if (onError != null &&
onError is! _UnaryOnError<T> && onError is! _UnaryOnError<T> &&
onError is! _BinaryOnError<T>) { onError is! _BinaryOnError<T>) {
......
...@@ -71,12 +71,10 @@ void ensureDirectoryExists(String filePath) { ...@@ -71,12 +71,10 @@ void ensureDirectoryExists(String filePath) {
/// Skips files if [shouldCopyFile] returns `false`. /// Skips files if [shouldCopyFile] returns `false`.
void copyDirectorySync( void copyDirectorySync(
Directory srcDir, Directory srcDir,
Directory destDir, Directory destDir, {
{
bool shouldCopyFile(File srcFile, File destFile), bool shouldCopyFile(File srcFile, File destFile),
void onFileCopied(File srcFile, File destFile), void onFileCopied(File srcFile, File destFile),
} }) {
) {
if (!srcDir.existsSync()) { if (!srcDir.existsSync()) {
throw Exception('Source directory "${srcDir.path}" does not exist, nothing to copy'); throw Exception('Source directory "${srcDir.path}" does not exist, nothing to copy');
} }
......
...@@ -629,8 +629,14 @@ void verifyOutputDirectories(List<File> outputs, Environment environment, Target ...@@ -629,8 +629,14 @@ void verifyOutputDirectories(List<File> outputs, Environment environment, Target
/// A node in the build graph. /// A node in the build graph.
class Node { class Node {
Node(this.target, this.inputs, this.outputs, this.dependencies, Node(
Environment environment, this.missingDepfile) { this.target,
this.inputs,
this.outputs,
this.dependencies,
Environment environment,
this.missingDepfile,
) {
final File stamp = target._findStampFile(environment); final File stamp = target._findStampFile(environment);
// If the stamp file doesn't exist, we haven't run this step before and // If the stamp file doesn't exist, we haven't run this step before and
......
...@@ -215,8 +215,7 @@ abstract class Source { ...@@ -215,8 +215,7 @@ abstract class Source {
/// The source is provided by an [Artifact]. /// The source is provided by an [Artifact].
/// ///
/// If [artifact] points to a directory then all child files are included. /// If [artifact] points to a directory then all child files are included.
const factory Source.artifact(Artifact artifact, {TargetPlatform platform, const factory Source.artifact(Artifact artifact, {TargetPlatform platform, BuildMode mode}) = _ArtifactSource;
BuildMode mode}) = _ArtifactSource;
/// The source is provided by a depfile generated at runtime. /// The source is provided by a depfile generated at runtime.
/// ///
......
...@@ -92,8 +92,7 @@ class FuchsiaAmberCtl { ...@@ -92,8 +92,7 @@ class FuchsiaAmberCtl {
/// Instructs the pkg_resolver instance running on [device] to prefetch the /// Instructs the pkg_resolver instance running on [device] to prefetch the
/// package [packageName]. /// package [packageName].
Future<bool> pkgCtlResolve(FuchsiaDevice device, FuchsiaPackageServer server, Future<bool> pkgCtlResolve(FuchsiaDevice device, FuchsiaPackageServer server, String packageName) async {
String packageName) async {
final String packageUrl = 'fuchsia-pkg://${server.name}/$packageName'; final String packageUrl = 'fuchsia-pkg://${server.name}/$packageName';
final RunResult result = await device.shell('pkgctl resolve $packageUrl'); final RunResult result = await device.shell('pkgctl resolve $packageUrl');
return result.exitCode == 0; return result.exitCode == 0;
......
...@@ -34,10 +34,11 @@ Future<void> _timedBuildStep(String name, Future<void> Function() action) async ...@@ -34,10 +34,11 @@ Future<void> _timedBuildStep(String name, Future<void> Function() action) async
// 2. Create a manifest file for assets. // 2. Create a manifest file for assets.
// 3. Using these manifests, use the Fuchsia SDK 'pm' tool to create the // 3. Using these manifests, use the Fuchsia SDK 'pm' tool to create the
// Fuchsia package. // Fuchsia package.
Future<void> buildFuchsia( Future<void> buildFuchsia({
{@required FuchsiaProject fuchsiaProject, @required FuchsiaProject fuchsiaProject,
@required String target, // E.g., lib/main.dart @required String target, // E.g., lib/main.dart
BuildInfo buildInfo = BuildInfo.debug}) async { BuildInfo buildInfo = BuildInfo.debug,
}) async {
final Directory outDir = fs.directory(getFuchsiaBuildDirectory()); final Directory outDir = fs.directory(getFuchsiaBuildDirectory());
if (!outDir.existsSync()) { if (!outDir.existsSync()) {
outDir.createSync(recursive: true); outDir.createSync(recursive: true);
...@@ -55,7 +56,8 @@ Future<void> buildFuchsia( ...@@ -55,7 +56,8 @@ Future<void> buildFuchsia(
Future<void> _buildAssets( Future<void> _buildAssets(
FuchsiaProject fuchsiaProject, FuchsiaProject fuchsiaProject,
String target, // lib/main.dart String target, // lib/main.dart
BuildInfo buildInfo) async { BuildInfo buildInfo,
) async {
final String assetDir = getAssetBuildDirectory(); final String assetDir = getAssetBuildDirectory();
final AssetBundle assets = await buildAssets( final AssetBundle assets = await buildAssets(
manifestPath: fuchsiaProject.project.pubspecFile.path, manifestPath: fuchsiaProject.project.pubspecFile.path,
...@@ -112,7 +114,8 @@ void _rewriteCmx(BuildMode mode, File src, File dst) { ...@@ -112,7 +114,8 @@ void _rewriteCmx(BuildMode mode, File src, File dst) {
Future<void> _buildPackage( Future<void> _buildPackage(
FuchsiaProject fuchsiaProject, FuchsiaProject fuchsiaProject,
String target, // lib/main.dart String target, // lib/main.dart
BuildInfo buildInfo) async { BuildInfo buildInfo,
) async {
final String outDir = getFuchsiaBuildDirectory(); final String outDir = getFuchsiaBuildDirectory();
final String pkgDir = fs.path.join(outDir, 'pkg'); final String pkgDir = fs.path.join(outDir, 'pkg');
final String appName = fuchsiaProject.project.manifest.appName; final String appName = fuchsiaProject.project.manifest.appName;
......
...@@ -498,9 +498,9 @@ class FuchsiaDevice extends Device { ...@@ -498,9 +498,9 @@ class FuchsiaDevice extends Device {
return null; return null;
} }
FuchsiaIsolateDiscoveryProtocol getIsolateDiscoveryProtocol( FuchsiaIsolateDiscoveryProtocol getIsolateDiscoveryProtocol(String isolateName) {
String isolateName) => return FuchsiaIsolateDiscoveryProtocol(this, isolateName);
FuchsiaIsolateDiscoveryProtocol(this, isolateName); }
@override @override
bool isSupportedForProject(FlutterProject flutterProject) { bool isSupportedForProject(FlutterProject flutterProject) {
......
...@@ -58,8 +58,7 @@ class FuchsiaPM { ...@@ -58,8 +58,7 @@ class FuchsiaPM {
/// ///
/// where $APPNAME is the same [appName] passed to [init], and meta/package /// where $APPNAME is the same [appName] passed to [init], and meta/package
/// is set up to be the file `meta/package` created by [init]. /// is set up to be the file `meta/package` created by [init].
Future<bool> build( Future<bool> build(String buildPath, String keyPath, String manifestPath) {
String buildPath, String keyPath, String manifestPath) {
return _runPMCommand(<String>[ return _runPMCommand(<String>[
'-o', '-o',
buildPath, buildPath,
......
...@@ -279,7 +279,8 @@ class XcodeProjectInterpreter { ...@@ -279,7 +279,8 @@ class XcodeProjectInterpreter {
/// Asynchronously retrieve xcode build settings. This one is preferred for /// Asynchronously retrieve xcode build settings. This one is preferred for
/// new call-sites. /// new call-sites.
Future<Map<String, String>> getBuildSettings( Future<Map<String, String>> getBuildSettings(
String projectPath, String target, { String projectPath,
String target, {
Duration timeout = const Duration(minutes: 1), Duration timeout = const Duration(minutes: 1),
}) async { }) async {
final Status status = Status.withSpinner( final Status status = Status.withSpinner(
......
...@@ -14,8 +14,7 @@ import 'cocoapods.dart'; ...@@ -14,8 +14,7 @@ import 'cocoapods.dart';
/// For a given build, determines whether dependencies have changed since the /// For a given build, determines whether dependencies have changed since the
/// last call to processPods, then calls processPods with that information. /// last call to processPods, then calls processPods with that information.
Future<void> processPodsIfNeeded(XcodeBasedProject xcodeProject, Future<void> processPodsIfNeeded(XcodeBasedProject xcodeProject, String buildDirectory, BuildMode buildMode) async {
String buildDirectory, BuildMode buildMode) async {
final FlutterProject project = xcodeProject.parent; final FlutterProject project = xcodeProject.parent;
// Ensure that the plugin list is up to date, since hasPlugins relies on it. // Ensure that the plugin list is up to date, since hasPlugins relies on it.
refreshPluginsList(project); refreshPluginsList(project);
......
...@@ -157,8 +157,13 @@ class MDnsObservatoryDiscoveryResult { ...@@ -157,8 +157,13 @@ class MDnsObservatoryDiscoveryResult {
final String authCode; final String authCode;
} }
Future<Uri> buildObservatoryUri(Device device, Future<Uri> buildObservatoryUri(
String host, int devicePort, [int observatoryPort, String authCode]) async { Device device,
String host,
int devicePort, [
int observatoryPort,
String authCode,
]) async {
String path = '/'; String path = '/';
if (authCode != null) { if (authCode != null) {
path = authCode; path = authCode;
......
...@@ -484,8 +484,12 @@ abstract class FlutterCommand extends Command<void> { ...@@ -484,8 +484,12 @@ abstract class FlutterCommand extends Command<void> {
/// ///
/// For example, the command path (e.g. `build/apk`) and the result, /// For example, the command path (e.g. `build/apk`) and the result,
/// as well as the time spent running it. /// as well as the time spent running it.
void _sendPostUsage(String commandPath, FlutterCommandResult commandResult, void _sendPostUsage(
DateTime startTime, DateTime endTime) { String commandPath,
FlutterCommandResult commandResult,
DateTime startTime,
DateTime endTime,
) {
if (commandPath == null) { if (commandPath == null) {
return; return;
} }
......
...@@ -205,8 +205,12 @@ class FlutterWebPlatform extends PlatformPlugin { ...@@ -205,8 +205,12 @@ class FlutterWebPlatform extends PlatformPlugin {
} }
@override @override
Future<RunnerSuite> load(String path, SuitePlatform platform, Future<RunnerSuite> load(
SuiteConfiguration suiteConfig, Object message) async { String path,
SuitePlatform platform,
SuiteConfiguration suiteConfig,
Object message,
) async {
if (_closed) { if (_closed) {
return null; return null;
} }
...@@ -509,8 +513,11 @@ class BrowserManager { ...@@ -509,8 +513,11 @@ class BrowserManager {
/// Returns the browser manager, or throws an [ApplicationException] if a /// Returns the browser manager, or throws an [ApplicationException] if a
/// connection fails to be established. /// connection fails to be established.
static Future<BrowserManager> start( static Future<BrowserManager> start(
Runtime runtime, Uri url, Future<WebSocketChannel> future, Runtime runtime,
{bool debug = false}) async { Uri url,
Future<WebSocketChannel> future, {
bool debug = false,
}) async {
final Chrome chrome = final Chrome chrome =
await chromeLauncher.launch(url.toString(), headless: true); await chromeLauncher.launch(url.toString(), headless: true);
...@@ -671,8 +678,12 @@ class BrowserManager { ...@@ -671,8 +678,12 @@ class BrowserManager {
/// ///
/// All methods forward directly to [BrowserManager]. /// All methods forward directly to [BrowserManager].
class _BrowserEnvironment implements Environment { class _BrowserEnvironment implements Environment {
_BrowserEnvironment(this._manager, this.observatoryUrl, _BrowserEnvironment(
this.remoteDebuggerUrl, this.onRestart); this._manager,
this.observatoryUrl,
this.remoteDebuggerUrl,
this.onRestart,
);
final BrowserManager _manager; final BrowserManager _manager;
......
...@@ -180,8 +180,7 @@ class MockFuchsiaPM extends Mock implements FuchsiaPM { ...@@ -180,8 +180,7 @@ class MockFuchsiaPM extends Mock implements FuchsiaPM {
} }
@override @override
Future<bool> build( Future<bool> build(String buildPath, String keyPath, String manifestPath) async {
String buildPath, String keyPath, String manifestPath) async {
if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() || if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() ||
!fs.file(keyPath).existsSync() || !fs.file(keyPath).existsSync() ||
!fs.file(manifestPath).existsSync()) { !fs.file(manifestPath).existsSync()) {
...@@ -192,8 +191,7 @@ class MockFuchsiaPM extends Mock implements FuchsiaPM { ...@@ -192,8 +191,7 @@ class MockFuchsiaPM extends Mock implements FuchsiaPM {
} }
@override @override
Future<bool> archive( Future<bool> archive(String buildPath, String keyPath, String manifestPath) async {
String buildPath, String keyPath, String manifestPath) async {
if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() || if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() ||
!fs.file(keyPath).existsSync() || !fs.file(keyPath).existsSync() ||
!fs.file(manifestPath).existsSync()) { !fs.file(manifestPath).existsSync()) {
......
...@@ -133,7 +133,7 @@ Future<void> _testFile( ...@@ -133,7 +133,7 @@ Future<void> _testFile(
String testDirectory, { String testDirectory, {
Matcher exitCode, Matcher exitCode,
List<String> extraArguments = const <String>[], List<String> extraArguments = const <String>[],
}) async { }) async {
exitCode ??= isNonZero; exitCode ??= isNonZero;
final String fullTestExpectation = fs.path.join(testDirectory, '${testName}_expectation.txt'); final String fullTestExpectation = fs.path.join(testDirectory, '${testName}_expectation.txt');
final File expectationFile = fs.file(fullTestExpectation); final File expectationFile = fs.file(fullTestExpectation);
......
...@@ -336,8 +336,7 @@ void main() { ...@@ -336,8 +336,7 @@ void main() {
}); });
group(FuchsiaIsolateDiscoveryProtocol, () { group(FuchsiaIsolateDiscoveryProtocol, () {
Future<Uri> findUri( Future<Uri> findUri(List<MockFlutterView> views, String expectedIsolateName) {
List<MockFlutterView> views, String expectedIsolateName) {
final MockPortForwarder portForwarder = MockPortForwarder(); final MockPortForwarder portForwarder = MockPortForwarder();
final MockVMService vmService = MockVMService(); final MockVMService vmService = MockVMService();
final MockVM vm = MockVM(); final MockVM vm = MockVM();
...@@ -645,7 +644,7 @@ Process _createMockProcess({ ...@@ -645,7 +644,7 @@ Process _createMockProcess({
String stdout = '', String stdout = '',
String stderr = '', String stderr = '',
bool persistent = false, bool persistent = false,
}) { }) {
final Stream<List<int>> stdoutStream = Stream<List<int>>.fromIterable(<List<int>>[ final Stream<List<int>> stdoutStream = Stream<List<int>>.fromIterable(<List<int>>[
utf8.encode(stdout), utf8.encode(stdout),
]); ]);
...@@ -717,9 +716,9 @@ class FuchsiaDeviceWithFakeDiscovery extends FuchsiaDevice { ...@@ -717,9 +716,9 @@ class FuchsiaDeviceWithFakeDiscovery extends FuchsiaDevice {
FuchsiaDeviceWithFakeDiscovery(String id, {String name}) : super(id, name: name); FuchsiaDeviceWithFakeDiscovery(String id, {String name}) : super(id, name: name);
@override @override
FuchsiaIsolateDiscoveryProtocol getIsolateDiscoveryProtocol( FuchsiaIsolateDiscoveryProtocol getIsolateDiscoveryProtocol(String isolateName) {
String isolateName) => return FakeFuchsiaIsolateDiscoveryProtocol();
FakeFuchsiaIsolateDiscoveryProtocol(); }
} }
class FakeFuchsiaIsolateDiscoveryProtocol implements FuchsiaIsolateDiscoveryProtocol { class FakeFuchsiaIsolateDiscoveryProtocol implements FuchsiaIsolateDiscoveryProtocol {
...@@ -752,8 +751,7 @@ class FakeFuchsiaAmberCtl implements FuchsiaAmberCtl { ...@@ -752,8 +751,7 @@ class FakeFuchsiaAmberCtl implements FuchsiaAmberCtl {
} }
@override @override
Future<bool> pkgCtlResolve(FuchsiaDevice device, FuchsiaPackageServer server, Future<bool> pkgCtlResolve(FuchsiaDevice device, FuchsiaPackageServer server, String packageName) async {
String packageName) async {
return true; return true;
} }
...@@ -785,8 +783,7 @@ class FailingAmberCtl implements FuchsiaAmberCtl { ...@@ -785,8 +783,7 @@ class FailingAmberCtl implements FuchsiaAmberCtl {
} }
@override @override
Future<bool> pkgCtlResolve(FuchsiaDevice device, FuchsiaPackageServer server, Future<bool> pkgCtlResolve(FuchsiaDevice device, FuchsiaPackageServer server, String packageName) async {
String packageName) async {
return false; return false;
} }
...@@ -910,8 +907,7 @@ class FakeFuchsiaPM implements FuchsiaPM { ...@@ -910,8 +907,7 @@ class FakeFuchsiaPM implements FuchsiaPM {
} }
@override @override
Future<bool> build( Future<bool> build(String buildPath, String keyPath, String manifestPath) async {
String buildPath, String keyPath, String manifestPath) async {
if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() || if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() ||
!fs.file(keyPath).existsSync() || !fs.file(keyPath).existsSync() ||
!fs.file(manifestPath).existsSync()) { !fs.file(manifestPath).existsSync()) {
...@@ -922,8 +918,7 @@ class FakeFuchsiaPM implements FuchsiaPM { ...@@ -922,8 +918,7 @@ class FakeFuchsiaPM implements FuchsiaPM {
} }
@override @override
Future<bool> archive( Future<bool> archive(String buildPath, String keyPath, String manifestPath) async {
String buildPath, String keyPath, String manifestPath) async {
if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() || if (!fs.file(fs.path.join(buildPath, 'meta', 'package')).existsSync() ||
!fs.file(keyPath).existsSync() || !fs.file(keyPath).existsSync() ||
!fs.file(manifestPath).existsSync()) { !fs.file(manifestPath).existsSync()) {
...@@ -975,14 +970,12 @@ class FailingPM implements FuchsiaPM { ...@@ -975,14 +970,12 @@ class FailingPM implements FuchsiaPM {
} }
@override @override
Future<bool> build( Future<bool> build(String buildPath, String keyPath, String manifestPath) async {
String buildPath, String keyPath, String manifestPath) async {
return false; return false;
} }
@override @override
Future<bool> archive( Future<bool> archive(String buildPath, String keyPath, String manifestPath) async {
String buildPath, String keyPath, String manifestPath) async {
return false; return false;
} }
......
...@@ -88,13 +88,14 @@ void main() { ...@@ -88,13 +88,14 @@ void main() {
class MockProcessManager extends Mock implements ProcessManager {} class MockProcessManager extends Mock implements ProcessManager {}
class MockPlatform extends Mock implements Platform { class MockPlatform extends Mock implements Platform {
MockPlatform( MockPlatform({
{this.windows = false, this.windows = false,
this.macos = false, this.macos = false,
this.linux = false, this.linux = false,
this.environment = const <String, String>{ this.environment = const <String, String>{
kChromeEnvironment: 'chrome', kChromeEnvironment: 'chrome',
}}); },
});
final bool windows; final bool windows;
final bool macos; final bool macos;
......
...@@ -67,10 +67,11 @@ void main() { ...@@ -67,10 +67,11 @@ void main() {
// Sets up the mock environment so that searching for Visual Studio with // Sets up the mock environment so that searching for Visual Studio with
// exactly the given required components will provide a result. By default it // exactly the given required components will provide a result. By default it
// return a preset installation, but the response can be overridden. // return a preset installation, but the response can be overridden.
void setMockVswhereResponse( void setMockVswhereResponse([
[List<String> requiredComponents, List<String> requiredComponents,
List<String> additionalArguments, List<String> additionalArguments,
Map<String, dynamic> response]) { Map<String, dynamic> response,
]) {
fs.file(vswherePath).createSync(recursive: true); fs.file(vswherePath).createSync(recursive: true);
fs.file(vcvarsPath).createSync(recursive: true); fs.file(vcvarsPath).createSync(recursive: true);
......
...@@ -197,7 +197,7 @@ ProcessFactory flakyProcessFactory({ ...@@ -197,7 +197,7 @@ ProcessFactory flakyProcessFactory({
Duration delay, Duration delay,
Stream<List<int>> Function() stdout, Stream<List<int>> Function() stdout,
Stream<List<int>> Function() stderr, Stream<List<int>> Function() stderr,
}) { }) {
int flakesLeft = flakes; int flakesLeft = flakes;
stdout ??= () => const Stream<List<int>>.empty(); stdout ??= () => const Stream<List<int>>.empty();
stderr ??= () => const Stream<List<int>>.empty(); stderr ??= () => const Stream<List<int>>.empty();
......
...@@ -188,25 +188,19 @@ class FakeHttpClient implements HttpClient { ...@@ -188,25 +188,19 @@ class FakeHttpClient implements HttpClient {
String userAgent; String userAgent;
@override @override
void addCredentials( void addCredentials(Uri url, String realm, HttpClientCredentials credentials) {}
Uri url, String realm, HttpClientCredentials credentials) {}
@override @override
void addProxyCredentials( void addProxyCredentials(String host, int port, String realm, HttpClientCredentials credentials) {}
String host, int port, String realm, HttpClientCredentials credentials) {}
@override @override
set authenticate( set authenticate(Future<bool> Function(Uri url, String scheme, String realm) f) {}
Future<bool> Function(Uri url, String scheme, String realm) f) {}
@override @override
set authenticateProxy( set authenticateProxy(Future<bool> Function(String host, int port, String scheme, String realm) f) {}
Future<bool> Function(String host, int port, String scheme, String realm)
f) {}
@override @override
set badCertificateCallback( set badCertificateCallback(bool Function(X509Certificate cert, String host, int port) callback) {}
bool Function(X509Certificate cert, String host, int port) callback) {}
@override @override
void close({bool force = false}) {} void close({bool force = false}) {}
......
...@@ -68,8 +68,12 @@ class VMPlatform extends PlatformPlugin { ...@@ -68,8 +68,12 @@ class VMPlatform extends PlatformPlugin {
throw UnimplementedError(); throw UnimplementedError();
@override @override
Future<RunnerSuite> load(String codePath, SuitePlatform platform, Future<RunnerSuite> load(
SuiteConfiguration suiteConfig, Object message) async { String codePath,
SuitePlatform platform,
SuiteConfiguration suiteConfig,
Object message,
) async {
final ReceivePort receivePort = ReceivePort(); final ReceivePort receivePort = ReceivePort();
Isolate isolate; Isolate isolate;
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment