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
daaa32bc
Unverified
Commit
daaa32bc
authored
Apr 05, 2023
by
Michael Goderbauer
Committed by
GitHub
Apr 05, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CustomDimensions.commandRunIsTest (#124135)
parent
0cfcdeec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
0 deletions
+47
-0
run.dart
packages/flutter_tools/lib/src/commands/run.dart
+1
-0
custom_dimensions.dart
...es/flutter_tools/lib/src/reporting/custom_dimensions.dart
+6
-0
run_test.dart
.../flutter_tools/test/commands.shard/hermetic/run_test.dart
+40
-0
No files found.
packages/flutter_tools/lib/src/commands/run.dart
View file @
daaa32bc
...
@@ -498,6 +498,7 @@ class RunCommand extends RunCommandBase {
...
@@ -498,6 +498,7 @@ class RunCommand extends RunCommandBase {
commandRunAndroidEmbeddingVersion:
androidEmbeddingVersion
,
commandRunAndroidEmbeddingVersion:
androidEmbeddingVersion
,
commandRunEnableImpeller:
enableImpeller
.
asBool
,
commandRunEnableImpeller:
enableImpeller
.
asBool
,
commandRunIOSInterfaceType:
iOSInterfaceType
,
commandRunIOSInterfaceType:
iOSInterfaceType
,
commandRunIsTest:
targetFile
.
endsWith
(
'_test.dart'
),
);
);
}
}
...
...
packages/flutter_tools/lib/src/reporting/custom_dimensions.dart
View file @
daaa32bc
...
@@ -68,6 +68,7 @@ class CustomDimensions {
...
@@ -68,6 +68,7 @@ class CustomDimensions {
this
.
hotEventReloadVMTimeInMs
,
this
.
hotEventReloadVMTimeInMs
,
this
.
commandRunEnableImpeller
,
this
.
commandRunEnableImpeller
,
this
.
commandRunIOSInterfaceType
,
this
.
commandRunIOSInterfaceType
,
this
.
commandRunIsTest
,
});
});
final
String
?
sessionHostOsDetails
;
// cd1
final
String
?
sessionHostOsDetails
;
// cd1
...
@@ -127,6 +128,7 @@ class CustomDimensions {
...
@@ -127,6 +128,7 @@ class CustomDimensions {
final
int
?
hotEventReloadVMTimeInMs
;
// cd 55
final
int
?
hotEventReloadVMTimeInMs
;
// cd 55
final
bool
?
commandRunEnableImpeller
;
// cd 56
final
bool
?
commandRunEnableImpeller
;
// cd 56
final
String
?
commandRunIOSInterfaceType
;
// cd 57
final
String
?
commandRunIOSInterfaceType
;
// cd 57
final
bool
?
commandRunIsTest
;
// cd 58
/// Convert to a map that will be used to upload to the analytics backend.
/// Convert to a map that will be used to upload to the analytics backend.
Map
<
String
,
String
>
toMap
()
=>
<
String
,
String
>{
Map
<
String
,
String
>
toMap
()
=>
<
String
,
String
>{
...
@@ -187,6 +189,7 @@ class CustomDimensions {
...
@@ -187,6 +189,7 @@ class CustomDimensions {
if
(
hotEventReloadVMTimeInMs
!=
null
)
cdKey
(
CustomDimensionsEnum
.
hotEventReloadVMTimeInMs
):
hotEventReloadVMTimeInMs
.
toString
(),
if
(
hotEventReloadVMTimeInMs
!=
null
)
cdKey
(
CustomDimensionsEnum
.
hotEventReloadVMTimeInMs
):
hotEventReloadVMTimeInMs
.
toString
(),
if
(
commandRunEnableImpeller
!=
null
)
cdKey
(
CustomDimensionsEnum
.
commandRunEnableImpeller
):
commandRunEnableImpeller
.
toString
(),
if
(
commandRunEnableImpeller
!=
null
)
cdKey
(
CustomDimensionsEnum
.
commandRunEnableImpeller
):
commandRunEnableImpeller
.
toString
(),
if
(
commandRunIOSInterfaceType
!=
null
)
cdKey
(
CustomDimensionsEnum
.
commandRunIOSInterfaceType
):
commandRunIOSInterfaceType
.
toString
(),
if
(
commandRunIOSInterfaceType
!=
null
)
cdKey
(
CustomDimensionsEnum
.
commandRunIOSInterfaceType
):
commandRunIOSInterfaceType
.
toString
(),
if
(
commandRunIsTest
!=
null
)
cdKey
(
CustomDimensionsEnum
.
commandRunIsTest
):
commandRunIsTest
.
toString
(),
};
};
/// Merge the values of two [CustomDimensions] into one. If a value is defined
/// Merge the values of two [CustomDimensions] into one. If a value is defined
...
@@ -254,6 +257,7 @@ class CustomDimensions {
...
@@ -254,6 +257,7 @@ class CustomDimensions {
hotEventReloadVMTimeInMs:
other
.
hotEventReloadVMTimeInMs
??
hotEventReloadVMTimeInMs
,
hotEventReloadVMTimeInMs:
other
.
hotEventReloadVMTimeInMs
??
hotEventReloadVMTimeInMs
,
commandRunEnableImpeller:
other
.
commandRunEnableImpeller
??
commandRunEnableImpeller
,
commandRunEnableImpeller:
other
.
commandRunEnableImpeller
??
commandRunEnableImpeller
,
commandRunIOSInterfaceType:
other
.
commandRunIOSInterfaceType
??
commandRunIOSInterfaceType
,
commandRunIOSInterfaceType:
other
.
commandRunIOSInterfaceType
??
commandRunIOSInterfaceType
,
commandRunIsTest:
other
.
commandRunIsTest
??
commandRunIsTest
,
);
);
}
}
...
@@ -315,6 +319,7 @@ class CustomDimensions {
...
@@ -315,6 +319,7 @@ class CustomDimensions {
hotEventReloadVMTimeInMs:
_extractInt
(
map
,
CustomDimensionsEnum
.
hotEventReloadVMTimeInMs
),
hotEventReloadVMTimeInMs:
_extractInt
(
map
,
CustomDimensionsEnum
.
hotEventReloadVMTimeInMs
),
commandRunEnableImpeller:
_extractBool
(
map
,
CustomDimensionsEnum
.
commandRunEnableImpeller
),
commandRunEnableImpeller:
_extractBool
(
map
,
CustomDimensionsEnum
.
commandRunEnableImpeller
),
commandRunIOSInterfaceType:
_extractString
(
map
,
CustomDimensionsEnum
.
commandRunIOSInterfaceType
),
commandRunIOSInterfaceType:
_extractString
(
map
,
CustomDimensionsEnum
.
commandRunIOSInterfaceType
),
commandRunIsTest:
_extractBool
(
map
,
CustomDimensionsEnum
.
commandRunIsTest
),
);
);
static
bool
?
_extractBool
(
Map
<
String
,
String
>
map
,
CustomDimensionsEnum
field
)
=>
static
bool
?
_extractBool
(
Map
<
String
,
String
>
map
,
CustomDimensionsEnum
field
)
=>
...
@@ -402,6 +407,7 @@ enum CustomDimensionsEnum {
...
@@ -402,6 +407,7 @@ enum CustomDimensionsEnum {
hotEventReloadVMTimeInMs
,
// cd55
hotEventReloadVMTimeInMs
,
// cd55
commandRunEnableImpeller
,
// cd56
commandRunEnableImpeller
,
// cd56
commandRunIOSInterfaceType
,
// cd57
commandRunIOSInterfaceType
,
// cd57
commandRunIsTest
,
// cd58
}
}
String
cdKey
(
CustomDimensionsEnum
cd
)
=>
'cd
${cd.index + 1}
'
;
String
cdKey
(
CustomDimensionsEnum
cd
)
=>
'cd
${cd.index + 1}
'
;
packages/flutter_tools/test/commands.shard/hermetic/run_test.dart
View file @
daaa32bc
...
@@ -475,6 +475,7 @@ void main() {
...
@@ -475,6 +475,7 @@ void main() {
'cd3'
:
'false'
,
'cd4'
:
'ios'
,
'cd22'
:
'iOS 13'
,
'cd3'
:
'false'
,
'cd4'
:
'ios'
,
'cd22'
:
'iOS 13'
,
'cd23'
:
'debug'
,
'cd18'
:
'false'
,
'cd15'
:
'swift'
,
'cd31'
:
'true'
,
'cd23'
:
'debug'
,
'cd18'
:
'false'
,
'cd15'
:
'swift'
,
'cd31'
:
'true'
,
'cd57'
:
'usb'
,
'cd57'
:
'usb'
,
'cd58'
:
'false'
,
})
})
)));
)));
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
...
@@ -488,6 +489,41 @@ void main() {
...
@@ -488,6 +489,41 @@ void main() {
Usage:
()
=>
usage
,
Usage:
()
=>
usage
,
});
});
testUsingContext
(
'correctly reports tests to usage'
,
()
async
{
fs
.
currentDirectory
.
childDirectory
(
'test'
).
childFile
(
'widget_test.dart'
).
createSync
(
recursive:
true
);
fs
.
currentDirectory
.
childDirectory
(
'ios'
).
childFile
(
'AppDelegate.swift'
).
createSync
(
recursive:
true
);
final
RunCommand
command
=
RunCommand
();
final
FakeDevice
mockDevice
=
FakeDevice
(
sdkNameAndVersion:
'iOS 13'
)
..
startAppSuccess
=
false
;
testDeviceManager
.
devices
=
<
Device
>[
mockDevice
];
await
expectToolExitLater
(
createTestCommandRunner
(
command
).
run
(<
String
>[
'run'
,
'--no-pub'
,
'--no-hot'
,
'test/widget_test.dart'
,
]),
isNull
);
expect
(
usage
.
commands
,
contains
(
TestUsageCommand
(
'run'
,
parameters:
CustomDimensions
.
fromMap
(<
String
,
String
>{
'cd3'
:
'false'
,
'cd4'
:
'ios'
,
'cd22'
:
'iOS 13'
,
'cd23'
:
'debug'
,
'cd18'
:
'false'
,
'cd15'
:
'swift'
,
'cd31'
:
'true'
,
'cd57'
:
'usb'
,
'cd58'
:
'true'
,
})),
));
},
overrides:
<
Type
,
Generator
>{
AnsiTerminal:
()
=>
fakeTerminal
,
Artifacts:
()
=>
artifacts
,
Cache:
()
=>
Cache
.
test
(
processManager:
FakeProcessManager
.
any
()),
DeviceManager:
()
=>
testDeviceManager
,
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
Stdio:
()
=>
FakeStdio
(),
Usage:
()
=>
usage
,
});
group
(
'--machine'
,
()
{
group
(
'--machine'
,
()
{
testUsingContext
(
'enables multidex by default'
,
()
async
{
testUsingContext
(
'enables multidex by default'
,
()
async
{
final
DaemonCapturingRunCommand
command
=
DaemonCapturingRunCommand
();
final
DaemonCapturingRunCommand
command
=
DaemonCapturingRunCommand
();
...
@@ -745,6 +781,7 @@ void main() {
...
@@ -745,6 +781,7 @@ void main() {
commandRunModeName:
'debug'
,
commandRunModeName:
'debug'
,
commandRunProjectModule:
false
,
commandRunProjectModule:
false
,
commandRunProjectHostLanguage:
''
,
commandRunProjectHostLanguage:
''
,
commandRunIsTest:
false
,
));
));
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
DeviceManager:
()
=>
testDeviceManager
,
DeviceManager:
()
=>
testDeviceManager
,
...
@@ -785,6 +822,7 @@ void main() {
...
@@ -785,6 +822,7 @@ void main() {
commandRunProjectModule:
false
,
commandRunProjectModule:
false
,
commandRunProjectHostLanguage:
''
,
commandRunProjectHostLanguage:
''
,
commandRunIOSInterfaceType:
'usb'
,
commandRunIOSInterfaceType:
'usb'
,
commandRunIsTest:
false
,
));
));
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
DeviceManager:
()
=>
testDeviceManager
,
DeviceManager:
()
=>
testDeviceManager
,
...
@@ -828,6 +866,7 @@ void main() {
...
@@ -828,6 +866,7 @@ void main() {
commandRunProjectModule:
false
,
commandRunProjectModule:
false
,
commandRunProjectHostLanguage:
''
,
commandRunProjectHostLanguage:
''
,
commandRunIOSInterfaceType:
'wireless'
,
commandRunIOSInterfaceType:
'wireless'
,
commandRunIsTest:
false
,
));
));
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
DeviceManager:
()
=>
testDeviceManager
,
DeviceManager:
()
=>
testDeviceManager
,
...
@@ -871,6 +910,7 @@ void main() {
...
@@ -871,6 +910,7 @@ void main() {
commandRunProjectModule:
false
,
commandRunProjectModule:
false
,
commandRunProjectHostLanguage:
''
,
commandRunProjectHostLanguage:
''
,
commandRunIOSInterfaceType:
'wireless'
,
commandRunIOSInterfaceType:
'wireless'
,
commandRunIsTest:
false
,
));
));
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
DeviceManager:
()
=>
testDeviceManager
,
DeviceManager:
()
=>
testDeviceManager
,
...
...
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