Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
890b9394
Unverified
Commit
890b9394
authored
Oct 04, 2019
by
Alexandre Ardhuin
Committed by
GitHub
Oct 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
indent formal parameters correctly (#41644)
parent
dc03c443
Changes
43
Show whitespace changes
Inline
Side-by-side
Showing
43 changed files
with
272 additions
and
233 deletions
+272
-233
assertions.dart
packages/flutter/lib/src/foundation/assertions.dart
+12
-12
diagnostics.dart
packages/flutter/lib/src/foundation/diagnostics.dart
+5
-5
bottom_navigation_bar.dart
packages/flutter/lib/src/material/bottom_navigation_bar.dart
+2
-2
range_slider.dart
packages/flutter/lib/src/material/range_slider.dart
+7
-7
slider_theme.dart
packages/flutter/lib/src/material/slider_theme.dart
+10
-10
theme_data.dart
packages/flutter/lib/src/material/theme_data.dart
+1
-1
colors.dart
packages/flutter/lib/src/painting/colors.dart
+4
-4
gradient.dart
packages/flutter/lib/src/painting/gradient.dart
+5
-5
matrix_utils.dart
packages/flutter/lib/src/painting/matrix_utils.dart
+1
-3
shader_warm_up.dart
packages/flutter/lib/src/painting/shader_warm_up.dart
+4
-3
heroes.dart
packages/flutter/lib/src/widgets/heroes.dart
+3
-3
icon_data.dart
packages/flutter/lib/src/widgets/icon_data.dart
+4
-4
widget_inspector.dart
packages/flutter/lib/src/widgets/widget_inspector.dart
+7
-7
text_field_test.dart
packages/flutter/test/cupertino/text_field_test.dart
+2
-2
dropdown_test.dart
packages/flutter/test/material/dropdown_test.dart
+1
-3
scrollbar_test.dart
packages/flutter/test/material/scrollbar_test.dart
+3
-3
slider_test.dart
packages/flutter/test/material/slider_test.dart
+22
-22
recording_canvas.dart
packages/flutter/test/rendering/recording_canvas.dart
+33
-8
sliver_fixed_extent_layout_test.dart
...utter/test/rendering/sliver_fixed_extent_layout_test.dart
+6
-6
slivers_block_test.dart
packages/flutter/test/rendering/slivers_block_test.dart
+4
-4
android_device.dart
packages/flutter_tools/lib/src/android/android_device.dart
+9
-8
async_guard.dart
packages/flutter_tools/lib/src/base/async_guard.dart
+4
-3
file_system.dart
packages/flutter_tools/lib/src/base/file_system.dart
+4
-6
build_system.dart
...ages/flutter_tools/lib/src/build_system/build_system.dart
+8
-2
source.dart
packages/flutter_tools/lib/src/build_system/source.dart
+1
-2
amber_ctl.dart
packages/flutter_tools/lib/src/fuchsia/amber_ctl.dart
+1
-2
fuchsia_build.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
+13
-10
fuchsia_device.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
+3
-3
fuchsia_pm.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
+1
-2
xcodeproj.dart
packages/flutter_tools/lib/src/ios/xcodeproj.dart
+2
-1
cocoapod_utils.dart
packages/flutter_tools/lib/src/macos/cocoapod_utils.dart
+1
-2
mdns_discovery.dart
packages/flutter_tools/lib/src/mdns_discovery.dart
+7
-2
flutter_command.dart
packages/flutter_tools/lib/src/runner/flutter_command.dart
+6
-2
flutter_web_platform.dart
...ages/flutter_tools/lib/src/test/flutter_web_platform.dart
+17
-6
build_fuchsia_test.dart
...ools/test/commands.shard/hermetic/build_fuchsia_test.dart
+2
-4
test_test.dart
...lutter_tools/test/commands.shard/permeable/test_test.dart
+6
-6
async_guard_test.dart
...utter_tools/test/general.shard/base/async_guard_test.dart
+6
-6
fuchsia_device_test.dart
...tools/test/general.shard/fuchsia/fuchsia_device_test.dart
+15
-22
workflow_test.dart
...s/flutter_tools/test/general.shard/web/workflow_test.dart
+8
-7
visual_studio_test.dart
..._tools/test/general.shard/windows/visual_studio_test.dart
+5
-4
mocks.dart
packages/flutter_tools/test/src/mocks.dart
+6
-6
testbed.dart
packages/flutter_tools/test/src/testbed.dart
+5
-11
tool_coverage.dart
packages/flutter_tools/tool/tool_coverage.dart
+6
-2
No files found.
packages/flutter/lib/src/foundation/assertions.dart
View file @
890b9394
packages/flutter/lib/src/foundation/diagnostics.dart
View file @
890b9394
packages/flutter/lib/src/material/bottom_navigation_bar.dart
View file @
890b9394
packages/flutter/lib/src/material/range_slider.dart
View file @
890b9394
packages/flutter/lib/src/material/slider_theme.dart
View file @
890b9394
packages/flutter/lib/src/material/theme_data.dart
View file @
890b9394
packages/flutter/lib/src/painting/colors.dart
View file @
890b9394
packages/flutter/lib/src/painting/gradient.dart
View file @
890b9394
packages/flutter/lib/src/painting/matrix_utils.dart
View file @
890b9394
...
...
@@ -164,9 +164,7 @@ class MatrixUtils {
}
static
Float64List
_minMax
;
static
void
_accumulate
(
Float64List
m
,
double
x
,
double
y
,
bool
first
,
bool
isAffine
)
{
static
void
_accumulate
(
Float64List
m
,
double
x
,
double
y
,
bool
first
,
bool
isAffine
)
{
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
ty
=
(
m
[
1
]
*
x
+
m
[
5
]
*
y
+
m
[
13
])
*
w
;
...
...
packages/flutter/lib/src/painting/shader_warm_up.dart
View file @
890b9394
...
...
@@ -99,9 +99,10 @@ abstract class ShaderWarmUp {
/// issues seen so far.
class
DefaultShaderWarmUp
extends
ShaderWarmUp
{
/// Allow [DefaultShaderWarmUp] to be used as the default value of parameters.
const
DefaultShaderWarmUp
(
{
this
.
drawCallSpacing
=
0.0
,
this
.
canvasSize
=
const
ui
.
Size
(
100.0
,
100.0
)});
const
DefaultShaderWarmUp
({
this
.
drawCallSpacing
=
0.0
,
this
.
canvasSize
=
const
ui
.
Size
(
100.0
,
100.0
),
});
/// 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
...
...
packages/flutter/lib/src/widgets/heroes.dart
View file @
890b9394
packages/flutter/lib/src/widgets/icon_data.dart
View file @
890b9394
packages/flutter/lib/src/widgets/widget_inspector.dart
View file @
890b9394
packages/flutter/test/cupertino/text_field_test.dart
View file @
890b9394
packages/flutter/test/material/dropdown_test.dart
View file @
890b9394
...
...
@@ -1291,9 +1291,7 @@ void main() {
expect
(
selectedIndex
,
13
);
});
testWidgets
(
'Dropdown button will accept widgets as its underline'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Dropdown button will accept widgets as its underline'
,
(
WidgetTester
tester
)
async
{
const
BoxDecoration
decoration
=
BoxDecoration
(
border:
Border
(
bottom:
BorderSide
(
color:
Color
(
0xFFCCBB00
),
width:
4.0
)),
);
...
...
packages/flutter/test/material/scrollbar_test.dart
View file @
890b9394
packages/flutter/test/material/slider_test.dart
View file @
890b9394
packages/flutter/test/rendering/recording_canvas.dart
View file @
890b9394
...
...
@@ -104,30 +104,55 @@ class TestRecordingPaintingContext extends ClipContext implements PaintingContex
}
@override
ClipRectLayer
pushClipRect
(
bool
needsCompositing
,
Offset
offset
,
Rect
clipRect
,
PaintingContextCallback
painter
,
{
Clip
clipBehavior
=
Clip
.
hardEdge
,
ClipRectLayer
oldLayer
})
{
ClipRectLayer
pushClipRect
(
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
));
return
null
;
}
@override
ClipRRectLayer
pushClipRRect
(
bool
needsCompositing
,
Offset
offset
,
Rect
bounds
,
RRect
clipRRect
,
PaintingContextCallback
painter
,
{
Clip
clipBehavior
=
Clip
.
antiAlias
,
ClipRRectLayer
oldLayer
})
{
ClipRRectLayer
pushClipRRect
(
bool
needsCompositing
,
Offset
offset
,
Rect
bounds
,
RRect
clipRRect
,
PaintingContextCallback
painter
,
{
Clip
clipBehavior
=
Clip
.
antiAlias
,
ClipRRectLayer
oldLayer
,
})
{
assert
(
clipBehavior
!=
null
);
clipRRectAndPaint
(
clipRRect
.
shift
(
offset
),
clipBehavior
,
bounds
.
shift
(
offset
),
()
=>
painter
(
this
,
offset
));
return
null
;
}
@override
ClipPathLayer
pushClipPath
(
bool
needsCompositing
,
Offset
offset
,
Rect
bounds
,
Path
clipPath
,
PaintingContextCallback
painter
,
{
Clip
clipBehavior
=
Clip
.
antiAlias
,
ClipPathLayer
oldLayer
})
{
ClipPathLayer
pushClipPath
(
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
));
return
null
;
}
@override
TransformLayer
pushTransform
(
bool
needsCompositing
,
Offset
offset
,
Matrix4
transform
,
PaintingContextCallback
painter
,
{
TransformLayer
oldLayer
})
{
TransformLayer
pushTransform
(
bool
needsCompositing
,
Offset
offset
,
Matrix4
transform
,
PaintingContextCallback
painter
,
{
TransformLayer
oldLayer
,
})
{
canvas
.
save
();
canvas
.
transform
(
transform
.
storage
);
painter
(
this
,
offset
);
...
...
packages/flutter/test/rendering/sliver_fixed_extent_layout_test.dart
View file @
890b9394
packages/flutter/test/rendering/slivers_block_test.dart
View file @
890b9394
packages/flutter_tools/lib/src/android/android_device.dart
View file @
890b9394
...
...
@@ -227,7 +227,8 @@ class AndroidDevice extends Device {
List
<
String
>
params
,
{
String
workingDirectory
,
bool
allowReentrantFlutter
=
false
,
Map
<
String
,
String
>
environment
})
{
Map
<
String
,
String
>
environment
,
})
{
return
processUtils
.
runSync
(
adbCommandForDevice
(
params
),
throwOnError:
true
,
...
...
packages/flutter_tools/lib/src/base/async_guard.dart
View file @
890b9394
...
...
@@ -79,9 +79,10 @@ import 'dart:async';
/// [onError] must have type `FutureOr<T> Function(Object error)` or
/// `FutureOr<T> Function(Object error, StackTrace stackTrace)` otherwise an
/// [ArgumentError] will be thrown synchronously.
Future
<
T
>
asyncGuard
<
T
>(
Future
<
T
>
Function
()
fn
,
{
Future
<
T
>
asyncGuard
<
T
>(
Future
<
T
>
Function
()
fn
,
{
Function
onError
,
})
{
})
{
if
(
onError
!=
null
&&
onError
is
!
_UnaryOnError
<
T
>
&&
onError
is
!
_BinaryOnError
<
T
>)
{
...
...
packages/flutter_tools/lib/src/base/file_system.dart
View file @
890b9394
...
...
@@ -71,12 +71,10 @@ void ensureDirectoryExists(String filePath) {
/// Skips files if [shouldCopyFile] returns `false`.
void
copyDirectorySync
(
Directory
srcDir
,
Directory
destDir
,
{
Directory
destDir
,
{
bool
shouldCopyFile
(
File
srcFile
,
File
destFile
),
void
onFileCopied
(
File
srcFile
,
File
destFile
),
}
)
{
})
{
if
(!
srcDir
.
existsSync
())
{
throw
Exception
(
'Source directory "
${srcDir.path}
" does not exist, nothing to copy'
);
}
...
...
packages/flutter_tools/lib/src/build_system/build_system.dart
View file @
890b9394
...
...
@@ -629,8 +629,14 @@ void verifyOutputDirectories(List<File> outputs, Environment environment, Target
/// A node in the build graph.
class
Node
{
Node
(
this
.
target
,
this
.
inputs
,
this
.
outputs
,
this
.
dependencies
,
Environment
environment
,
this
.
missingDepfile
)
{
Node
(
this
.
target
,
this
.
inputs
,
this
.
outputs
,
this
.
dependencies
,
Environment
environment
,
this
.
missingDepfile
,
)
{
final
File
stamp
=
target
.
_findStampFile
(
environment
);
// If the stamp file doesn't exist, we haven't run this step before and
...
...
packages/flutter_tools/lib/src/build_system/source.dart
View file @
890b9394
...
...
@@ -215,8 +215,7 @@ abstract class Source {
/// The source is provided by an [Artifact].
///
/// If [artifact] points to a directory then all child files are included.
const
factory
Source
.
artifact
(
Artifact
artifact
,
{
TargetPlatform
platform
,
BuildMode
mode
})
=
_ArtifactSource
;
const
factory
Source
.
artifact
(
Artifact
artifact
,
{
TargetPlatform
platform
,
BuildMode
mode
})
=
_ArtifactSource
;
/// The source is provided by a depfile generated at runtime.
///
...
...
packages/flutter_tools/lib/src/fuchsia/amber_ctl.dart
View file @
890b9394
...
...
@@ -92,8 +92,7 @@ class FuchsiaAmberCtl {
/// Instructs the pkg_resolver instance running on [device] to prefetch the
/// package [packageName].
Future
<
bool
>
pkgCtlResolve
(
FuchsiaDevice
device
,
FuchsiaPackageServer
server
,
String
packageName
)
async
{
Future
<
bool
>
pkgCtlResolve
(
FuchsiaDevice
device
,
FuchsiaPackageServer
server
,
String
packageName
)
async
{
final
String
packageUrl
=
'fuchsia-pkg://
${server.name}
/
$packageName
'
;
final
RunResult
result
=
await
device
.
shell
(
'pkgctl resolve
$packageUrl
'
);
return
result
.
exitCode
==
0
;
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
View file @
890b9394
...
...
@@ -34,10 +34,11 @@ Future<void> _timedBuildStep(String name, Future<void> Function() action) async
// 2. Create a manifest file for assets.
// 3. Using these manifests, use the Fuchsia SDK 'pm' tool to create the
// Fuchsia package.
Future
<
void
>
buildFuchsia
(
{
@required
FuchsiaProject
fuchsiaProject
,
Future
<
void
>
buildFuchsia
(
{
@required
FuchsiaProject
fuchsiaProject
,
@required
String
target
,
// E.g., lib/main.dart
BuildInfo
buildInfo
=
BuildInfo
.
debug
})
async
{
BuildInfo
buildInfo
=
BuildInfo
.
debug
,
})
async
{
final
Directory
outDir
=
fs
.
directory
(
getFuchsiaBuildDirectory
());
if
(!
outDir
.
existsSync
())
{
outDir
.
createSync
(
recursive:
true
);
...
...
@@ -55,7 +56,8 @@ Future<void> buildFuchsia(
Future
<
void
>
_buildAssets
(
FuchsiaProject
fuchsiaProject
,
String
target
,
// lib/main.dart
BuildInfo
buildInfo
)
async
{
BuildInfo
buildInfo
,
)
async
{
final
String
assetDir
=
getAssetBuildDirectory
();
final
AssetBundle
assets
=
await
buildAssets
(
manifestPath:
fuchsiaProject
.
project
.
pubspecFile
.
path
,
...
...
@@ -112,7 +114,8 @@ void _rewriteCmx(BuildMode mode, File src, File dst) {
Future
<
void
>
_buildPackage
(
FuchsiaProject
fuchsiaProject
,
String
target
,
// lib/main.dart
BuildInfo
buildInfo
)
async
{
BuildInfo
buildInfo
,
)
async
{
final
String
outDir
=
getFuchsiaBuildDirectory
();
final
String
pkgDir
=
fs
.
path
.
join
(
outDir
,
'pkg'
);
final
String
appName
=
fuchsiaProject
.
project
.
manifest
.
appName
;
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
View file @
890b9394
...
...
@@ -498,9 +498,9 @@ class FuchsiaDevice extends Device {
return
null
;
}
FuchsiaIsolateDiscoveryProtocol
getIsolateDiscoveryProtocol
(
String
isolateName
)
=>
FuchsiaIsolateDiscoveryProtocol
(
this
,
isolateName
);
FuchsiaIsolateDiscoveryProtocol
getIsolateDiscoveryProtocol
(
String
isolateName
)
{
return
FuchsiaIsolateDiscoveryProtocol
(
this
,
isolateName
);
}
@override
bool
isSupportedForProject
(
FlutterProject
flutterProject
)
{
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
View file @
890b9394
...
...
@@ -58,8 +58,7 @@ class FuchsiaPM {
///
/// where $APPNAME is the same [appName] passed to [init], and meta/package
/// is set up to be the file `meta/package` created by [init].
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
{
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
{
return
_runPMCommand
(<
String
>[
'-o'
,
buildPath
,
...
...
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file @
890b9394
...
...
@@ -279,7 +279,8 @@ class XcodeProjectInterpreter {
/// Asynchronously retrieve xcode build settings. This one is preferred for
/// new call-sites.
Future
<
Map
<
String
,
String
>>
getBuildSettings
(
String
projectPath
,
String
target
,
{
String
projectPath
,
String
target
,
{
Duration
timeout
=
const
Duration
(
minutes:
1
),
})
async
{
final
Status
status
=
Status
.
withSpinner
(
...
...
packages/flutter_tools/lib/src/macos/cocoapod_utils.dart
View file @
890b9394
...
...
@@ -14,8 +14,7 @@ import 'cocoapods.dart';
/// For a given build, determines whether dependencies have changed since the
/// last call to processPods, then calls processPods with that information.
Future
<
void
>
processPodsIfNeeded
(
XcodeBasedProject
xcodeProject
,
String
buildDirectory
,
BuildMode
buildMode
)
async
{
Future
<
void
>
processPodsIfNeeded
(
XcodeBasedProject
xcodeProject
,
String
buildDirectory
,
BuildMode
buildMode
)
async
{
final
FlutterProject
project
=
xcodeProject
.
parent
;
// Ensure that the plugin list is up to date, since hasPlugins relies on it.
refreshPluginsList
(
project
);
...
...
packages/flutter_tools/lib/src/mdns_discovery.dart
View file @
890b9394
...
...
@@ -157,8 +157,13 @@ class MDnsObservatoryDiscoveryResult {
final
String
authCode
;
}
Future
<
Uri
>
buildObservatoryUri
(
Device
device
,
String
host
,
int
devicePort
,
[
int
observatoryPort
,
String
authCode
])
async
{
Future
<
Uri
>
buildObservatoryUri
(
Device
device
,
String
host
,
int
devicePort
,
[
int
observatoryPort
,
String
authCode
,
])
async
{
String
path
=
'/'
;
if
(
authCode
!=
null
)
{
path
=
authCode
;
...
...
packages/flutter_tools/lib/src/runner/flutter_command.dart
View file @
890b9394
...
...
@@ -484,8 +484,12 @@ abstract class FlutterCommand extends Command<void> {
///
/// For example, the command path (e.g. `build/apk`) and the result,
/// as well as the time spent running it.
void
_sendPostUsage
(
String
commandPath
,
FlutterCommandResult
commandResult
,
DateTime
startTime
,
DateTime
endTime
)
{
void
_sendPostUsage
(
String
commandPath
,
FlutterCommandResult
commandResult
,
DateTime
startTime
,
DateTime
endTime
,
)
{
if
(
commandPath
==
null
)
{
return
;
}
...
...
packages/flutter_tools/lib/src/test/flutter_web_platform.dart
View file @
890b9394
...
...
@@ -205,8 +205,12 @@ class FlutterWebPlatform extends PlatformPlugin {
}
@override
Future
<
RunnerSuite
>
load
(
String
path
,
SuitePlatform
platform
,
SuiteConfiguration
suiteConfig
,
Object
message
)
async
{
Future
<
RunnerSuite
>
load
(
String
path
,
SuitePlatform
platform
,
SuiteConfiguration
suiteConfig
,
Object
message
,
)
async
{
if
(
_closed
)
{
return
null
;
}
...
...
@@ -509,8 +513,11 @@ class BrowserManager {
/// Returns the browser manager, or throws an [ApplicationException] if a
/// connection fails to be established.
static
Future
<
BrowserManager
>
start
(
Runtime
runtime
,
Uri
url
,
Future
<
WebSocketChannel
>
future
,
{
bool
debug
=
false
})
async
{
Runtime
runtime
,
Uri
url
,
Future
<
WebSocketChannel
>
future
,
{
bool
debug
=
false
,
})
async
{
final
Chrome
chrome
=
await
chromeLauncher
.
launch
(
url
.
toString
(),
headless:
true
);
...
...
@@ -671,8 +678,12 @@ class BrowserManager {
///
/// All methods forward directly to [BrowserManager].
class
_BrowserEnvironment
implements
Environment
{
_BrowserEnvironment
(
this
.
_manager
,
this
.
observatoryUrl
,
this
.
remoteDebuggerUrl
,
this
.
onRestart
);
_BrowserEnvironment
(
this
.
_manager
,
this
.
observatoryUrl
,
this
.
remoteDebuggerUrl
,
this
.
onRestart
,
);
final
BrowserManager
_manager
;
...
...
packages/flutter_tools/test/commands.shard/hermetic/build_fuchsia_test.dart
View file @
890b9394
...
...
@@ -180,8 +180,7 @@ class MockFuchsiaPM extends Mock implements FuchsiaPM {
}
@override
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
if
(!
fs
.
file
(
fs
.
path
.
join
(
buildPath
,
'meta'
,
'package'
)).
existsSync
()
||
!
fs
.
file
(
keyPath
).
existsSync
()
||
!
fs
.
file
(
manifestPath
).
existsSync
())
{
...
...
@@ -192,8 +191,7 @@ class MockFuchsiaPM extends Mock implements FuchsiaPM {
}
@override
Future
<
bool
>
archive
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
archive
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
if
(!
fs
.
file
(
fs
.
path
.
join
(
buildPath
,
'meta'
,
'package'
)).
existsSync
()
||
!
fs
.
file
(
keyPath
).
existsSync
()
||
!
fs
.
file
(
manifestPath
).
existsSync
())
{
...
...
packages/flutter_tools/test/commands.shard/permeable/test_test.dart
View file @
890b9394
...
...
@@ -133,7 +133,7 @@ Future<void> _testFile(
String
testDirectory
,
{
Matcher
exitCode
,
List
<
String
>
extraArguments
=
const
<
String
>[],
})
async
{
})
async
{
exitCode
??=
isNonZero
;
final
String
fullTestExpectation
=
fs
.
path
.
join
(
testDirectory
,
'
${testName}
_expectation.txt'
);
final
File
expectationFile
=
fs
.
file
(
fullTestExpectation
);
...
...
packages/flutter_tools/test/general.shard/base/async_guard_test.dart
View file @
890b9394
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
View file @
890b9394
...
...
@@ -336,8 +336,7 @@ void main() {
});
group
(
FuchsiaIsolateDiscoveryProtocol
,
()
{
Future
<
Uri
>
findUri
(
List
<
MockFlutterView
>
views
,
String
expectedIsolateName
)
{
Future
<
Uri
>
findUri
(
List
<
MockFlutterView
>
views
,
String
expectedIsolateName
)
{
final
MockPortForwarder
portForwarder
=
MockPortForwarder
();
final
MockVMService
vmService
=
MockVMService
();
final
MockVM
vm
=
MockVM
();
...
...
@@ -645,7 +644,7 @@ Process _createMockProcess({
String
stdout
=
''
,
String
stderr
=
''
,
bool
persistent
=
false
,
})
{
})
{
final
Stream
<
List
<
int
>>
stdoutStream
=
Stream
<
List
<
int
>>.
fromIterable
(<
List
<
int
>>[
utf8
.
encode
(
stdout
),
]);
...
...
@@ -717,9 +716,9 @@ class FuchsiaDeviceWithFakeDiscovery extends FuchsiaDevice {
FuchsiaDeviceWithFakeDiscovery
(
String
id
,
{
String
name
})
:
super
(
id
,
name:
name
);
@override
FuchsiaIsolateDiscoveryProtocol
getIsolateDiscoveryProtocol
(
String
isolateName
)
=>
FakeFuchsiaIsolateDiscoveryProtocol
();
FuchsiaIsolateDiscoveryProtocol
getIsolateDiscoveryProtocol
(
String
isolateName
)
{
return
FakeFuchsiaIsolateDiscoveryProtocol
();
}
}
class
FakeFuchsiaIsolateDiscoveryProtocol
implements
FuchsiaIsolateDiscoveryProtocol
{
...
...
@@ -752,8 +751,7 @@ class FakeFuchsiaAmberCtl implements FuchsiaAmberCtl {
}
@override
Future
<
bool
>
pkgCtlResolve
(
FuchsiaDevice
device
,
FuchsiaPackageServer
server
,
String
packageName
)
async
{
Future
<
bool
>
pkgCtlResolve
(
FuchsiaDevice
device
,
FuchsiaPackageServer
server
,
String
packageName
)
async
{
return
true
;
}
...
...
@@ -785,8 +783,7 @@ class FailingAmberCtl implements FuchsiaAmberCtl {
}
@override
Future
<
bool
>
pkgCtlResolve
(
FuchsiaDevice
device
,
FuchsiaPackageServer
server
,
String
packageName
)
async
{
Future
<
bool
>
pkgCtlResolve
(
FuchsiaDevice
device
,
FuchsiaPackageServer
server
,
String
packageName
)
async
{
return
false
;
}
...
...
@@ -910,8 +907,7 @@ class FakeFuchsiaPM implements FuchsiaPM {
}
@override
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
if
(!
fs
.
file
(
fs
.
path
.
join
(
buildPath
,
'meta'
,
'package'
)).
existsSync
()
||
!
fs
.
file
(
keyPath
).
existsSync
()
||
!
fs
.
file
(
manifestPath
).
existsSync
())
{
...
...
@@ -922,8 +918,7 @@ class FakeFuchsiaPM implements FuchsiaPM {
}
@override
Future
<
bool
>
archive
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
archive
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
if
(!
fs
.
file
(
fs
.
path
.
join
(
buildPath
,
'meta'
,
'package'
)).
existsSync
()
||
!
fs
.
file
(
keyPath
).
existsSync
()
||
!
fs
.
file
(
manifestPath
).
existsSync
())
{
...
...
@@ -975,14 +970,12 @@ class FailingPM implements FuchsiaPM {
}
@override
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
return
false
;
}
@override
Future
<
bool
>
archive
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
archive
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
return
false
;
}
...
...
packages/flutter_tools/test/general.shard/web/workflow_test.dart
View file @
890b9394
...
...
@@ -88,13 +88,14 @@ void main() {
class
MockProcessManager
extends
Mock
implements
ProcessManager
{}
class
MockPlatform
extends
Mock
implements
Platform
{
MockPlatform
(
{
this
.
windows
=
false
,
MockPlatform
(
{
this
.
windows
=
false
,
this
.
macos
=
false
,
this
.
linux
=
false
,
this
.
environment
=
const
<
String
,
String
>{
kChromeEnvironment:
'chrome'
,
}});
},
});
final
bool
windows
;
final
bool
macos
;
...
...
packages/flutter_tools/test/general.shard/windows/visual_studio_test.dart
View file @
890b9394
...
...
@@ -67,10 +67,11 @@ void main() {
// Sets up the mock environment so that searching for Visual Studio with
// exactly the given required components will provide a result. By default it
// return a preset installation, but the response can be overridden.
void
setMockVswhereResponse
(
[
List
<
String
>
requiredComponents
,
void
setMockVswhereResponse
(
[
List
<
String
>
requiredComponents
,
List
<
String
>
additionalArguments
,
Map
<
String
,
dynamic
>
response
])
{
Map
<
String
,
dynamic
>
response
,
])
{
fs
.
file
(
vswherePath
).
createSync
(
recursive:
true
);
fs
.
file
(
vcvarsPath
).
createSync
(
recursive:
true
);
...
...
packages/flutter_tools/test/src/mocks.dart
View file @
890b9394
...
...
@@ -197,7 +197,7 @@ ProcessFactory flakyProcessFactory({
Duration
delay
,
Stream
<
List
<
int
>>
Function
()
stdout
,
Stream
<
List
<
int
>>
Function
()
stderr
,
})
{
})
{
int
flakesLeft
=
flakes
;
stdout
??=
()
=>
const
Stream
<
List
<
int
>>.
empty
();
stderr
??=
()
=>
const
Stream
<
List
<
int
>>.
empty
();
...
...
packages/flutter_tools/test/src/testbed.dart
View file @
890b9394
...
...
@@ -188,25 +188,19 @@ class FakeHttpClient implements HttpClient {
String
userAgent
;
@override
void
addCredentials
(
Uri
url
,
String
realm
,
HttpClientCredentials
credentials
)
{}
void
addCredentials
(
Uri
url
,
String
realm
,
HttpClientCredentials
credentials
)
{}
@override
void
addProxyCredentials
(
String
host
,
int
port
,
String
realm
,
HttpClientCredentials
credentials
)
{}
void
addProxyCredentials
(
String
host
,
int
port
,
String
realm
,
HttpClientCredentials
credentials
)
{}
@override
set
authenticate
(
Future
<
bool
>
Function
(
Uri
url
,
String
scheme
,
String
realm
)
f
)
{}
set
authenticate
(
Future
<
bool
>
Function
(
Uri
url
,
String
scheme
,
String
realm
)
f
)
{}
@override
set
authenticateProxy
(
Future
<
bool
>
Function
(
String
host
,
int
port
,
String
scheme
,
String
realm
)
f
)
{}
set
authenticateProxy
(
Future
<
bool
>
Function
(
String
host
,
int
port
,
String
scheme
,
String
realm
)
f
)
{}
@override
set
badCertificateCallback
(
bool
Function
(
X509Certificate
cert
,
String
host
,
int
port
)
callback
)
{}
set
badCertificateCallback
(
bool
Function
(
X509Certificate
cert
,
String
host
,
int
port
)
callback
)
{}
@override
void
close
({
bool
force
=
false
})
{}
...
...
packages/flutter_tools/tool/tool_coverage.dart
View file @
890b9394
...
...
@@ -68,8 +68,12 @@ class VMPlatform extends PlatformPlugin {
throw
UnimplementedError
();
@override
Future
<
RunnerSuite
>
load
(
String
codePath
,
SuitePlatform
platform
,
SuiteConfiguration
suiteConfig
,
Object
message
)
async
{
Future
<
RunnerSuite
>
load
(
String
codePath
,
SuitePlatform
platform
,
SuiteConfiguration
suiteConfig
,
Object
message
,
)
async
{
final
ReceivePort
receivePort
=
ReceivePort
();
Isolate
isolate
;
try
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment